Merge tag 'master-2013-09-09' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[~andy/linux] / arch / x86 / mm / ioremap.c

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 0215e2c563ef5bbbaebd0e4f2666023f0afdef1d..799580cabc787106b93041d3c15366c0a50b3151 100644 (file)
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -487,7 +487,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)
        unsigned long offset;
        resource_size_t last_addr;
        unsigned int nrpages;
-       enum fixed_addresses idx0, idx;
+       enum fixed_addresses idx;
        int i, slot;
 
        WARN_ON(system_state != SYSTEM_BOOTING);
@@ -540,8 +540,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)
        /*
         * Ok, go for it..
         */
-       idx0 = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot;
-       idx = idx0;
+       idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot;
        while (nrpages > 0) {
                early_set_fixmap(idx, phys_addr, prot);
                phys_addr += PAGE_SIZE;