diff options
| author | Linus Torvalds | 2012-08-20 19:36:18 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-08-20 19:36:18 +0200 |
| commit | c71a35520f2a30920d9c1a1fc86e16503b58681f (patch) | |
| tree | ceecf9303b571834a6137cdc5c179e4decb4f841 /include/linux | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | x32: Use compat shims for {g,s}etsockopt (diff) | |
| download | kernel-qcow2-linux-c71a35520f2a30920d9c1a1fc86e16503b58681f.tar.gz kernel-qcow2-linux-c71a35520f2a30920d9c1a1fc86e16503b58681f.tar.xz kernel-qcow2-linux-c71a35520f2a30920d9c1a1fc86e16503b58681f.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar.
A x32 socket ABI fix with a -stable backport tag among other fixes.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x32: Use compat shims for {g,s}etsockopt
Revert "x86-64/efi: Use EFI to deal with platform wall clock"
x86, apic: fix broken legacy interrupts in the logical apic mode
x86, build: Globally set -fno-pic
x86, avx: don't use avx instructions with "noxsave" boot param
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/efi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 103adc6d7e3a..ec45ccd8708a 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -503,6 +503,8 @@ extern u64 efi_mem_attribute (unsigned long phys_addr, unsigned long size); extern int __init efi_uart_console_only (void); extern void efi_initialize_iomem_resources(struct resource *code_resource, struct resource *data_resource, struct resource *bss_resource); +extern unsigned long efi_get_time(void); +extern int efi_set_rtc_mmss(unsigned long nowtime); extern void efi_reserve_boot_services(void); extern struct efi_memory_map memmap; |