Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-artful-kernel.git] / arch / x86 / include / asm / x86_init.h

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 08a08a800e17315a8a1898e911265744fd7732cf..6ba79317844138672dfe7de27254425e20630b5b 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -168,14 +168,15 @@ struct x86_legacy_devices {
  * struct x86_legacy_features - legacy x86 features
  *
  * @rtc: this device has a CMOS real-time clock present
- * @ebda_search: it's safe to search for the EBDA signature in the hardware's
- *     low RAM
+ * @reserve_bios_regions: boot code will search for the EBDA address and the
+ *     start of the 640k - 1M BIOS region.  If false, the platform must
+ *     ensure that its memory map correctly reserves sub-1MB regions as needed.
  * @devices: legacy x86 devices, refer to struct x86_legacy_devices
  *     documentation for further details.
  */
 struct x86_legacy_features {
        int rtc;
-       int ebda_search;
+       int reserve_bios_regions;
        struct x86_legacy_devices devices;
 };