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

Commit 3cbd09e4 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: cleanup ioremap includes 



Get rid of the douplicate define of ISA_START/END_ADDRESS and use the
same headers in 32 and 64 bit code.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 91eebf40

arch/x86/mm/ioremap_32.c

+7 −8
Original line number Diff line number Diff line
@@ -6,18 +6,17 @@ 
 * (C) Copyright 1995 1996 Linus Torvalds

 */



#include <linux/vmalloc.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/io.h>

#include <asm/fixmap.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>



#include <asm/cacheflush.h>

#include <asm/tlbflush.h>

#include <asm/e820.h>

#include <asm/fixmap.h>

#include <asm/pgtable.h>



#define ISA_START_ADDRESS	0xa0000

#define ISA_END_ADDRESS		0x100000

#include <asm/tlbflush.h>



/*

 * Remap an arbitrary physical address space into the kernel virtual

arch/x86/mm/ioremap_64.c

+6 −7
Original line number Diff line number Diff line
@@ -6,18 +6,17 @@ 
 * (C) Copyright 1995 1996 Linus Torvalds

 */



#include <linux/vmalloc.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>



#include <asm/pgalloc.h>

#include <asm/fixmap.h>

#include <asm/tlbflush.h>

#include <asm/cacheflush.h>

#include <asm/proto.h>

#include <asm/e820.h>

#include <asm/fixmap.h>

#include <asm/pgtable.h>

#include <asm/tlbflush.h>



unsigned long __phys_addr(unsigned long x)

{