diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-06-16 18:33:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:47:46 -0400 |
commit | fb26b3e63e9685ce250377bf905c78425a8e8b2b (patch) | |
tree | 856872ef8a4ceb5ff04773c66b368295733ae17e | |
parent | 44377f622ee4f23ea0afc9b83dba5d3ec2d560cd (diff) |
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 <roel.kluin@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/alpha/kernel/setup.c | 6 | ||||
-rw-r--r-- | arch/alpha/mm/numa.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index 80df86cd746b..d2634e4476b4 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c | |||
@@ -252,9 +252,9 @@ reserve_std_resources(void) | |||
252 | } | 252 | } |
253 | 253 | ||
254 | #define PFN_MAX PFN_DOWN(0x80000000) | 254 | #define PFN_MAX PFN_DOWN(0x80000000) |
255 | #define for_each_mem_cluster(memdesc, cluster, i) \ | 255 | #define for_each_mem_cluster(memdesc, _cluster, i) \ |
256 | for ((cluster) = (memdesc)->cluster, (i) = 0; \ | 256 | for ((_cluster) = (memdesc)->cluster, (i) = 0; \ |
257 | (i) < (memdesc)->numclusters; (i)++, (cluster)++) | 257 | (i) < (memdesc)->numclusters; (i)++, (_cluster)++) |
258 | 258 | ||
259 | static unsigned long __init | 259 | static unsigned long __init |
260 | get_mem_size_limit(char *s) | 260 | get_mem_size_limit(char *s) |
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index a13de49d1265..0eab55749423 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c | |||
@@ -28,9 +28,9 @@ EXPORT_SYMBOL(node_data); | |||
28 | #define DBGDCONT(args...) | 28 | #define DBGDCONT(args...) |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | #define for_each_mem_cluster(memdesc, cluster, i) \ | 31 | #define for_each_mem_cluster(memdesc, _cluster, i) \ |
32 | for ((cluster) = (memdesc)->cluster, (i) = 0; \ | 32 | for ((_cluster) = (memdesc)->cluster, (i) = 0; \ |
33 | (i) < (memdesc)->numclusters; (i)++, (cluster)++) | 33 | (i) < (memdesc)->numclusters; (i)++, (_cluster)++) |
34 | 34 | ||
35 | static void __init show_mem_layout(void) | 35 | static void __init show_mem_layout(void) |
36 | { | 36 | { |