leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: cleanup ioremap includes

Browse Source 
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: Thomas Gleixner <tglx@linutronix.de>

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2008-01-30 13:34:05 +01:00 committed by Ingo Molnar
parent 91eebf40b3
commit 3cbd09e482
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/mm/ioremap_32.c
View File

@ -6,18 +6,17 @@
* (C) Copyright 1995 1996 Linus Torvalds * (C) Copyright 1995 1996 Linus Torvalds
*/ */
#include <linux/vmalloc.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/fixmap.h> #include <linux/module.h>
#include <asm/cacheflush.h> #include <linux/slab.h>
#include <asm/tlbflush.h> #include <linux/vmalloc.h>
#include <asm/pgtable.h>
#define ISA_START_ADDRESS 0xa0000 #include <asm/cacheflush.h>
#define ISA_END_ADDRESS 0x100000 #include <asm/e820.h>
#include <asm/fixmap.h>
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
/* /*
* Remap an arbitrary physical address space into the kernel virtual * Remap an arbitrary physical address space into the kernel virtual

13
arch/x86/mm/ioremap_64.c
View File

@ -6,18 +6,17 @@
* (C) Copyright 1995 1996 Linus Torvalds * (C) Copyright 1995 1996 Linus Torvalds
*/ */
#include <linux/vmalloc.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/io.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/cacheflush.h>
#include <asm/proto.h>
#include <asm/e820.h> #include <asm/e820.h>
#include <asm/fixmap.h>
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
unsigned long __phys_addr(unsigned long x) unsigned long __phys_addr(unsigned long x)
{ {