x86: Revert "x86: get_bios_ebda_length()"
PATCH 1/1 x86: Revert "x86: get_bios_ebda_length()"
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 <[email protected]>
Signed-off-by Guenter Roeck <[email protected]>
--- arch/x86/include/asm/bios_ebda.h | 21 --------------------- 1 file changed, 21 deletions(-)
arch/x86/include/asm/bios_ebda.h +0 -21
@@ -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
Signature · 1 line
2.5.0
tip-bot for Guenter Roeck
merge bot[tip:x86/platform] x86/platform: Remove unused get_bios_ebda_length() function
x86/platform: Remove unused get_bios_ebda_length() function
Commit-ID: 47a541c3e19374ec9f5d3d96730a922e8480dda5 Gitweb: http://git.kernel.org/tip/47a541c3e19374ec9f5d3d96730a922e8480dda5 Author: Guenter Roeck <[email protected]> AuthorDate: Fri, 1 Apr 2016 17:51:54 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 13 Apr 2016 11:43:09 +0200
x86/platform: Remove unused get_bios_ebda_length() function
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.
Signed-off-by Guenter Roeck <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Mike Waychison <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/include/asm/bios_ebda.h | 21 --------------------- 1 file changed, 21 deletions(-)
arch/x86/include/asm/bios_ebda.h +0 -21
@@ -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