The patch titled
powerpc swsusp: make altivec code depend on CONFIG_ALTIVEC
has been added to the -mm tree. Its filename is
powerpc-swsusp-make-altivec-code-depend-on-config_altivec.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: powerpc swsusp: make altivec code depend on CONFIG_ALTIVEC
From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
This makes the altivec code in swsusp_32.S depend on CONFIG_ALTIVEC to
avoid build failures for systems that don't have altivec. I'm not sure
whether the code will actually work for other systems, but it was merged
for just ppc32 rather than powermac a very long time ago.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/kernel/swsusp_32.S | 2 ++
1 file changed, 2 insertions(+)
diff -puN arch/powerpc/kernel/swsusp_32.S~powerpc-swsusp-make-altivec-code-depend-on-config_altivec arch/powerpc/kernel/swsusp_32.S
--- a/arch/powerpc/kernel/swsusp_32.S~powerpc-swsusp-make-altivec-code-depend-on-config_altivec
+++ a/arch/powerpc/kernel/swsusp_32.S
@@ -133,10 +133,12 @@ _GLOBAL(swsusp_arch_suspend)
/* Resume code */
_GLOBAL(swsusp_arch_resume)
+#ifdef CONFIG_ALTIVEC
/* Stop pending alitvec streams and memory accesses */
BEGIN_FTR_SECTION
DSSALL
END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
+#endif
sync
/* Disable MSR:DR to make sure we don't take a TLB or
_
Patches currently in -mm which might be from johannes@xxxxxxxxxxxxxxxx are
powerpc-swsusp-make-altivec-code-depend-on-config_altivec.patch
git-kbuild.patch
git-wireless.patch
hibernate-fix-lockdep-report-2.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
