diff options
author | Dave Young <dyoung@redhat.com> | 2014-01-02 22:56:49 -0500 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2014-01-03 09:38:18 -0500 |
commit | 5c12af0c41e3417e1939095325920463b5f8e726 (patch) | |
tree | 98a9bd3392ccaba9f8a169a1e83493c99497f297 | |
parent | 41a34cec2e0df7798ea322ed1480bc3d3facdc8e (diff) |
x86/efi: parse_efi_setup() build fix
In case without CONFIG_EFI, there will be below build error:
arch/x86/built-in.o: In function `setup_arch':
(.init.text+0x9dc): undefined reference to `parse_efi_setup'
Thus fix it by adding blank inline function in asm/efi.h
Also remove an unused declaration for variable efi_data_len.
Signed-off-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r-- | arch/x86/include/asm/efi.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 4d1ba80b6ff1..3b978c472d08 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h | |||
@@ -142,8 +142,6 @@ struct efi_setup_data { | |||
142 | }; | 142 | }; |
143 | 143 | ||
144 | extern u64 efi_setup; | 144 | extern u64 efi_setup; |
145 | extern u32 efi_data_len; | ||
146 | extern void parse_efi_setup(u64 phys_addr, u32 data_len); | ||
147 | 145 | ||
148 | #ifdef CONFIG_EFI | 146 | #ifdef CONFIG_EFI |
149 | 147 | ||
@@ -153,7 +151,7 @@ static inline bool efi_is_native(void) | |||
153 | } | 151 | } |
154 | 152 | ||
155 | extern struct console early_efi_console; | 153 | extern struct console early_efi_console; |
156 | 154 | extern void parse_efi_setup(u64 phys_addr, u32 data_len); | |
157 | #else | 155 | #else |
158 | /* | 156 | /* |
159 | * IF EFI is not configured, have the EFI calls return -ENOSYS. | 157 | * IF EFI is not configured, have the EFI calls return -ENOSYS. |
@@ -165,6 +163,7 @@ extern struct console early_efi_console; | |||
165 | #define efi_call4(_f, _a1, _a2, _a3, _a4) (-ENOSYS) | 163 | #define efi_call4(_f, _a1, _a2, _a3, _a4) (-ENOSYS) |
166 | #define efi_call5(_f, _a1, _a2, _a3, _a4, _a5) (-ENOSYS) | 164 | #define efi_call5(_f, _a1, _a2, _a3, _a4, _a5) (-ENOSYS) |
167 | #define efi_call6(_f, _a1, _a2, _a3, _a4, _a5, _a6) (-ENOSYS) | 165 | #define efi_call6(_f, _a1, _a2, _a3, _a4, _a5, _a6) (-ENOSYS) |
166 | static inline void parse_efi_setup(u64 phys_addr, u32 data_len) {} | ||
168 | #endif /* CONFIG_EFI */ | 167 | #endif /* CONFIG_EFI */ |
169 | 168 | ||
170 | #endif /* _ASM_X86_EFI_H */ | 169 | #endif /* _ASM_X86_EFI_H */ |