* - powerpc-swsusp-make-altivec-code-depend-on-config_altivec.patch removed from -mm tree
@ 2007-11-13 4:07 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2007-11-13 4:07 UTC (permalink / raw)
To: johannes, benh, paulus, mm-commits
The patch titled
powerpc swsusp: make altivec code depend on CONFIG_ALTIVEC
has been removed from the -mm tree. Its filename was
powerpc-swsusp-make-altivec-code-depend-on-config_altivec.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: powerpc swsusp: make altivec code depend on CONFIG_ALTIVEC
From: Johannes Berg <johannes@sipsolutions.net>
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@sipsolutions.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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@sipsolutions.net are
origin.patch
git-kbuild.patch
git-net.patch
git-wireless.patch
hibernate-fix-lockdep-report-2.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-11-13 4:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-13 4:07 - powerpc-swsusp-make-altivec-code-depend-on-config_altivec.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.