[kernel] r5571 - dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches

[Martin Michlmayr]

Author: tbm
Date: Mon Jan 23 12:45:51 2006
New Revision: 5571

Added:
   dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/68_fix_iomap_nonpci.dpatch   (contents, props changed)
Modified:
   dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/00list
Log:
don't include iomap if we don't have PCI


Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/00list
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/00list	(original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/00list	Mon Jan 23 12:45:51 2006
@@ -30,3 +30,4 @@
 65_fix_gcc4_opt.dpatch
 66_uaccess_ro_fix.dpatch
 67_check_nonzero_funpoint.dpatch
+68_fix_iomap_nonpci.dpatch

Added: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/68_fix_iomap_nonpci.dpatch
==============================================================================
--- (empty file)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/68_fix_iomap_nonpci.dpatch	Mon Jan 23 12:45:51 2006
@@ -0,0 +1,43 @@
+#! /bin/sh -e
+## 68_fix_iomap_nonpci.dpatch by Maciej W. Rozycki <macro at linux-mips.org>
+##
+## DP: Only include iomap on systems with PCI
+## DP: Upstream status: depends on iomap which is not in linux-mips git
+
+## DECstation fails to compile without this path:
+## tbm>   CC      arch/mips/lib/iomap.o
+#  tbm> arch/mips/lib/iomap.c: In function ‘pci_iomap’:
+#  tbm> arch/mips/lib/iomap.c:66: error: ‘_CACHE_CACHABLE_COW’ undeclared (first use in this function)
+#
+#  Yes, R3000 does not define _CACHE_CACHABLE_COW.
+
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+--- a/arch/mips/lib/Makefile~	2006-01-23 12:42:02.000000000 +0000
++++ b/arch/mips/lib/Makefile	2006-01-23 12:42:11.000000000 +0000
+@@ -4,6 +4,6 @@
+ 
+ lib-y	+= csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \
+ 	   strnlen_user.o uncached.o
+-obj-$(CONFIG_PCI)	+= iomap.o
++obj-y	+= iomap.o
+ 
+ EXTRA_AFLAGS := $(CFLAGS)
+