summary refs log tree commit diff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 13:13:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 13:13:25 -0700
commit0a2fe19ccc4bc552a8083a595a3aa737b8bea727 (patch)
tree3bed37182f95fa3ac1673530457e994a89bd7e26 /arch/x86/include
parentc1b669b72a05aeae0882742dd40f30d51732ed15 (diff)
parent9ca8f72a9297f2052d806bd1111e176533aa69bd (diff)
downloadlinux-0a2fe19ccc4bc552a8083a595a3aa737b8bea727.tar.gz
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pul x86/efi changes from Ingo Molnar:
 "This tree adds an EFI bootloader handover protocol, which, once
  supported on the bootloader side, will make bootup faster and might
  result in simpler bootloaders.

  The other change activates the EFI wall clock time accessors on x86-64
  as well, instead of the legacy RTC readout."

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: Handover Protocol
  x86-64/efi: Use EFI to deal with platform wall clock
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/bootparam.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
index eb45aa6b1f27..2ad874cb661c 100644
--- a/arch/x86/include/asm/bootparam.h
+++ b/arch/x86/include/asm/bootparam.h
@@ -66,6 +66,7 @@ struct setup_header {
 	__u64	setup_data;
 	__u64	pref_address;
 	__u32	init_size;
+	__u32	handover_offset;
 } __attribute__((packed));
 
 struct sys_desc_table {