alpha: bad macro expansion, parameter is member

`for_each_mem_cluster(x, y, z)' will expand to
`for ((x) = (y)->x ...' but correct is `for ((x) = (y)->cluster ...'

Signed-off-by: Roel Kluin <[email protected]>
Cc: Richard Henderson <[email protected]>
Cc: Ivan Kokshaysky <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index 80df86cd746bd2e8ca81ef82f338f7b337c229d5..d2634e4476b4589f03831f575ec00751b0434ca9 100644 (file)
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -252,9 +252,9 @@ reserve_std_resources(void)
 }
 
 #define PFN_MAX                PFN_DOWN(0x80000000)
-#define for_each_mem_cluster(memdesc, cluster, i)              \
-       for ((cluster) = (memdesc)->cluster, (i) = 0;           \
-            (i) < (memdesc)->numclusters; (i)++, (cluster)++)
+#define for_each_mem_cluster(memdesc, _cluster, i)             \
+       for ((_cluster) = (memdesc)->cluster, (i) = 0;          \
+            (i) < (memdesc)->numclusters; (i)++, (_cluster)++)
 
 static unsigned long __init
 get_mem_size_limit(char *s)

diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index a13de49d126579c58f2b4d3131dd861741628d59..0eab55749423f2a9e8df8fade6a890efa6c0f480 100644 (file)
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -28,9 +28,9 @@ EXPORT_SYMBOL(node_data);
 #define DBGDCONT(args...)
 #endif
 
-#define for_each_mem_cluster(memdesc, cluster, i)              \
-       for ((cluster) = (memdesc)->cluster, (i) = 0;           \
-            (i) < (memdesc)->numclusters; (i)++, (cluster)++)
+#define for_each_mem_cluster(memdesc, _cluster, i)             \
+       for ((_cluster) = (memdesc)->cluster, (i) = 0;          \
+            (i) < (memdesc)->numclusters; (i)++, (_cluster)++)
 
 static void __init show_mem_layout(void)
 {