rpms/kernel/devel linux-2.6-ppc-perfctr-oops-fix.patch, NONE, 1.1 kernel.spec, 1.1680, 1.1681

David Woodhouse dwmw2 at fedoraproject.org
Sat Aug 1 13:31:25 UTC 2009


Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15502

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-ppc-perfctr-oops-fix.patch 
Log Message:
Fix ppc32 boot failure


linux-2.6-ppc-perfctr-oops-fix.patch:
 mpc7450-pmu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc-perfctr-oops-fix.patch ---
diff --git a/arch/powerpc/kernel/mpc7450-pmu.c b/arch/powerpc/kernel/mpc7450-pmu.c
index 75ff47f..ea383c1 100644
--- a/arch/powerpc/kernel/mpc7450-pmu.c
+++ b/arch/powerpc/kernel/mpc7450-pmu.c
@@ -408,7 +408,8 @@ struct power_pmu mpc7450_pmu = {
 
 static int init_mpc7450_pmu(void)
 {
-	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
+	if (cur_cpu_spec->oprofile_cpu_type &&
+	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
 		return -ENODEV;
 
 	return register_power_pmu(&mpc7450_pmu);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1680
retrieving revision 1.1681
diff -u -p -r1.1680 -r1.1681
--- kernel.spec	1 Aug 2009 03:45:36 -0000	1.1680
+++ kernel.spec	1 Aug 2009 13:31:25 -0000	1.1681
@@ -608,6 +608,7 @@ Patch141: linux-2.6-ps3-storage-alias.pa
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
+Patch148: linux-2.6-ppc-perfctr-oops-fix.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -1141,6 +1142,8 @@ ApplyPatch linux-2.6-g5-therm-shutdown.p
 ApplyPatch linux-2.6-vio-modalias.patch
 # Work around PCIe bridge setup on iSight
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
+# Fix oops in 7450 perfctr
+ApplyPatch linux-2.6-ppc-perfctr-oops-fix.patch
 
 #
 # SPARC64
@@ -1937,6 +1940,9 @@ fi
 # and build.
 
 %changelog
+* Sat Aug 01 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31-0.118.rc5
+- Fix boot failures on ppc32 (#514010, #505071)
+
 * Fri Jul 31 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.117.rc5
 - Linux 2.6.31-rc5
 




More information about the fedora-extras-commits mailing list