Messages in this thread Patch in this message | | | Date | Sat, 19 Apr 2008 23:55:19 +0900 | From | Akinobu Mita <> | Subject | [patch 09/10] x86: remove duplicate get_bios_ebda() from rio.h |
| |
get_bios_ebda() exists in asm/rio.h and asm/bios_ebda.h. This patch removes the one in asm/rio.h.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> --- arch/x86/kernel/pci-calgary_64.c | 1 + include/asm-x86/rio.h | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-)
Index: 2.6-git/arch/x86/kernel/pci-calgary_64.c =================================================================== --- 2.6-git.orig/arch/x86/kernel/pci-calgary_64.c +++ 2.6-git/arch/x86/kernel/pci-calgary_64.c @@ -43,6 +43,7 @@ #include <asm/system.h> #include <asm/dma.h> #include <asm/rio.h> +#include <asm/bios_ebda.h> #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT int use_calgary __read_mostly = 1; Index: 2.6-git/include/asm-x86/rio.h =================================================================== --- 2.6-git.orig/include/asm-x86/rio.h +++ 2.6-git/include/asm-x86/rio.h @@ -60,15 +60,4 @@ enum { ALT_CALGARY = 5, /* Second Planar Calgary */ }; -/* - * there is a real-mode segmented pointer pointing to the - * 4K EBDA area at 0x40E. - */ -static inline unsigned long get_bios_ebda(void) -{ - unsigned long address = *(unsigned short *)phys_to_virt(0x40EUL); - address <<= 4; - return address; -} - #endif /* __ASM_RIO_H */ --
| |