From 1060ecc3d260b5b862bbf5ebadf47cc56cd9a3c9 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Sun, 24 Apr 2011 21:44:39 -0400
Subject: [PATCH] ppc64: disable CONFIG_TUNE_CELL

---
 config-powerpc64 | 2 +-
 kernel.spec      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config-powerpc64 b/config-powerpc64
index 74f33d1aa..2946a0686 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -126,7 +126,7 @@ CONFIG_SCSI_IBMVSCSIS=m
 
 CONFIG_SECCOMP=y
 
-CONFIG_TUNE_CELL=y
+# CONFIG_TUNE_CELL is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_BLK_DEV_PLATFORM is not set
diff --git a/kernel.spec b/kernel.spec
index 0a717df57..6f42de1ca 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1941,6 +1941,10 @@ fi
 # and build.
 
 %changelog
+* Sun Apr 24 2011 Kyle McMartin <kmcmartin@redhat.com>
+- ppc64: disable TUNE_CELL, which causes problems with illegal instuctions
+  being generated on non-Cell PPC machines. (#698256)
+
 * Wed Apr 20 2011 Dave Jones <davej@redhat.com> 2.6.39-0.rc4.git2.0
 - Update to 2.6.39-rc4-git2