diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-01 18:55:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-01 18:55:31 -0400 |
| commit | e48af7aaf1e6d266414b11540339e6d2dac20ad2 (patch) | |
| tree | 4ff43886fc31c4f37db1780f9a504c5680123100 /include | |
| parent | Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | ia64: salinfo: use a waitqueue instead a sema down/up combo (diff) | |
| download | linux-dev-e48af7aaf1e6d266414b11540339e6d2dac20ad2.tar.xz linux-dev-e48af7aaf1e6d266414b11540339e6d2dac20ad2.zip | |
Merge tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 updates from Tony Luck:
"Miscellaneous ia64 cleanups"
* tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: salinfo: use a waitqueue instead a sema down/up combo
ia64: efi: use timespec64 for persistent clock
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/efi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 7f80a75ee9e3..7f5a58225385 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -879,7 +879,7 @@ extern void efi_init (void); extern void *efi_get_pal_addr (void); extern void efi_map_pal_code (void); extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg); -extern void efi_gettimeofday (struct timespec *ts); +extern void efi_gettimeofday (struct timespec64 *ts); extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */ #ifdef CONFIG_X86 extern void efi_late_init(void); |