renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 10:34:24 +08:00
Code

x86: remove duplicate get_bios_ebda() from rio.h

Browse Source 
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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Akinobu Mita 2008-04-19 23:55:19 +09:00 committed by Ingo Molnar
parent 2c0903f2ab
commit ae5830a6f8
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/pci-calgary_64.c
View File

@ -43,6 +43,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/rio.h> #include <asm/rio.h>
#include <asm/bios_ebda.h>
#ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT
int use_calgary __read_mostly = 1; int use_calgary __read_mostly = 1;

11
include/asm-x86/rio.h
View File

@ -60,15 +60,4 @@ enum {
ALT_CALGARY = 5, /* Second Planar Calgary */ 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 */ #endif /* __ASM_RIO_H */