Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5830a6 authored by Akinobu Mita's avatar Akinobu Mita Committed by Ingo Molnar
Browse files

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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2c0903f2

arch/x86/kernel/pci-calgary_64.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

include/asm-x86/rio.h

+0 −11
Original line number Diff line number Diff line
@@ -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 */