This reverts commit 57d5f9f808b7 ("x86: get_bios_ebda_length()").

get_bios_ebda_length() uses min_t() without including linux/kernel.h.
This may result in build errors with some configurations. Since the
function is not used anywhere in the kernel, let's just drop it.

Cc: Mike Waychison <mi...@google.com>
Signed-off-by: Guenter Roeck <li...@roeck-us.net>
---
 arch/x86/include/asm/bios_ebda.h | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/arch/x86/include/asm/bios_ebda.h b/arch/x86/include/asm/bios_ebda.h
index aa6a3170ab5a..2b00c776f223 100644
--- a/arch/x86/include/asm/bios_ebda.h
+++ b/arch/x86/include/asm/bios_ebda.h
@@ -17,27 +17,6 @@ static inline unsigned int get_bios_ebda(void)
        return address; /* 0 means none */
 }
 
-/*
- * Return the sanitized length of the EBDA in bytes, if it exists.
- */
-static inline unsigned int get_bios_ebda_length(void)
-{
-       unsigned int address;
-       unsigned int length;
-
-       address = get_bios_ebda();
-       if (!address)
-               return 0;
-
-       /* EBDA length is byte 0 of the EBDA (stored in KiB) */
-       length = *(unsigned char *)phys_to_virt(address);
-       length <<= 10;
-
-       /* Trim the length if it extends beyond 640KiB */
-       length = min_t(unsigned int, (640 * 1024) - address, length);
-       return length;
-}
-
 void reserve_ebda_region(void);
 
 #ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION
-- 
2.5.0

Reply via email to