lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Merge 32 and 64 bits asm-powerpc/io.h

Browse Source 
powerpc: Merge 32 and 64 bits asm-powerpc/io.h

The rework on io.h done for the new hookable accessors made it easier,
so I just finished the work and merged 32 and 64 bits io.h for arch/powerpc.

arch/ppc still uses the old version in asm-ppc, there is just too much gunk
in there that I really can't be bothered trying to cleanup.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt
2006-11-13 09:27:39 +11:00
committed by Paul Mackerras
parent 3d1ea8e8cb
commit 68a64357d1
16 changed files with 364 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/platforms/iseries/setup.c
View File

@@ -617,13 +617,13 @@ static void iseries_dedicated_idle(void)
void __init iSeries_init_IRQ(void) { }
#endif
static void __iomem *iseries_ioremap(unsigned long address, unsigned long size,
static void __iomem *iseries_ioremap(phys_addr_t address, unsigned long size,
unsigned long flags)
{
return (void __iomem *)address;
}
static void iseries_iounmap(void __iomem *token)
static void iseries_iounmap(volatile void __iomem *token)
{
}