Added patch to fix bug #30092.

4 files changed, 36 insertions, 4 deletions

diff --git a/sys-kernel/ppc-sources/ChangeLog b/sys-kernel/ppc-sources/ChangeLog
index 62a7e40e2d8f..a4c16ee4127c 100644
--- a/sys-kernel/ppc-sources/ChangeLog
+++ b/sys-kernel/ppc-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/ppc-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.26 2003/09/29 19:02:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.27 2003/10/26 13:27:48 dholm Exp $
+
+  26 Oct 2003; David Holm <dholm@gentoo.org> ppc-sources-2.4.22-r1.ebuild,
+  files/ppc-sources-2.4.22-r1.via-pmu.diff:
+  I added a patch to fix bug #30092. I didn't bother changing the kernel version
+  to -r2 as it doesn't add new features so most people wouldn't want to rebuild
+  their kernels.
 
 *ppc-sources-2.4.22-r1 (29 Sep 2003)
 
diff --git a/sys-kernel/ppc-sources/Manifest b/sys-kernel/ppc-sources/Manifest
index 226cfa2e7613..e11c3ba136ea 100644
--- a/sys-kernel/ppc-sources/Manifest
+++ b/sys-kernel/ppc-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 bd84a90d27cb668fe11022681ce19d40 ChangeLog 4483
+MD5 5010520ad59d06c7f687aafdf630cd3e ChangeLog 4779
 MD5 fe945af4911b04acd2c0f473c7c64f35 metadata.xml 267
 MD5 a555cca52dd92b98a17a20e76214f0fc ppc-sources-2.4.19-r3.ebuild 3280
 MD5 15f531c3328380f23fcce66016551d75 ppc-sources-2.4.19-r4.ebuild 3436
@@ -11,7 +11,7 @@ MD5 7281eb6df391f8df34468fc1ae5f362a ppc-sources-2.4.20-r3.ebuild 1581
 MD5 0c87455c7827d620c19866c42554e4c9 ppc-sources-2.4.20-r4.ebuild 1590
 MD5 c0937dd36a0967da72475b6edf610981 ppc-sources-2.4.21-r1.ebuild 2026
 MD5 be1f0b985321d007f26975518de6eef8 ppc-sources-2.4.21-r2.ebuild 2025
-MD5 4308e5f235f2741226b6254ff042d650 ppc-sources-2.4.22-r1.ebuild 1268
+MD5 c0bc7bc817540ac090a2a23bfd97dbe2 ppc-sources-2.4.22-r1.ebuild 1352
 MD5 88a216bd55a77f58510b9a1c5c3767ce files/digest-ppc-sources-2.4.19 149
 MD5 6b15a062d96482772f860647c0088358 files/digest-ppc-sources-2.4.19-r3 149
 MD5 9cab1e75f8fcaef7441998de95c9b452 files/digest-ppc-sources-2.4.19-r4 149
@@ -24,3 +24,4 @@ MD5 33266b958177d39523bed77568596744 files/digest-ppc-sources-2.4.20-r4 142
 MD5 7e495d102909604f1af87a10949ee8ae files/digest-ppc-sources-2.4.21-r1 142
 MD5 a54eec24338bcac38c8801d23c526db0 files/digest-ppc-sources-2.4.21-r2 141
 MD5 d401640feba334b89b7426dc145901ee files/digest-ppc-sources-2.4.22-r1 133
+MD5 990ae6b085cb09866bfbb7d44076b8ce files/ppc-sources-2.4.22-r1.via-pmu.diff 907
diff --git a/sys-kernel/ppc-sources/files/ppc-sources-2.4.22-r1.via-pmu.diff b/sys-kernel/ppc-sources/files/ppc-sources-2.4.22-r1.via-pmu.diff
new file mode 100644
index 000000000000..7c760eab2ac3
--- /dev/null
+++ b/sys-kernel/ppc-sources/files/ppc-sources-2.4.22-r1.via-pmu.diff
@@ -0,0 +1,23 @@
+diff -Naur linux-2.4.22.orig/drivers/macintosh/via-pmu.c linux-2.4.22/drivers/macintosh/via-pmu.c
+--- linux-2.4.22.orig/drivers/macintosh/via-pmu.c	2003-10-26 13:11:39.000000000 +0100
++++ linux-2.4.22/drivers/macintosh/via-pmu.c	2003-10-26 13:11:24.000000000 +0100
+@@ -477,7 +477,9 @@
+ 	/* Create /proc/pmu */
+ 	proc_pmu_root = proc_mkdir("pmu", 0);
+ 	if (proc_pmu_root) {
++#ifdef CONFIG_PMAC_PBOOK
+ 		int i;
++#endif
+ 		proc_pmu_info = create_proc_read_entry("info", 0, proc_pmu_root,
+ 					proc_get_info, NULL);
+ 		proc_pmu_irqstats = create_proc_read_entry("interrupts", 0, proc_pmu_root,
+@@ -1373,8 +1375,8 @@
+ #endif /* CONFIG_PMAC_BACKLIGHT */
+ 		}
+ 	/* Tick interrupt */
+-	else if ((1 << pirq) & PMU_INT_TICK) {
+ #ifdef CONFIG_PMAC_PBOOK
++	else if ((1 << pirq) & PMU_INT_TICK) {
+ 		/* Environement or tick interrupt, query batteries */
+ 		if (pmu_battery_count) {
+ 			if ((--query_batt_timer) == 0) {
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
index bb27a4d92eb8..31c4a6cc4a6a 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild,v 1.2 2003/09/29 19:02:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild,v 1.3 2003/10/26 13:27:49 dholm Exp $
 
 IUSE=""
 
@@ -28,6 +28,8 @@ src_unpack() {
 
 	cd ${PF}
 	patch -p1 < ${WORKDIR}/patch-${OKV}-${MY_R} || die "patch failed"
+	patch -p1 < ${FILESDIR}/ppc-sources-2.4.22-r1.via-pmu.diff \
+		|| die "patch failed"
 
 	use xfs && ( ewarn "XFS is no longer included in ppc-sources!" )
 }