Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit ae5830a6f8278e1bb700a0956cacc9ceaf311f83

Authored by Akinobu Mita
Committed by Ingo Molnar
1 parent 2c0903f2ab
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 2 changed files with 1 additions and 11 deletions Side-by-side Diff

arch/x86/kernel/pci-calgary_64.c
Diff comments   View file @ ae5830a
... ... @@ -43,6 +43,7 @@
43 43 #include <asm/system.h>
44 44 #include <asm/dma.h>
45 45 #include <asm/rio.h>
  46 +#include <asm/bios_ebda.h>
46 47  
47 48 #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT
48 49 int use_calgary __read_mostly = 1;
include/asm-x86/rio.h
Diff comments   View file @ ae5830a
... ... @@ -60,16 +60,5 @@
60 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 63 #endif /* __ASM_RIO_H */