Subject: [merged] mm-remove-unnecessary-variable-idx0-in-__early_ioremap.patch removed from -mm tree
To: wujianguo@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 14 Aug 2013 16:09:07 -0700
The patch titled
Subject: mm: remove unnecessary variable idx0 in __early_ioremap()
has been removed from the -mm tree. Its filename was
mm-remove-unnecessary-variable-idx0-in-__early_ioremap.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Jianguo Wu <wujianguo@xxxxxxxxxx>
Subject: mm: remove unnecessary variable idx0 in __early_ioremap()
After 8827247ffcc ("x86: don't define __this_fixmap_does_not_exist()"),
variable idx0 is no longer needed, so just remove it.
Signed-off-by: Jianguo Wu <wujianguo@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/mm/ioremap.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN arch/x86/mm/ioremap.c~mm-remove-unnecessary-variable-idx0-in-__early_ioremap arch/x86/mm/ioremap.c
--- a/arch/x86/mm/ioremap.c~mm-remove-unnecessary-variable-idx0-in-__early_ioremap
+++ a/arch/x86/mm/ioremap.c
@@ -487,7 +487,7 @@ __early_ioremap(resource_size_t phys_add
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_add
/*
* 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;
_
Patches currently in -mm which might be from wujianguo@xxxxxxxxxx are
mm-mempolicy-return-null-if-node-is-numa_no_node-in-get_task_policy.patch
mm-zbud-fix-some-trivial-typos-in-comments.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
