The patch titled
alpha: fix 2.6.30 smp build
has been added to the -mm tree. Its filename is
alpha-fix-2630-smp-build.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: alpha: fix 2.6.30 smp build
From: maximilian attems <max@xxxxxxx>
In file included from include/linux/percpu.h:10,
from /usr/src/devel/arch/alpha/include/asm/local.h:4,
from include/linux/module.h:20,
from arch/alpha/kernel/srm_env.c:33:
arch/alpha/include/asm/percpu.h:100:1: error: "PER_CPU_ATTRIBUTES" redefined
arch/alpha/include/asm/percpu.h:52:1: error: this is the location of the previous definition
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/include/asm/percpu.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/alpha/include/asm/percpu.h~alpha-fix-2630-smp-build arch/alpha/include/asm/percpu.h
--- a/arch/alpha/include/asm/percpu.h~alpha-fix-2630-smp-build
+++ a/arch/alpha/include/asm/percpu.h
@@ -95,8 +95,8 @@ extern unsigned long __per_cpu_offset[NR
#define PER_CPU_SHARED_ALIGNED_SECTION ""
#define PER_CPU_FIRST_SECTION ""
-#endif
-
#define PER_CPU_ATTRIBUTES
+#endif
+
#endif /* __ALPHA_PERCPU_H */
_
Patches currently in -mm which might be from max@xxxxxxx are
alpha-fix-2630-smp-build.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
