include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / arch / sh / mm / ioremap_fixed.c

diff --git a/arch/sh/mm/ioremap_fixed.c b/arch/sh/mm/ioremap_fixed.c
index 551b513..efbe84a 100644 (file)
--- a/arch/sh/mm/ioremap_fixed.c
+++ b/arch/sh/mm/ioremap_fixed.c
@@ -15,7 +15,6 @@
 #include <linux/io.h>
 #include <linux/bootmem.h>
 #include <linux/proc_fs.h>
-#include <linux/slab.h>
 #include <asm/fixmap.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
@@ -45,14 +44,21 @@ void __init ioremap_fixed_init(void)
 }
 
 void __init __iomem *
-ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
-             unsigned long size, pgprot_t prot)
+ioremap_fixed(phys_addr_t phys_addr, unsigned long size, pgprot_t prot)
 {
        enum fixed_addresses idx0, idx;
        struct ioremap_map *map;
        unsigned int nrpages;
+       unsigned long offset;
        int i, slot;
 
+       /*
+        * Mappings have to be page-aligned
+        */
+       offset = phys_addr & ~PAGE_MASK;
+       phys_addr &= PAGE_MASK;
+       size = PAGE_ALIGN(phys_addr + size) - phys_addr;
+
        slot = -1;
        for (i = 0; i < FIX_N_IOREMAPS; i++) {
                map = &ioremap_maps[i];
@@ -93,9 +99,7 @@ ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
 int iounmap_fixed(void __iomem *addr)
 {
        enum fixed_addresses idx;
-       unsigned long virt_addr;
        struct ioremap_map *map;
-       unsigned long offset;
        unsigned int nrpages;
        int i, slot;
 
@@ -114,12 +118,9 @@ int iounmap_fixed(void __iomem *addr)
        if (slot < 0)
                return -EINVAL;
 
-       virt_addr = (unsigned long)addr;
-
-       offset = virt_addr & ~PAGE_MASK;
-       nrpages = PAGE_ALIGN(offset + map->size - 1) >> PAGE_SHIFT;
+       nrpages = map->size >> PAGE_SHIFT;
 
-       idx = FIX_IOREMAP_BEGIN + slot + nrpages;
+       idx = FIX_IOREMAP_BEGIN + slot + nrpages - 1;
        while (nrpages > 0) {
                __clear_fixmap(idx, __pgprot(_PAGE_WIRED));
                --idx;