diff options
| -rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 1 | ||||
| -rw-r--r-- | include/asm-x86/rio.h | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 2edee22e9c30..e28ec497e142 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <asm/system.h> | 43 | #include <asm/system.h> |
| 44 | #include <asm/dma.h> | 44 | #include <asm/dma.h> |
| 45 | #include <asm/rio.h> | 45 | #include <asm/rio.h> |
| 46 | #include <asm/bios_ebda.h> | ||
| 46 | 47 | ||
| 47 | #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT | 48 | #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT |
| 48 | int use_calgary __read_mostly = 1; | 49 | int use_calgary __read_mostly = 1; |
diff --git a/include/asm-x86/rio.h b/include/asm-x86/rio.h index 3451c576e6af..c9448bd8968f 100644 --- a/include/asm-x86/rio.h +++ b/include/asm-x86/rio.h | |||
| @@ -60,15 +60,4 @@ enum { | |||
| 60 | ALT_CALGARY = 5, /* Second Planar Calgary */ | 60 | ALT_CALGARY = 5, /* Second Planar Calgary */ |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | /* | ||
| 64 | * there is a real-mode segmented pointer pointing to the | ||
| 65 | * 4K EBDA area at 0x40E. | ||
| 66 | */ | ||
| 67 | static inline unsigned long get_bios_ebda(void) | ||
| 68 | { | ||
| 69 | unsigned long address = *(unsigned short *)phys_to_virt(0x40EUL); | ||
| 70 | address <<= 4; | ||
| 71 | return address; | ||
| 72 | } | ||
| 73 | |||
| 74 | #endif /* __ASM_RIO_H */ | 63 | #endif /* __ASM_RIO_H */ |
