summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-01-19 05:13:14 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-01-19 05:13:14 -0800
commitce65cade5848263c483eda1b7ffe9ed5a01a0c8f (patch)
treeb03a447bf8b90154f16dd143dfa75d03f11e05ba /include
parentd91341a903501da6249a38f0c35528f176b5f533 (diff)
[PATCH] Arrange for EFI-related code to be compiled away
From: David Mosberger <davidm@napali.hpl.hp.com> There is some EFI-related code which is present in the ia64 build but is not needed: variable efi_enabled is always zero. The patch fiddles with the efi_enabled definition to arrange for `efi_enabled' to be constant zero or constant one in those situations where this can be guaranteed.
Diffstat (limited to 'include')
-rw-r--r--include/linux/efi.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h
index d6cac7ce314d..a1764b1fb106 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -301,10 +301,18 @@ extern inline unsigned long __init efi_get_time(void);
extern inline int __init efi_set_rtc_mmss(unsigned long nowtime);
extern struct efi_memory_map memmap;
+/*
+ * We play games with efi_enabled so that the compiler will, if possible, remove
+ * EFI-related code altogether.
+ */
#ifdef CONFIG_EFI
-extern int efi_enabled;
+# ifdef CONFIG_X86
+ extern int efi_enabled;
+# else
+# define efi_enabled 1
+# endif
#else
-#define efi_enabled 0
+# define efi_enabled 0
#endif
/*