New revision + fix for nbd kernel panic (#105414).

(Portage version: 2.0.51.22-r3)

5 files changed, 86 insertions, 1 deletions

diff --git a/sys-kernel/hppa-sources/ChangeLog b/sys-kernel/hppa-sources/ChangeLog
index 274eb269f8ee..a643f88d5b95 100644
--- a/sys-kernel/hppa-sources/ChangeLog
+++ b/sys-kernel/hppa-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/hppa-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.60 2005/11/18 07:06:17 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.61 2005/12/05 19:06:25 gmsoft Exp $
+
+*hppa-sources-2.6.14.3_p0 (05 Dec 2005)
+
+  05 Dec 2005; Guy Martin <gmsoft@gentoo.org> +files/nbd-no-panic.diff,
+  +hppa-sources-2.6.14.3_p0.ebuild:
+  New revision + fix for nbd kernel panic (#105414).
 
 *hppa-sources-2.6.14.2_p0 (18 Nov 2005)
 
diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest
index 91793c3ea1bd..4e348b23121b 100644
--- a/sys-kernel/hppa-sources/Manifest
+++ b/sys-kernel/hppa-sources/Manifest
@@ -10,6 +10,7 @@ MD5 05ed5731534e9423f109cbec1aa7e993 metadata.xml 223
 MD5 977a9ee8ce7aa71db60103b17b323e99 hppa-sources-2.6.13_p1.ebuild 1411
 MD5 dfb6127d9409cff2c8890e6a9d58a720 hppa-sources-2.6.12.2_p2.ebuild 1242
 MD5 67d537d90ccdb5149d39cf9c90d9283b hppa-sources-2.6.12.4_p2.ebuild 1339
+MD5 836bacdea2137b35bb3427146a8fb5d8 hppa-sources-2.6.14.3_p0.ebuild 1442
 MD5 a77ee0efb03702047e015e1bb3bb3b86 hppa-sources-2.6.14.2_p0.ebuild 1412
 MD5 001b0a631c9fc28133013a1f8f78f74c files/CAN-2004-1056.patch 8458
 MD5 cd0a7533c43364e377348613c6d76bb7 files/CAN-2004-1235.patch 9736
@@ -26,4 +27,6 @@ MD5 25fcc554ea19ef82392e5f920ec83539 files/digest-hppa-sources-2.6.13_p1 201
 MD5 54105c5c37033ed1472d7a747c522e3e files/digest-hppa-sources-2.6.12.2_p2 262
 MD5 fde206859ab9582a5c727d7ccea34305 files/digest-hppa-sources-2.6.12.4_p2 263
 MD5 7b46dd1f32324db5bdffc2b0b822c546 files/ide-cdrom-fix.patch 480
+MD5 5045d497eb971d4951bc71b5757db05c files/digest-hppa-sources-2.6.14.3_p0 264
 MD5 8a0a82472bf0759088942e4203633946 files/digest-hppa-sources-2.6.14.2_p0 263
+MD5 ff248bdc7134617427d8a239643e26d5 files/nbd-no-panic.diff 710
diff --git a/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.14.3_p0 b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.14.3_p0
new file mode 100644
index 000000000000..c48a9da3b816
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/digest-hppa-sources-2.6.14.3_p0
@@ -0,0 +1,4 @@
+MD5 01261df81e15424320f3883ec09d6b0e patch-2.6.14.3.bz2 13172
+MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
+MD5 4be10c00527e9bd3532aaf97c39209de patch-2.6.14-pa0.gz 113555
+MD5 33af93f8f34ec2437fb41091176f7b14 4705_squashfs-2.1.patch.bz2 14357
diff --git a/sys-kernel/hppa-sources/files/nbd-no-panic.diff b/sys-kernel/hppa-sources/files/nbd-no-panic.diff
new file mode 100644
index 000000000000..a0580a3e1aa0
--- /dev/null
+++ b/sys-kernel/hppa-sources/files/nbd-no-panic.diff
@@ -0,0 +1,17 @@
+diff -uNr linux-2.6.14.3-pa0.orig/arch/parisc/mm/init.c linux-2.6.14.3-pa0/arch/parisc/mm/init.c
+--- linux-2.6.14.3-pa0.orig/arch/parisc/mm/init.c	2005-12-05 13:07:38.000000000 +0100
++++ linux-2.6.14.3-pa0/arch/parisc/mm/init.c	2005-12-05 13:08:55.000000000 +0100
+@@ -300,6 +300,13 @@
+ 			max_pfn = start_pfn + npages;
+ 	}
+ 
++	/* IOMMU is always used to access "high mem" on those boxes
++	 * that can support enough mem that a PCI device couldn't
++	 * directly DMA to any physical addresses.
++	 * ISA DMA support will need to revisit this.
++	 */
++	max_low_pfn = max_pfn;
++
+ 	if ((bootmap_pfn - bootmap_start_pfn) != bootmap_pages) {
+ 		printk(KERN_WARNING "WARNING! bootmap sizing is messed up!\n");
+ 		BUG();
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.6.14.3_p0.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.6.14.3_p0.ebuild
new file mode 100644
index 000000000000..917278391a7f
--- /dev/null
+++ b/sys-kernel/hppa-sources/hppa-sources-2.6.14.3_p0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.6.14.3_p0.ebuild,v 1.1 2005/12/05 19:06:25 gmsoft Exp $
+
+ETYPE="sources"
+
+CKV="${PV/_*}"
+K_NOUSENAME=true
+inherit kernel-2
+
+KV_FULL=${CKV}-pa${PATCH_LEVEL}
+detect_version
+
+
+DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
+PATCH_LEVEL="${PV/${CKV}_p/}"
+SRC_URI="${KERNEL_URI}
+http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz
+http://dev.gentoo.org/~dertobi123/hppa/4705_squashfs-2.1.patch.bz2"
+UNIPATCH_LIST="${T}/patch-${OKV}-pa${PATCH_LEVEL}.patch
+${FILESDIR}/nbd-no-panic.diff
+${DISTDIR}/4705_squashfs-2.1.patch.bz2"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org"
+KEYWORDS="-* hppa"
+
+
+src_unpack() {
+
+	if [[ -n ${KV_EXTRA} ]]
+	then
+
+		KV_EXTRA=".${KV_EXTRA}"
+
+		zcat ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz | \
+			sed -e "/+EXTRAVERSION/s/=.*\$/=/" > \
+			${T}/patch-${OKV}-pa${PATCH_LEVEL}.patch
+	else
+		zcat ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz > \
+			${T}/patch-${OKV}-pa${PATCH_LEVEL}.patch
+	fi
+
+	EXTRAVERSION=${KV_EXTRA}-pa${PATCH_LEVEL}
+
+	universal_unpack
+
+
+	# We force the order of patching. kernel-2.eclass does weird stuff
+	unipatch  ${UNIPATCH_LIST}
+	unipatch  ${UNIPATCH_LIST_DEFAULT}
+
+	unpack_set_extraversion
+	unpack_fix_docbook
+	unpack_fix_install_path
+
+}