r3800 - in trunk/kernel/source/linux-2.6/debian: . patches-arch
templates
Kyle McMartin
kyle at costa.debian.org
Wed Aug 10 01:47:17 UTC 2005
Author: kyle
Date: 2005-08-10 01:47:11 +0000 (Wed, 10 Aug 2005)
New Revision: 3800
Modified:
trunk/kernel/source/linux-2.6/debian/changelog
trunk/kernel/source/linux-2.6/debian/patches-arch/hppa.diff
trunk/kernel/source/linux-2.6/debian/templates/control.source.in
Log:
Ok, hppa will build now once the toolchain is fixed.
Modified: trunk/kernel/source/linux-2.6/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6/debian/changelog 2005-08-09 22:53:37 UTC (rev 3799)
+++ trunk/kernel/source/linux-2.6/debian/changelog 2005-08-10 01:47:11 UTC (rev 3800)
@@ -12,6 +12,11 @@
Closes: #321885
* Link palinfo statically on ia64. (dann frazier) (Closes: #321885)
+
+ * [hppa] :
+ - Add hppa arch specific patch.
+ - Build-Depend on binutils-hppa64 and gcc-4.0-hppa64.
+ (Kyle McMartin)
-- Simon Horman <horms at debian.org> Tue, 9 Aug 2005 11:00:51 +0900
Modified: trunk/kernel/source/linux-2.6/debian/patches-arch/hppa.diff
===================================================================
--- trunk/kernel/source/linux-2.6/debian/patches-arch/hppa.diff 2005-08-09 22:53:37 UTC (rev 3799)
+++ trunk/kernel/source/linux-2.6/debian/patches-arch/hppa.diff 2005-08-10 01:47:11 UTC (rev 3800)
@@ -1,6 +1,7 @@
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/CREDITS CVS2_6_12_PA2/CREDITS
---- LINUS_2_6_12/CREDITS 2005-06-17 21:21:44.000000000 -0600
-+++ CVS2_6_12_PA2/CREDITS 2005-06-17 21:32:28.000000000 -0600
+Index: linux-2.6-2.6.12/CREDITS
+===================================================================
+--- linux-2.6-2.6.12.orig/CREDITS 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/CREDITS 2005-08-09 17:53:35.000000000 -0400
@@ -611,8 +611,7 @@
N: Randolph Chung
E: tausq at debian.org
@@ -11,9 +12,10 @@
N: Juan Jose Ciarlante
W: http://juanjox.kernelnotes.org/
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/Documentation/parisc/todo CVS2_6_12_PA2/Documentation/parisc/todo
---- LINUS_2_6_12/Documentation/parisc/todo 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/Documentation/parisc/todo 2005-04-27 00:45:20.000000000 -0600
+Index: linux-2.6-2.6.12/Documentation/parisc/todo
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/Documentation/parisc/todo 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,82 @@
+Status 2005-03-07 :
+-------------------
@@ -97,9 +99,10 @@
+ - fix HIL problem: ksoftirqd/0 eats 56% cpu (kernel 2.4 & kernel 2.6)
+ - NPTL kernel support (CLONE_*TID flags need to be correctly handled by
+ sys_clone() and friends)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/MAINTAINERS CVS2_6_12_PA2/MAINTAINERS
---- LINUS_2_6_12/MAINTAINERS 2005-06-17 21:21:44.000000000 -0600
-+++ CVS2_6_12_PA2/MAINTAINERS 2005-06-17 21:32:28.000000000 -0600
+Index: linux-2.6-2.6.12/MAINTAINERS
+===================================================================
+--- linux-2.6-2.6.12.orig/MAINTAINERS 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/MAINTAINERS 2005-08-09 17:53:35.000000000 -0400
@@ -191,6 +191,13 @@
W: http://linux.thorsten-knabe.de
S: Maintained
@@ -114,9 +117,10 @@
ADM1025 HARDWARE MONITOR DRIVER
P: Jean Delvare
M: khali at linux-fr.org
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/ia64/ia32/ia32_signal.c CVS2_6_12_PA2/arch/ia64/ia32/ia32_signal.c
---- LINUS_2_6_12/arch/ia64/ia32/ia32_signal.c 2005-06-17 21:21:49.000000000 -0600
-+++ CVS2_6_12_PA2/arch/ia64/ia32/ia32_signal.c 2005-05-08 19:59:59.000000000 -0600
+Index: linux-2.6-2.6.12/arch/ia64/ia32/ia32_signal.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/ia64/ia32/ia32_signal.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/ia64/ia32/ia32_signal.c 2005-08-09 17:53:35.000000000 -0400
@@ -24,6 +24,7 @@
#include <linux/unistd.h>
#include <linux/wait.h>
@@ -125,9 +129,10 @@
#include <asm/intrinsics.h>
#include <asm/uaccess.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/ia64/ia32/ia32priv.h CVS2_6_12_PA2/arch/ia64/ia32/ia32priv.h
---- LINUS_2_6_12/arch/ia64/ia32/ia32priv.h 2005-06-17 21:21:49.000000000 -0600
-+++ CVS2_6_12_PA2/arch/ia64/ia32/ia32priv.h 2005-04-12 14:38:26.000000000 -0600
+Index: linux-2.6-2.6.12/arch/ia64/ia32/ia32priv.h
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/ia64/ia32/ia32priv.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/ia64/ia32/ia32priv.h 2005-08-09 17:53:35.000000000 -0400
@@ -225,58 +225,6 @@
unsigned int st_ino_hi;
};
@@ -187,9 +192,10 @@
struct old_linux32_dirent {
u32 d_ino;
u32 d_offset;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/Kconfig CVS2_6_12_PA2/arch/parisc/Kconfig
---- LINUS_2_6_12/arch/parisc/Kconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/Kconfig 2005-05-08 20:00:05.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -150,7 +150,7 @@
config DISCONTIGMEM
@@ -199,9 +205,26 @@
help
Say Y to support efficient handling of discontiguous physical memory,
for architectures which are either NUMA (Non-Uniform Memory Access)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/Makefile CVS2_6_12_PA2/arch/parisc/Makefile
---- LINUS_2_6_12/arch/parisc/Makefile 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/Makefile 2005-04-05 08:15:46.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/Makefile
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/Makefile 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/Makefile 2005-08-09 17:53:47.000000000 -0400
+@@ -20,13 +20,13 @@
+ CHECKFLAGS += -D__hppa__=1
+
+ ifdef CONFIG_64BIT
+-CROSS_COMPILE := hppa64-linux-
++CROSS_COMPILE := hppa64-linux-gnu-
+ UTS_MACHINE := parisc64
+ CHECKFLAGS += -D__LP64__=1 -m64
+ else
+ MACHINE := $(subst 64,,$(shell uname -m))
+ ifneq ($(MACHINE),parisc)
+-CROSS_COMPILE := hppa-linux-
++CROSS_COMPILE := hppa-linux-gnu-
+ endif
+ endif
+
@@ -34,6 +34,11 @@
OBJCOPY_FLAGS =-O binary -R .note -R .comment -S
@@ -214,9 +237,19 @@
cflags-y := -pipe
# These flags should be implied by an hppa-linux configuration, but they
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/configs/712_defconfig CVS2_6_12_PA2/arch/parisc/configs/712_defconfig
---- LINUS_2_6_12/arch/parisc/configs/712_defconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/configs/712_defconfig 2005-06-03 13:06:36.000000000 -0600
+@@ -43,7 +48,7 @@
+ # Currently we save and restore fpregs on all kernel entry/interruption paths.
+ # If that gets optimized, we might need to disable the use of fpregs in the
+ # kernel.
+-#cflags-y += -mdisable-fpregs
++cflags-y += -mdisable-fpregs
+
+ # Without this, "ld -r" results in .text sections that are too big
+ # (> 0x40000) for branches to reach stubs.
+Index: linux-2.6-2.6.12/arch/parisc/configs/712_defconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/configs/712_defconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/configs/712_defconfig 2005-08-09 17:53:35.000000000 -0400
@@ -1,12 +1,16 @@
#
# Automatically generated make config: don't edit
@@ -566,9 +599,10 @@
# Library routines
#
CONFIG_CRC_CCITT=m
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/configs/a500_defconfig CVS2_6_12_PA2/arch/parisc/configs/a500_defconfig
---- LINUS_2_6_12/arch/parisc/configs/a500_defconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/configs/a500_defconfig 2005-06-03 13:06:36.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/configs/a500_defconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/configs/a500_defconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/configs/a500_defconfig 2005-08-09 17:53:35.000000000 -0400
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -760,9 +794,10 @@
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_TWOFISH=m
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/configs/b180_defconfig CVS2_6_12_PA2/arch/parisc/configs/b180_defconfig
---- LINUS_2_6_12/arch/parisc/configs/b180_defconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/configs/b180_defconfig 2005-06-03 13:06:36.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/configs/b180_defconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/configs/b180_defconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/configs/b180_defconfig 2005-08-09 17:53:35.000000000 -0400
@@ -1,12 +1,16 @@
#
# Automatically generated make config: don't edit
@@ -1178,9 +1213,10 @@
# Library routines
#
# CONFIG_CRC_CCITT is not set
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/configs/c3000_defconfig CVS2_6_12_PA2/arch/parisc/configs/c3000_defconfig
---- LINUS_2_6_12/arch/parisc/configs/c3000_defconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/configs/c3000_defconfig 2005-06-03 13:06:36.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/configs/c3000_defconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/configs/c3000_defconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/configs/c3000_defconfig 2005-08-09 17:53:35.000000000 -0400
@@ -1,12 +1,16 @@
#
# Automatically generated make config: don't edit
@@ -1613,9 +1649,10 @@
# Library routines
#
CONFIG_CRC_CCITT=m
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/entry.S CVS2_6_12_PA2/arch/parisc/kernel/entry.S
---- LINUS_2_6_12/arch/parisc/kernel/entry.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/entry.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/entry.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/entry.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/entry.S 2005-08-09 17:53:35.000000000 -0400
@@ -30,14 +30,14 @@
* - save registers to kernel stack and handle in assembly or C */
@@ -2196,9 +2233,10 @@
ldo -16(%r30),%r29 /* Reference param save area */
#endif
BL do_signal,%r2
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/head.S CVS2_6_12_PA2/arch/parisc/kernel/head.S
---- LINUS_2_6_12/arch/parisc/kernel/head.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/head.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/head.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/head.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/head.S 2005-08-09 17:53:35.000000000 -0400
@@ -12,7 +12,7 @@
* Initial Version 04-23-1999 by Helge Deller <deller at gmx.de>
*/
@@ -2380,9 +2418,10 @@
.word 0
-#endif /*!LP64*/
+#endif /*!CONFIG_64BIT*/
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/ioctl32.c CVS2_6_12_PA2/arch/parisc/kernel/ioctl32.c
---- LINUS_2_6_12/arch/parisc/kernel/ioctl32.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/ioctl32.c 2005-04-12 13:17:10.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/ioctl32.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/ioctl32.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/ioctl32.c 2005-08-09 17:53:35.000000000 -0400
@@ -104,12 +104,9 @@
}
@@ -2457,9 +2496,10 @@
return ret;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/pacache.S CVS2_6_12_PA2/arch/parisc/kernel/pacache.S
---- LINUS_2_6_12/arch/parisc/kernel/pacache.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/pacache.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/pacache.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/pacache.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/pacache.S 2005-08-09 17:53:35.000000000 -0400
@@ -26,7 +26,7 @@
* can be used.
*/
@@ -2838,9 +2878,10 @@
rfi
nop
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/pci-dma.c CVS2_6_12_PA2/arch/parisc/kernel/pci-dma.c
---- LINUS_2_6_12/arch/parisc/kernel/pci-dma.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/pci-dma.c 2005-06-04 13:09:08.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/pci-dma.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/pci-dma.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/pci-dma.c 2005-08-09 17:53:35.000000000 -0400
@@ -31,7 +31,7 @@
#include <asm/page.h> /* get_order */
#include <asm/pgalloc.h>
@@ -2850,9 +2891,10 @@
static struct proc_dir_entry * proc_gsc_root = NULL;
static int pcxl_proc_info(char *buffer, char **start, off_t offset, int length);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/pci.c CVS2_6_12_PA2/arch/parisc/kernel/pci.c
---- LINUS_2_6_12/arch/parisc/kernel/pci.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/pci.c 2004-11-02 17:57:49.000000000 -0700
+Index: linux-2.6-2.6.12/arch/parisc/kernel/pci.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/pci.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/pci.c 2005-08-09 17:53:35.000000000 -0400
@@ -202,7 +202,8 @@
pcibios_link_hba_resources( struct resource *hba_res, struct resource *r)
{
@@ -2863,9 +2905,10 @@
r->parent = hba_res;
/* reverse link is harder *sigh* */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/pdc_cons.c CVS2_6_12_PA2/arch/parisc/kernel/pdc_cons.c
---- LINUS_2_6_12/arch/parisc/kernel/pdc_cons.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/pdc_cons.c 2005-03-15 07:02:43.000000000 -0700
+Index: linux-2.6-2.6.12/arch/parisc/kernel/pdc_cons.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/pdc_cons.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/pdc_cons.c 2005-08-09 17:53:35.000000000 -0400
@@ -41,7 +41,7 @@
/* Define EARLY_BOOTUP_DEBUG to debug kernel related boot problems.
@@ -2972,9 +3015,10 @@
pdc_console_init_force();
}
-
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/perf.c CVS2_6_12_PA2/arch/parisc/kernel/perf.c
---- LINUS_2_6_12/arch/parisc/kernel/perf.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/perf.c 2005-03-18 10:31:41.000000000 -0700
+Index: linux-2.6-2.6.12/arch/parisc/kernel/perf.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/perf.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/perf.c 2005-08-09 17:53:35.000000000 -0400
@@ -746,7 +746,8 @@
uint64_t *bptr;
uint32_t dwords;
@@ -3006,9 +3050,10 @@
}
return 0;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/process.c CVS2_6_12_PA2/arch/parisc/kernel/process.c
---- LINUS_2_6_12/arch/parisc/kernel/process.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/process.c 2005-05-21 19:10:45.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/process.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/process.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/process.c 2005-08-09 17:53:35.000000000 -0400
@@ -9,7 +9,7 @@
* Copyright (C) 2000-2003 Paul Bame <bame at parisc-linux.org>
* Copyright (C) 2000 Philipp Rumpf <prumpf with tux.org>
@@ -3018,9 +3063,10 @@
* Copyright (C) 2000 Grant Grundler <grundler with parisc-linux.org>
* Copyright (C) 2001 Alan Modra <amodra at parisc-linux.org>
* Copyright (C) 2001-2002 Ryan Bradetich <rbrad at parisc-linux.org>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/real2.S CVS2_6_12_PA2/arch/parisc/kernel/real2.S
---- LINUS_2_6_12/arch/parisc/kernel/real2.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/real2.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/real2.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/real2.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/real2.S 2005-08-09 17:53:35.000000000 -0400
@@ -7,8 +7,10 @@
* Copyright (C) 2000 Hewlett Packard (Paul Bame bame at puffin.external.hp.com)
*
@@ -3146,9 +3192,10 @@
bve (%r2)
#else
bv %r0(%r2)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/signal.c CVS2_6_12_PA2/arch/parisc/kernel/signal.c
---- LINUS_2_6_12/arch/parisc/kernel/signal.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/signal.c 2005-06-05 21:10:06.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/signal.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/signal.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/signal.c 2005-08-09 17:53:35.000000000 -0400
@@ -637,6 +637,7 @@
/* Stack is 64-byte aligned, and we only
* need to flush 1 cache line */
@@ -3157,9 +3204,10 @@
"fic 0(%%sr3, %0)\n"
"sync\n"
: : "r"(regs->gr[30]));
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/smp.c CVS2_6_12_PA2/arch/parisc/kernel/smp.c
---- LINUS_2_6_12/arch/parisc/kernel/smp.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/smp.c 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/smp.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/smp.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/smp.c 2005-08-09 17:53:35.000000000 -0400
@@ -18,7 +18,7 @@
*/
#undef ENTRY_SYS_CPUS /* syscall support for iCOD-like functionality */
@@ -3169,9 +3217,10 @@
#include <linux/types.h>
#include <linux/spinlock.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/syscall.S CVS2_6_12_PA2/arch/parisc/kernel/syscall.S
---- LINUS_2_6_12/arch/parisc/kernel/syscall.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/syscall.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/syscall.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/syscall.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/syscall.S 2005-08-09 17:53:35.000000000 -0400
@@ -4,8 +4,9 @@
* System call entry code Copyright (c) Matthew Wilcox 1999 <willy at bofh.ai>
* Licensed under the GNU GPL.
@@ -3344,9 +3393,10 @@
.align 4096
.export sys_call_table64
.Lsys_call_table64:
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/syscall_table.S CVS2_6_12_PA2/arch/parisc/kernel/syscall_table.S
---- LINUS_2_6_12/arch/parisc/kernel/syscall_table.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/syscall_table.S 2005-05-14 22:38:00.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/syscall_table.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/syscall_table.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/syscall_table.S 2005-08-09 17:53:35.000000000 -0400
@@ -35,7 +35,7 @@
#undef ENTRY_UHOH
#undef ENTRY_COMP
@@ -3375,9 +3425,10 @@
+ ENTRY_SAME(keyctl)
/* Nothing yet */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/time.c CVS2_6_12_PA2/arch/parisc/kernel/time.c
---- LINUS_2_6_12/arch/parisc/kernel/time.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/time.c 2005-04-09 00:23:13.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/time.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/time.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/time.c 2005-08-09 17:53:35.000000000 -0400
@@ -89,14 +89,6 @@
}
}
@@ -3418,9 +3469,10 @@
/*** converted from ia64 ***/
/*
* Return the number of micro-seconds that elapsed since the last
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/unaligned.c CVS2_6_12_PA2/arch/parisc/kernel/unaligned.c
---- LINUS_2_6_12/arch/parisc/kernel/unaligned.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/unaligned.c 2005-05-19 18:05:12.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/unaligned.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/unaligned.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/unaligned.c 2005-08-09 17:53:35.000000000 -0400
@@ -513,15 +513,18 @@
register int flop=0; /* true if this is a flop */
@@ -3454,9 +3506,30 @@
if (!unaligned_enabled)
goto force_sigbus;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/block/Kconfig CVS2_6_12_PA2/drivers/block/Kconfig
---- LINUS_2_6_12/drivers/block/Kconfig 2005-06-17 21:21:57.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/block/Kconfig 2005-05-08 20:00:21.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/lib/memcpy.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/lib/memcpy.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/lib/memcpy.c 2005-08-09 17:53:35.000000000 -0400
+@@ -339,6 +339,7 @@
+ pds = (double *)pcs;
+ pdd = (double *)pcd;
+
++#if 0
+ /* Copy 8 doubles at a time */
+ while (len >= 8*sizeof(double)) {
+ register double r1, r2, r3, r4, r5, r6, r7, r8;
+@@ -366,6 +367,7 @@
+ fstdma(d_space, r8, pdd, pmc_store_exc);
+ len -= 8*sizeof(double);
+ }
++#endif
+
+ pws = (unsigned int *)pds;
+ pwd = (unsigned int *)pdd;
+Index: linux-2.6-2.6.12/drivers/block/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/block/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/block/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -6,7 +6,7 @@
config BLK_DEV_FD
@@ -3466,9 +3539,10 @@
---help---
If you want to use the floppy disk drive(s) of your PC under Linux,
say Y. Information about this driver, especially important for IBM
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/ide/Kconfig CVS2_6_12_PA2/drivers/ide/Kconfig
---- LINUS_2_6_12/drivers/ide/Kconfig 2005-06-17 21:21:58.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/ide/Kconfig 2005-03-18 06:16:50.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/ide/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/ide/Kconfig 2005-08-09 17:50:50.000000000 -0400
++++ linux-2.6-2.6.12/drivers/ide/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -610,7 +610,7 @@
tristate "NS87415 chipset support"
help
@@ -3478,9 +3552,10 @@
Please read the comments at the top of <file:drivers/ide/pci/ns87415.c>.
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/input/keyboard/hil_kbd.c CVS2_6_12_PA2/drivers/input/keyboard/hil_kbd.c
---- LINUS_2_6_12/drivers/input/keyboard/hil_kbd.c 2005-06-17 21:21:59.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/input/keyboard/hil_kbd.c 2005-03-25 22:00:08.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/input/keyboard/hil_kbd.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/input/keyboard/hil_kbd.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/input/keyboard/hil_kbd.c 2005-08-09 17:53:35.000000000 -0400
@@ -204,7 +204,7 @@
hil_packet packet;
int idx;
@@ -3558,9 +3633,10 @@
.connect = hil_kbd_connect,
.disconnect = hil_kbd_disconnect,
.interrupt = hil_kbd_interrupt
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/input/keyboard/hilkbd.c CVS2_6_12_PA2/drivers/input/keyboard/hilkbd.c
---- LINUS_2_6_12/drivers/input/keyboard/hilkbd.c 2005-06-17 21:21:59.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/input/keyboard/hilkbd.c 2005-01-11 07:11:34.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/input/keyboard/hilkbd.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/input/keyboard/hilkbd.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/input/keyboard/hilkbd.c 2005-08-09 17:53:35.000000000 -0400
@@ -22,7 +22,7 @@
#include <linux/errno.h>
#include <linux/input.h>
@@ -3570,9 +3646,10 @@
#include <linux/hil.h>
#include <linux/spinlock.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/input/mouse/hil_ptr.c CVS2_6_12_PA2/drivers/input/mouse/hil_ptr.c
---- LINUS_2_6_12/drivers/input/mouse/hil_ptr.c 2005-06-17 21:21:59.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/input/mouse/hil_ptr.c 2005-03-25 22:00:10.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/input/mouse/hil_ptr.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/input/mouse/hil_ptr.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/input/mouse/hil_ptr.c 2005-08-09 17:53:35.000000000 -0400
@@ -196,7 +196,7 @@
hil_packet packet;
int idx;
@@ -3656,9 +3733,10 @@
};
static int __init hil_ptr_init(void)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/input/serio/hil_mlc.c CVS2_6_12_PA2/drivers/input/serio/hil_mlc.c
---- LINUS_2_6_12/drivers/input/serio/hil_mlc.c 2005-06-17 21:21:59.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/input/serio/hil_mlc.c 2005-04-04 14:46:50.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/input/serio/hil_mlc.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/input/serio/hil_mlc.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/input/serio/hil_mlc.c 2005-08-09 17:53:35.000000000 -0400
@@ -801,7 +801,8 @@
struct hil_mlc_serio_map *map;
struct hil_mlc *mlc;
@@ -3698,9 +3776,10 @@
mlc_serio->write = hil_mlc_serio_write;
mlc_serio->open = hil_mlc_serio_open;
mlc_serio->close = hil_mlc_serio_close;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/isdn/hisax/Kconfig CVS2_6_12_PA2/drivers/isdn/hisax/Kconfig
---- LINUS_2_6_12/drivers/isdn/hisax/Kconfig 2005-06-17 21:22:00.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/isdn/hisax/Kconfig 2005-03-18 06:16:55.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/isdn/hisax/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/isdn/hisax/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/isdn/hisax/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -110,7 +110,7 @@
config HISAX_TELESPCI
@@ -3754,9 +3833,10 @@
help
This enables HiSax support for the AMD7930 chips on some SPARCs.
This code is not finished yet.
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/isdn/pcbit/Kconfig CVS2_6_12_PA2/drivers/isdn/pcbit/Kconfig
---- LINUS_2_6_12/drivers/isdn/pcbit/Kconfig 2005-06-17 21:22:00.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/isdn/pcbit/Kconfig 2005-03-07 08:07:30.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/isdn/pcbit/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/isdn/pcbit/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/isdn/pcbit/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -3,7 +3,7 @@
#
config ISDN_DRV_PCBIT
@@ -3766,9 +3846,10 @@
help
This enables support for the PCBIT ISDN-card. This card is
manufactured in Portugal by Octal. For running this card,
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/net/tulip/media.c CVS2_6_12_PA2/drivers/net/tulip/media.c
---- LINUS_2_6_12/drivers/net/tulip/media.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/net/tulip/media.c 2005-06-11 11:12:08.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/net/tulip/media.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/net/tulip/media.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/net/tulip/media.c 2005-08-09 17:53:35.000000000 -0400
@@ -44,8 +44,10 @@
/* MII transceiver control section.
@@ -3840,9 +3921,10 @@
tmp_info = get_u16(&misc_info[1]);
if (tmp_info)
tp->advertising[phy_num] = tmp_info | 1;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/net/tulip/tulip.h CVS2_6_12_PA2/drivers/net/tulip/tulip.h
---- LINUS_2_6_12/drivers/net/tulip/tulip.h 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/net/tulip/tulip.h 2005-03-18 06:17:09.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/net/tulip/tulip.h
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/net/tulip/tulip.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/net/tulip/tulip.h 2005-08-09 17:53:35.000000000 -0400
@@ -475,8 +475,11 @@
udelay(10);
@@ -3857,9 +3939,10 @@
}
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/net/tulip/tulip_core.c CVS2_6_12_PA2/drivers/net/tulip/tulip_core.c
---- LINUS_2_6_12/drivers/net/tulip/tulip_core.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/net/tulip/tulip_core.c 2005-05-25 11:12:47.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/net/tulip/tulip_core.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/net/tulip/tulip_core.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/net/tulip/tulip_core.c 2005-08-09 17:53:35.000000000 -0400
@@ -22,7 +22,7 @@
#else
#define DRV_VERSION "1.1.13"
@@ -3878,9 +3961,10 @@
HAS_MII | HAS_MEDIA_TABLE | ALWAYS_CHECK_MII | HAS_ACPI | HAS_NWAY
| HAS_INTR_MITIGATION | HAS_PCI_MWI, t21142_timer },
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/parisc/ccio-dma.c CVS2_6_12_PA2/drivers/parisc/ccio-dma.c
---- LINUS_2_6_12/drivers/parisc/ccio-dma.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/parisc/ccio-dma.c 2005-05-21 20:22:23.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/parisc/ccio-dma.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/parisc/ccio-dma.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/parisc/ccio-dma.c 2005-08-09 17:53:35.000000000 -0400
@@ -100,9 +100,9 @@
#define DBG_RUN_SG(x...)
#endif
@@ -4110,9 +4194,10 @@
ccio_ioc_init(ioc);
ccio_init_resources(ioc);
hppa_dma_ops = &ccio_ops;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/parisc/led.c CVS2_6_12_PA2/drivers/parisc/led.c
---- LINUS_2_6_12/drivers/parisc/led.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/parisc/led.c 2005-04-05 13:01:50.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/parisc/led.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/parisc/led.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/parisc/led.c 2005-08-09 17:53:35.000000000 -0400
@@ -18,6 +18,9 @@
* Changes:
* - Audit copy_from_user in led_proc_write.
@@ -4493,9 +4578,23 @@
return lcd_info.lcd_width;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/parisc/sba_iommu.c CVS2_6_12_PA2/drivers/parisc/sba_iommu.c
---- LINUS_2_6_12/drivers/parisc/sba_iommu.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/parisc/sba_iommu.c 2005-05-20 09:19:47.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/parisc/pdc_stable.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/parisc/pdc_stable.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/parisc/pdc_stable.c 2005-08-09 17:53:35.000000000 -0400
+@@ -536,7 +536,7 @@
+
+ out += sprintf(out, "Memory tested: ");
+ if ((result & 0x0F) < 0x0E)
+- out += sprintf(out, "%.3f MB", 0.256*(1<<(result & 0x0F)));
++ out += sprintf(out, "%d kB", (1<<(result & 0x0F))*256);
+ else
+ out += sprintf(out, "All");
+ out += sprintf(out, "\n");
+Index: linux-2.6-2.6.12/drivers/parisc/sba_iommu.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/parisc/sba_iommu.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/parisc/sba_iommu.c 2005-08-09 17:53:35.000000000 -0400
@@ -91,7 +91,7 @@
#define DBG_RES(x...)
#endif
@@ -4663,9 +4762,10 @@
/* FIXME : DMA HINTs not used */
ioc->hint_shift_pdir = iov_order + PAGE_SHIFT;
ioc->hint_mask_pdir = ~(0x3 << (iov_order + PAGE_SHIFT));
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/pcmcia/Kconfig CVS2_6_12_PA2/drivers/pcmcia/Kconfig
---- LINUS_2_6_12/drivers/pcmcia/Kconfig 2005-06-17 21:22:03.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/pcmcia/Kconfig 2005-03-18 06:17:12.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/pcmcia/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/pcmcia/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/pcmcia/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -166,7 +166,11 @@
config PCMCIA_PROBE
@@ -4679,9 +4779,10 @@
config M32R_PCC
bool "M32R PCMCIA I/F"
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/pcmcia/rsrc_nonstatic.c CVS2_6_12_PA2/drivers/pcmcia/rsrc_nonstatic.c
---- LINUS_2_6_12/drivers/pcmcia/rsrc_nonstatic.c 2005-06-17 21:22:03.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/pcmcia/rsrc_nonstatic.c 2005-04-04 14:46:59.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/pcmcia/rsrc_nonstatic.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/pcmcia/rsrc_nonstatic.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/pcmcia/rsrc_nonstatic.c 2005-08-09 17:53:35.000000000 -0400
@@ -43,7 +43,11 @@
#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0444)
@@ -4694,9 +4795,10 @@
#ifdef CONFIG_PCMCIA_PROBE
INT_MODULE_PARM(probe_io, 1); /* IO port probe? */
INT_MODULE_PARM(mem_limit, 0x10000);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/53c700.c CVS2_6_12_PA2/drivers/scsi/53c700.c
---- LINUS_2_6_12/drivers/scsi/53c700.c 2005-06-17 21:22:03.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/53c700.c 2005-04-21 18:25:51.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/53c700.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/53c700.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/53c700.c 2005-08-09 17:53:35.000000000 -0400
@@ -302,6 +302,7 @@
__u8 *memory;
__u32 *script;
@@ -4721,9 +4823,10 @@
/* reset the chip */
NCR_700_chip_reset(host);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/lasi700.c CVS2_6_12_PA2/drivers/scsi/lasi700.c
---- LINUS_2_6_12/drivers/scsi/lasi700.c 2005-06-17 21:22:03.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/lasi700.c 2005-04-21 22:23:44.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/lasi700.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/lasi700.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/lasi700.c 2005-08-09 17:53:35.000000000 -0400
@@ -125,8 +125,6 @@
hostdata->dmode_extra = DMODE_FC2;
}
@@ -4733,9 +4836,10 @@
host = NCR_700_detect(&lasi700_template, hostdata, &dev->dev);
if (!host)
goto out_kfree;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_defs.h CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_defs.h
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-05-20 07:08:58.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_defs.h
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-08-09 17:53:35.000000000 -0400
@@ -40,7 +40,7 @@
#ifndef SYM_DEFS_H
#define SYM_DEFS_H
@@ -4745,9 +4849,10 @@
#define SYM_DRIVER_NAME "sym-" SYM_VERSION
/*
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_glue.c CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_glue.c
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-05-20 12:24:41.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_glue.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-08-09 17:53:35.000000000 -0400
@@ -155,10 +155,11 @@
base = tmp;
if ((tmp & 0x7) == PCI_BASE_ADDRESS_MEM_TYPE_64) {
@@ -4969,9 +5074,10 @@
.eh_abort_handler = sym53c8xx_eh_abort_handler,
.eh_device_reset_handler = sym53c8xx_eh_device_reset_handler,
.eh_bus_reset_handler = sym53c8xx_eh_bus_reset_handler,
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_glue.h CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_glue.h
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-05-20 06:29:44.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_glue.h
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-08-09 17:53:35.000000000 -0400
@@ -142,33 +142,6 @@
#define scr_to_cpu(dw) le32_to_cpu(dw)
@@ -5006,9 +5112,10 @@
* These ones are used as return code from
* error recovery handlers under Linux.
*/
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_hipd.c CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_hipd.c
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-05-20 12:27:31.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_hipd.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-08-09 17:53:35.000000000 -0400
@@ -97,7 +97,7 @@
static void sym_print_nego_msg(struct sym_hcb *np, int target, char *label, u_char *msg)
{
@@ -5284,9 +5391,10 @@
goto finish;
}
weirdness:
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_hipd.h CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_hipd.h
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-05-19 20:41:45.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_hipd.h
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-08-09 17:53:35.000000000 -0400
@@ -444,7 +444,7 @@
*/
u_char usrflags;
@@ -5366,9 +5474,10 @@
cp->phys.head.savep = cpu_to_scr(SCRIPTB_BA(np, data_io));
#endif
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_nvram.c CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_nvram.c
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-05-20 12:24:41.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_nvram.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-08-09 17:53:35.000000000 -0400
@@ -270,6 +270,7 @@
}
@@ -5411,9 +5520,10 @@
{
return 0;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/serial/mux.c CVS2_6_12_PA2/drivers/serial/mux.c
---- LINUS_2_6_12/drivers/serial/mux.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/serial/mux.c 2005-02-14 07:56:20.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/serial/mux.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/serial/mux.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/serial/mux.c 2005-08-09 17:53:35.000000000 -0400
@@ -27,6 +27,7 @@
#include <linux/delay.h> /* for udelay */
#include <linux/device.h>
@@ -5431,10 +5541,11 @@
port->uartclk = 0;
port->fifosize = MUX_FIFO_SIZE;
port->ops = &mux_pops;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/serial/serial_core.c CVS2_6_12_PA2/drivers/serial/serial_core.c
---- LINUS_2_6_12/drivers/serial/serial_core.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/serial/serial_core.c 2005-04-04 14:47:03.000000000 -0600
-@@ -1929,7 +1929,14 @@
+Index: linux-2.6-2.6.12/drivers/serial/serial_core.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/serial/serial_core.c 2005-08-09 17:50:50.000000000 -0400
++++ linux-2.6-2.6.12/drivers/serial/serial_core.c 2005-08-09 17:53:35.000000000 -0400
+@@ -1930,7 +1930,14 @@
printk("MMIO 0x%lx", port->mapbase);
break;
}
@@ -5450,9 +5561,10 @@
}
static void
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/usb/input/hid-core.c CVS2_6_12_PA2/drivers/usb/input/hid-core.c
---- LINUS_2_6_12/drivers/usb/input/hid-core.c 2005-06-17 21:22:05.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/usb/input/hid-core.c 2005-06-11 11:12:11.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/usb/input/hid-core.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/usb/input/hid-core.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/usb/input/hid-core.c 2005-08-09 17:53:35.000000000 -0400
@@ -759,21 +759,31 @@
}
@@ -5492,9 +5604,10 @@
}
/*
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/usb/storage/transport.c CVS2_6_12_PA2/drivers/usb/storage/transport.c
---- LINUS_2_6_12/drivers/usb/storage/transport.c 2005-06-17 21:22:06.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/usb/storage/transport.c 2005-06-04 13:21:10.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/usb/storage/transport.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/usb/storage/transport.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/usb/storage/transport.c 2005-08-09 17:53:35.000000000 -0400
@@ -266,8 +266,9 @@
NULL, 0, 3*HZ);
@@ -5544,9 +5657,10 @@
US_DEBUGP("Soft reset failed\n");
goto Done;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/video/console/Kconfig CVS2_6_12_PA2/drivers/video/console/Kconfig
---- LINUS_2_6_12/drivers/video/console/Kconfig 2005-06-17 21:22:07.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/video/console/Kconfig 2005-03-15 10:06:49.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/video/console/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/video/console/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/video/console/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -110,7 +110,7 @@
config FONTS
@@ -5583,9 +5697,10 @@
default y if !SPARC32 && !SPARC64 && !FONTS && MAC
help
Small console font with Macintosh-style high-half glyphs. Some Mac
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/fs/ioctl.c CVS2_6_12_PA2/fs/ioctl.c
---- LINUS_2_6_12/fs/ioctl.c 2005-06-17 21:22:07.000000000 -0600
-+++ CVS2_6_12_PA2/fs/ioctl.c 2005-03-14 06:24:36.000000000 -0700
+Index: linux-2.6-2.6.12/fs/ioctl.c
+===================================================================
+--- linux-2.6-2.6.12.orig/fs/ioctl.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/fs/ioctl.c 2005-08-09 17:53:35.000000000 -0400
@@ -71,7 +71,11 @@
return -EBADF;
return put_user(inode->i_sb->s_blocksize, p);
@@ -5599,9 +5714,10 @@
}
return do_ioctl(filp, cmd, arg);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-generic/compat_signal.h CVS2_6_12_PA2/include/asm-generic/compat_signal.h
---- LINUS_2_6_12/include/asm-generic/compat_signal.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/asm-generic/compat_signal.h 2004-01-27 22:12:47.000000000 -0700
+Index: linux-2.6-2.6.12/include/asm-generic/compat_signal.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/asm-generic/compat_signal.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,25 @@
+#ifndef _ASM_GENERIC_COMPAT_SIGNAL_H
+#define _ASM_GENERIC_COMPAT_SIGNAL_H
@@ -5628,9 +5744,10 @@
+
+#endif /* !__ASSEMBLY__ */
+#endif /* !_ASM_GENERIC_COMPAT_SIGNAL_H */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-ia64/compat.h CVS2_6_12_PA2/include/asm-ia64/compat.h
---- LINUS_2_6_12/include/asm-ia64/compat.h 2005-06-17 21:22:11.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-ia64/compat.h 2004-10-11 15:41:31.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-ia64/compat.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-ia64/compat.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-ia64/compat.h 2005-08-09 17:53:35.000000000 -0400
@@ -15,6 +15,9 @@
typedef s32 compat_pid_t;
typedef u16 compat_uid_t;
@@ -5649,9 +5766,10 @@
typedef s32 compat_int_t;
typedef s32 compat_long_t;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/assembly.h CVS2_6_12_PA2/include/asm-parisc/assembly.h
---- LINUS_2_6_12/include/asm-parisc/assembly.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/assembly.h 2005-05-12 22:39:05.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/assembly.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/assembly.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/assembly.h 2005-08-09 17:53:35.000000000 -0400
@@ -450,5 +450,30 @@
REST_CR (%cr22, PT_PSW (\regs))
.endm
@@ -5683,9 +5801,10 @@
+
#endif /* __ASSEMBLY__ */
#endif
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/bitops.h CVS2_6_12_PA2/include/asm-parisc/bitops.h
---- LINUS_2_6_12/include/asm-parisc/bitops.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/bitops.h 2005-06-03 23:42:21.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/bitops.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/bitops.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/bitops.h 2005-08-09 17:53:35.000000000 -0400
@@ -2,6 +2,7 @@
#define _PARISC_BITOPS_H
@@ -6145,9 +6264,10 @@
/* Bitmap functions for the minix filesystem. */
#define minix_test_and_set_bit(nr,addr) ext2_set_bit(nr,addr)
#define minix_set_bit(nr,addr) ((void)ext2_set_bit(nr,addr))
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/errno.h CVS2_6_12_PA2/include/asm-parisc/errno.h
---- LINUS_2_6_12/include/asm-parisc/errno.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/errno.h 2005-05-08 20:00:54.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/errno.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/errno.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/errno.h 2005-08-09 17:53:35.000000000 -0400
@@ -114,6 +114,7 @@
#define ENOTSUP 252 /* Function not implemented (POSIX.4 / HPUX) */
@@ -6156,9 +6276,10 @@
/* for robust mutexes */
#define EOWNERDEAD 254 /* Owner died */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/led.h CVS2_6_12_PA2/include/asm-parisc/led.h
---- LINUS_2_6_12/include/asm-parisc/led.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/led.h 2005-03-27 23:50:20.000000000 -0700
+Index: linux-2.6-2.6.12/include/asm-parisc/led.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/led.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/led.h 2005-08-09 17:53:35.000000000 -0400
@@ -23,9 +23,6 @@
#define LED_CMD_REG_NONE 0 /* NULL == no addr for the cmd register */
@@ -6169,9 +6290,10 @@
/* register_led_driver() */
int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long data_reg);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/processor.h CVS2_6_12_PA2/include/asm-parisc/processor.h
---- LINUS_2_6_12/include/asm-parisc/processor.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/processor.h 2005-05-19 18:05:13.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/processor.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/processor.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/processor.h 2005-08-09 17:53:35.000000000 -0400
@@ -121,8 +121,27 @@
};
@@ -6200,9 +6322,10 @@
#define INIT_THREAD { \
regs: { gr: { 0, }, \
fr: { 0, }, \
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/psw.h CVS2_6_12_PA2/include/asm-parisc/psw.h
---- LINUS_2_6_12/include/asm-parisc/psw.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/psw.h 2005-05-12 22:39:05.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/psw.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/psw.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/psw.h 2005-08-09 17:53:35.000000000 -0400
@@ -1,4 +1,7 @@
#ifndef _PARISC_PSW_H
+
@@ -6275,9 +6398,10 @@
+#define USER_PSW (PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I)
+
#endif
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/ptrace.h CVS2_6_12_PA2/include/asm-parisc/ptrace.h
---- LINUS_2_6_12/include/asm-parisc/ptrace.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/ptrace.h 2005-03-31 08:27:13.000000000 -0700
+Index: linux-2.6-2.6.12/include/asm-parisc/ptrace.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/ptrace.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/ptrace.h 2005-08-09 17:53:35.000000000 -0400
@@ -49,7 +49,7 @@
#define user_mode(regs) (((regs)->iaoq[0] & 3) ? 1 : 0)
#define user_space(regs) (((regs)->iasq[1] != 0) ? 1 : 0)
@@ -6287,9 +6411,10 @@
extern void show_regs(struct pt_regs *);
#endif
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/spinlock.h CVS2_6_12_PA2/include/asm-parisc/spinlock.h
---- LINUS_2_6_12/include/asm-parisc/spinlock.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/spinlock.h 2005-06-09 11:52:00.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/spinlock.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/spinlock.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/spinlock.h 2005-08-09 17:53:35.000000000 -0400
@@ -8,9 +8,15 @@
* the semaphore address has to be 16-byte aligned.
*/
@@ -6359,9 +6484,10 @@
(x)->babble--; \
printk("KERN_WARNING \
%s:%d: spin_unlock_wait(%s/%p)" \
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/system.h CVS2_6_12_PA2/include/asm-parisc/system.h
---- LINUS_2_6_12/include/asm-parisc/system.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/system.h 2005-06-09 07:40:16.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/system.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/system.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/system.h 2005-08-09 17:53:35.000000000 -0400
@@ -138,13 +138,7 @@
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
@@ -6452,9 +6578,10 @@
#define arch_align_stack(x) (x)
#endif
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/tlbflush.h CVS2_6_12_PA2/include/asm-parisc/tlbflush.h
---- LINUS_2_6_12/include/asm-parisc/tlbflush.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/tlbflush.h 2005-06-04 01:11:25.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/tlbflush.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/tlbflush.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/tlbflush.h 2005-08-09 17:53:35.000000000 -0400
@@ -7,6 +7,26 @@
#include <linux/mm.h>
#include <asm/mmu_context.h>
@@ -6515,9 +6642,10 @@
}
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/types.h CVS2_6_12_PA2/include/asm-parisc/types.h
---- LINUS_2_6_12/include/asm-parisc/types.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/types.h 2005-06-03 23:42:21.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/types.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/types.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/types.h 2005-08-09 17:53:35.000000000 -0400
@@ -33,8 +33,10 @@
#ifdef __LP64__
@@ -6529,9 +6657,10 @@
#endif
#ifndef __ASSEMBLY__
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/unistd.h CVS2_6_12_PA2/include/asm-parisc/unistd.h
---- LINUS_2_6_12/include/asm-parisc/unistd.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/unistd.h 2005-05-14 22:38:00.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/unistd.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/unistd.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/unistd.h 2005-08-09 17:53:35.000000000 -0400
@@ -687,8 +687,8 @@
#define __NR_shmget (__NR_Linux + 194)
#define __NR_shmctl (__NR_Linux + 195)
@@ -6570,9 +6699,10 @@
K_STW_ASM_PIC \
" ble 0x100(%%sr2, %%r0)\n" \
" ldi %1, %%r20\n" \
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-s390/compat.h CVS2_6_12_PA2/include/asm-s390/compat.h
---- LINUS_2_6_12/include/asm-s390/compat.h 2005-06-17 21:22:15.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-s390/compat.h 2004-10-10 15:23:29.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-s390/compat.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-s390/compat.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-s390/compat.h 2005-08-09 17:53:35.000000000 -0400
@@ -15,6 +15,9 @@
typedef s32 compat_pid_t;
typedef u16 compat_uid_t;
@@ -6583,9 +6713,10 @@
typedef u32 compat_uid32_t;
typedef u32 compat_gid32_t;
typedef u16 compat_mode_t;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-sparc64/compat.h CVS2_6_12_PA2/include/asm-sparc64/compat.h
---- LINUS_2_6_12/include/asm-sparc64/compat.h 2005-06-17 21:22:15.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-sparc64/compat.h 2005-04-21 18:26:06.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-sparc64/compat.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-sparc64/compat.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-sparc64/compat.h 2005-08-09 17:53:35.000000000 -0400
@@ -12,6 +12,9 @@
typedef s32 compat_time_t;
typedef s32 compat_clock_t;
@@ -6596,9 +6727,10 @@
typedef u16 compat_uid_t;
typedef u16 compat_gid_t;
typedef u16 compat_mode_t;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/compat.h CVS2_6_12_PA2/include/linux/compat.h
---- LINUS_2_6_12/include/linux/compat.h 2005-06-17 21:22:16.000000000 -0600
-+++ CVS2_6_12_PA2/include/linux/compat.h 2005-03-18 07:38:12.000000000 -0700
+Index: linux-2.6-2.6.12/include/linux/compat.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/linux/compat.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/linux/compat.h 2005-08-09 17:53:35.000000000 -0400
@@ -6,10 +6,16 @@
*/
#include <linux/config.h>
@@ -6669,9 +6801,10 @@
#endif /* CONFIG_COMPAT */
#endif /* _LINUX_COMPAT_H */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/compat_siginfo.h CVS2_6_12_PA2/include/linux/compat_siginfo.h
---- LINUS_2_6_12/include/linux/compat_siginfo.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/linux/compat_siginfo.h 2005-03-18 07:38:12.000000000 -0700
+Index: linux-2.6-2.6.12/include/linux/compat_siginfo.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/linux/compat_siginfo.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,181 @@
+#ifndef _ASM_GENERIC_COMPAT_SIGINFO_H
+#define _ASM_GENERIC_COMPAT_SIGINFO_H
@@ -6854,9 +6987,10 @@
+#endif /* CONFIG_COMPAT */
+#endif /* _ASM_GENERIC_COMPAT_SIGINFO_H */
+
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/hil.h CVS2_6_12_PA2/include/linux/hil.h
---- LINUS_2_6_12/include/linux/hil.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/linux/hil.h 2004-10-31 14:05:59.000000000 -0700
+Index: linux-2.6-2.6.12/include/linux/hil.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/linux/hil.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,483 @@
+#ifndef _HIL_H_
+#define _HIL_H_
@@ -7341,9 +7475,10 @@
+
+
+#endif /* _HIL_H_ */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/hil_mlc.h CVS2_6_12_PA2/include/linux/hil_mlc.h
---- LINUS_2_6_12/include/linux/hil_mlc.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/linux/hil_mlc.h 2004-10-30 13:51:51.000000000 -0600
+Index: linux-2.6-2.6.12/include/linux/hil_mlc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/linux/hil_mlc.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,168 @@
+/*
+ * HP Human Interface Loop Master Link Controller driver.
@@ -7513,9 +7648,10 @@
+
+int hil_mlc_register(hil_mlc *mlc);
+int hil_mlc_unregister(hil_mlc *mlc);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/hp_sdc.h CVS2_6_12_PA2/include/linux/hp_sdc.h
---- LINUS_2_6_12/include/linux/hp_sdc.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/linux/hp_sdc.h 2004-07-11 16:03:48.000000000 -0600
+Index: linux-2.6-2.6.12/include/linux/hp_sdc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/linux/hp_sdc.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,300 @@
+/*
+ * HP i8042 System Device Controller -- header
@@ -7817,9 +7953,10 @@
+} hp_i8042_sdc;
+
+#endif /* _LINUX_HP_SDC_H */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/input.h CVS2_6_12_PA2/include/linux/input.h
---- LINUS_2_6_12/include/linux/input.h 2005-06-17 21:22:16.000000000 -0600
-+++ CVS2_6_12_PA2/include/linux/input.h 2005-05-08 20:00:58.000000000 -0600
+Index: linux-2.6-2.6.12/include/linux/input.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/linux/input.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/linux/input.h 2005-08-09 17:53:35.000000000 -0400
@@ -620,6 +620,7 @@
#define BUS_ADB 0x17
#define BUS_I2C 0x18
@@ -7828,9 +7965,10 @@
/*
* Values describing the status of an effect
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/serio.h CVS2_6_12_PA2/include/linux/serio.h
---- LINUS_2_6_12/include/linux/serio.h 2005-06-17 21:22:16.000000000 -0600
-+++ CVS2_6_12_PA2/include/linux/serio.h 2005-03-25 21:59:49.000000000 -0700
+Index: linux-2.6-2.6.12/include/linux/serio.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/linux/serio.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/linux/serio.h 2005-08-09 17:53:35.000000000 -0400
@@ -179,7 +179,7 @@
#define SERIO_8042_XL 0x06
@@ -7840,9 +7978,10 @@
*/
#define SERIO_UNKNOWN 0x00
#define SERIO_MSC 0x01
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/signal.h CVS2_6_12_PA2/include/linux/signal.h
---- LINUS_2_6_12/include/linux/signal.h 2005-06-17 21:22:16.000000000 -0600
-+++ CVS2_6_12_PA2/include/linux/signal.h 2005-06-17 21:32:55.000000000 -0600
+Index: linux-2.6-2.6.12/include/linux/signal.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/linux/signal.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/linux/signal.h 2005-08-09 17:53:35.000000000 -0400
@@ -234,6 +234,9 @@
struct pt_regs;
extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie);
@@ -7853,9 +7992,10 @@
#endif /* __KERNEL__ */
#endif /* _LINUX_SIGNAL_H */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/sound/opl3.h CVS2_6_12_PA2/include/sound/opl3.h
---- LINUS_2_6_12/include/sound/opl3.h 2005-06-17 21:22:17.000000000 -0600
-+++ CVS2_6_12_PA2/include/sound/opl3.h 2005-03-01 09:56:38.000000000 -0700
+Index: linux-2.6-2.6.12/include/sound/opl3.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/sound/opl3.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/sound/opl3.h 2005-08-09 17:53:35.000000000 -0400
@@ -261,8 +261,8 @@
} snd_opl3_voice_t;
@@ -7877,9 +8017,10 @@
int snd_opl3_create(snd_card_t * card,
unsigned long l_port, unsigned long r_port,
unsigned short hardware,
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/ipc/compat_mq.c CVS2_6_12_PA2/ipc/compat_mq.c
---- LINUS_2_6_12/ipc/compat_mq.c 2005-06-17 21:22:17.000000000 -0600
-+++ CVS2_6_12_PA2/ipc/compat_mq.c 2005-03-18 06:17:54.000000000 -0700
+Index: linux-2.6-2.6.12/ipc/compat_mq.c
+===================================================================
+--- linux-2.6-2.6.12.orig/ipc/compat_mq.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/ipc/compat_mq.c 2005-08-09 17:53:35.000000000 -0400
@@ -7,6 +7,7 @@
*/
@@ -7888,9 +8029,10 @@
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/mqueue.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/Makefile CVS2_6_12_PA2/kernel/Makefile
---- LINUS_2_6_12/kernel/Makefile 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/Makefile 2005-05-08 20:01:00.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/Makefile
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/Makefile 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/Makefile 2005-08-09 17:53:35.000000000 -0400
@@ -17,7 +17,7 @@
obj-$(CONFIG_KALLSYMS) += kallsyms.o
obj-$(CONFIG_PM) += power/
@@ -7900,9 +8042,10 @@
obj-$(CONFIG_CPUSETS) += cpuset.o
obj-$(CONFIG_IKCONFIG) += configs.o
obj-$(CONFIG_IKCONFIG_PROC) += configs.o
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/compat.c CVS2_6_12_PA2/kernel/compat.c
---- LINUS_2_6_12/kernel/compat.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/compat.c 2005-04-21 18:26:08.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/compat.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/compat.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/compat.c 2005-08-09 17:53:35.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/linkage.h>
@@ -7960,9 +8103,10 @@
ret = -EFAULT;
}
}else {
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/compat_signal.c CVS2_6_12_PA2/kernel/compat_signal.c
---- LINUS_2_6_12/kernel/compat_signal.c 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/kernel/compat_signal.c 2004-11-03 15:07:38.000000000 -0700
+Index: linux-2.6-2.6.12/kernel/compat_signal.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/kernel/compat_signal.c 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 2003 Carlos O'Donell
@@ -8208,9 +8352,10 @@
+}
+#endif
+
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/posix-cpu-timers.c CVS2_6_12_PA2/kernel/posix-cpu-timers.c
---- LINUS_2_6_12/kernel/posix-cpu-timers.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/posix-cpu-timers.c 2005-04-04 14:47:32.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/posix-cpu-timers.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/posix-cpu-timers.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/posix-cpu-timers.c 2005-08-09 17:53:35.000000000 -0400
@@ -1270,8 +1270,6 @@
LIST_HEAD(firing);
struct k_itimer *timer, *next;
@@ -8220,9 +8365,10 @@
#define UNEXPIRED(clock) \
(cputime_eq(tsk->it_##clock##_expires, cputime_zero) || \
cputime_lt(clock##_ticks(tsk), tsk->it_##clock##_expires))
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/ptrace.c CVS2_6_12_PA2/kernel/ptrace.c
---- LINUS_2_6_12/kernel/ptrace.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/ptrace.c 2005-05-08 20:01:00.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/ptrace.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/ptrace.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/ptrace.c 2005-08-09 17:53:35.000000000 -0400
@@ -344,7 +344,7 @@
siginfo_t newinfo;
int error = -ESRCH;
@@ -8232,9 +8378,10 @@
return -EFAULT;
read_lock(&tasklist_lock);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/resource.c CVS2_6_12_PA2/kernel/resource.c
---- LINUS_2_6_12/kernel/resource.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/resource.c 2005-04-21 18:26:08.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/resource.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/resource.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/resource.c 2005-08-09 17:53:35.000000000 -0400
@@ -181,6 +181,8 @@
{
struct resource *tmp, **p;
@@ -8244,9 +8391,10 @@
p = &old->parent->child;
for (;;) {
tmp = *p;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/signal.c CVS2_6_12_PA2/kernel/signal.c
---- LINUS_2_6_12/kernel/signal.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/signal.c 2005-05-25 11:12:56.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/signal.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/signal.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/signal.c 2005-08-09 17:53:35.000000000 -0400
@@ -22,6 +22,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -8300,9 +8448,10 @@
return -EFAULT;
/* Not even root can pretend to send signals from the kernel.
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/sys.c CVS2_6_12_PA2/kernel/sys.c
---- LINUS_2_6_12/kernel/sys.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/sys.c 2005-05-19 18:05:13.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/sys.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/sys.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/sys.c 2005-08-09 17:53:35.000000000 -0400
@@ -30,6 +30,7 @@
#include <linux/compat.h>
#include <linux/syscalls.h>
@@ -8311,9 +8460,10 @@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/unistd.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/mm/shmem.c CVS2_6_12_PA2/mm/shmem.c
---- LINUS_2_6_12/mm/shmem.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/mm/shmem.c 2005-04-04 14:47:34.000000000 -0600
+Index: linux-2.6-2.6.12/mm/shmem.c
+===================================================================
+--- linux-2.6-2.6.12.orig/mm/shmem.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/mm/shmem.c 2005-08-09 17:53:35.000000000 -0400
@@ -461,7 +461,7 @@
} while (next);
}
@@ -8323,9 +8473,10 @@
{
struct shmem_inode_info *info = SHMEM_I(inode);
unsigned long idx;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/drivers/opl3/opl3_lib.c CVS2_6_12_PA2/sound/drivers/opl3/opl3_lib.c
---- LINUS_2_6_12/sound/drivers/opl3/opl3_lib.c 2005-06-17 21:22:20.000000000 -0600
-+++ CVS2_6_12_PA2/sound/drivers/opl3/opl3_lib.c 2005-03-01 09:56:38.000000000 -0700
+Index: linux-2.6-2.6.12/sound/drivers/opl3/opl3_lib.c
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/drivers/opl3/opl3_lib.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/drivers/opl3/opl3_lib.c 2005-08-09 17:53:35.000000000 -0400
@@ -40,7 +40,7 @@
static void snd_opl2_command(opl3_t * opl3, unsigned short cmd, unsigned char val)
{
@@ -8534,9 +8685,10 @@
EXPORT_SYMBOL(snd_opl3_timer_new);
EXPORT_SYMBOL(snd_opl3_hwdep_new);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/oss/ad1889.c CVS2_6_12_PA2/sound/oss/ad1889.c
---- LINUS_2_6_12/sound/oss/ad1889.c 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/oss/ad1889.c 2005-03-01 16:00:56.000000000 -0700
+Index: linux-2.6-2.6.12/sound/oss/ad1889.c
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/oss/ad1889.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/oss/ad1889.c 2005-08-09 17:53:35.000000000 -0400
@@ -74,7 +74,7 @@
DBG("Setting WAV rate to %d\n", rate);
@@ -8928,9 +9080,10 @@
if (!dev->regbase) {
printk(KERN_ERR DEVNAME ": unable to remap iomem\n");
goto out2;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/oss/ad1889.h CVS2_6_12_PA2/sound/oss/ad1889.h
---- LINUS_2_6_12/sound/oss/ad1889.h 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/oss/ad1889.h 2005-03-01 16:00:56.000000000 -0700
+Index: linux-2.6-2.6.12/sound/oss/ad1889.h
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/oss/ad1889.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/oss/ad1889.h 2005-08-09 17:53:36.000000000 -0400
@@ -1,57 +1,58 @@
#ifndef _AD1889_H_
#define _AD1889_H_
@@ -9050,9 +9203,10 @@
#define AD_WAV_STATE 0
#define AD_ADC_STATE 1
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/parisc/harmony.c CVS2_6_12_PA2/sound/parisc/harmony.c
---- LINUS_2_6_12/sound/parisc/harmony.c 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/parisc/harmony.c 2005-05-31 15:45:55.000000000 -0600
+Index: linux-2.6-2.6.12/sound/parisc/harmony.c
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/parisc/harmony.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/parisc/harmony.c 2005-08-09 17:53:36.000000000 -0400
@@ -197,7 +197,7 @@
spin_unlock(&h->lock);
@@ -9244,9 +9398,10 @@
};
static void __init
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/parisc/harmony.h CVS2_6_12_PA2/sound/parisc/harmony.h
---- LINUS_2_6_12/sound/parisc/harmony.h 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/parisc/harmony.h 2005-05-31 15:45:55.000000000 -0600
+Index: linux-2.6-2.6.12/sound/parisc/harmony.h
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/parisc/harmony.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/parisc/harmony.h 2005-08-09 17:53:36.000000000 -0400
@@ -61,7 +61,7 @@
#define HARMONY_SIZE 64
@@ -9294,9 +9449,10 @@
#define HARMONY_GAIN_OUT 0x3f
#define HARMONY_GAIN_LO_SHIFT 6
#define HARMONY_GAIN_LO_MASK (HARMONY_GAIN_OUT << HARMONY_GAIN_LO_SHIFT)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/pci/Kconfig CVS2_6_12_PA2/sound/pci/Kconfig
---- LINUS_2_6_12/sound/pci/Kconfig 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/pci/Kconfig 2005-04-18 19:56:30.000000000 -0600
+Index: linux-2.6-2.6.12/sound/pci/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/pci/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/pci/Kconfig 2005-08-09 17:53:36.000000000 -0400
@@ -21,6 +21,26 @@
To compile this driver as a module, choose M here: the module
will be called snd-ali5451.
@@ -9324,9 +9480,10 @@
config SND_ATIIXP
tristate "ATI IXP AC97 Controller"
depends on SND
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/pci/Makefile CVS2_6_12_PA2/sound/pci/Makefile
---- LINUS_2_6_12/sound/pci/Makefile 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/pci/Makefile 2005-03-18 06:18:13.000000000 -0700
+Index: linux-2.6-2.6.12/sound/pci/Makefile
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/pci/Makefile 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/pci/Makefile 2005-08-09 17:53:36.000000000 -0400
@@ -4,6 +4,7 @@
#
@@ -9343,10 +9500,11 @@
obj-$(CONFIG_SND_ATIIXP) += snd-atiixp.o
obj-$(CONFIG_SND_ATIIXP_MODEM) += snd-atiixp-modem.o
obj-$(CONFIG_SND_AZT3328) += snd-azt3328.o
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/pci/ad1889.c CVS2_6_12_PA2/sound/pci/ad1889.c
---- LINUS_2_6_12/sound/pci/ad1889.c 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/sound/pci/ad1889.c 2005-06-24 19:07:21.000000000 -0600
-@@ -0,0 +1,1209 @@
+Index: linux-2.6-2.6.12/sound/pci/ad1889.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/sound/pci/ad1889.c 2005-08-09 17:53:36.000000000 -0400
+@@ -0,0 +1,1210 @@
+/* Analog Devices 1889 audio driver
+ *
+ * This is a driver for the AD1889 PCI audio chipset found
@@ -9362,7 +9520,7 @@
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
@@ -9370,16 +9528,11 @@
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO:
-+ * Fix "clic" when loading/unloading driver
-+ * Native ALSA playback fixup (our fault?)
-+ * note: if one does "while :; do cat /proc/asound/AD1889/AD1889; done"
-+ * during native playback, one will be surprised...
-+ * Fix Ctrl-C bug (take care of CCS?)
-+ * Starting capture during playback glitches the latter, and vice-versa.
-+ * There seem to be some inter effects between playback/capture start/stop.
-+ * Maybe we could use finer grained locking (separate locks for pb/cap).
++ * Do we need to take care of CCS register?
++ * Maybe we could use finer grained locking (separate locks for pb/cap)?
++ * Wishlist:
+ * Control Interface (mixer) support
-+ * Better AC97 support?
++ * Better AC97 support (VSR...)?
+ * PM support
+ * MIDI support
+ * Game Port support
@@ -9406,14 +9559,15 @@
+#include <asm/io.h>
+
+#include "ad1889.h"
++#include "ac97/ac97_id.h"
+
-+#define AD1889_DRVVER "$Revision: 1.21 $"
++#define AD1889_DRVVER "$Revision: 1.31 $"
+
+MODULE_AUTHOR("Kyle McMartin <kyle at parisc-linux.org>, Thibaut Varene <t-bone at parisc-linux.org>");
+MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(AD1889_DRVVER);
-+MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1889}"); /* XXX */
++MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1889}}");
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+module_param_array(index, int, NULL, 0444);
@@ -9432,7 +9586,7 @@
+MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
+
+#define DEVNAME "ad1889"
-+#define PFX DEVNAME ": "
++#define PFX DEVNAME ": "
+
+/* let's use the global sound debug interfaces */
+#define ad1889_debug(fmt, arg...) snd_printd(KERN_DEBUG fmt, ## arg)
@@ -9442,9 +9596,9 @@
+ u16 reg; /* reg setup */
+ u32 addr; /* dma base address */
+ u16 rate; /* sample rate */
-+ unsigned long pos; /* last recorded buffer position */
-+ unsigned long buf; /* buffer # */
-+ unsigned long size; /* buffer size */
++ unsigned long pos; /* last recorded DMA buffer position */
++ unsigned long buf; /* period # */
++ unsigned long size; /* DMA buffer size */
+ unsigned long count; /* period size, aka nb bytes sent in the current DMA transfer */
+};
+
@@ -9540,13 +9694,6 @@
+}
+
+static inline void
-+ad1889_load_adc_address(struct snd_ad1889 *chip, u32 addr)
-+{
-+ ad1889_writel(chip, AD_DMA_ADCBA, addr);
-+ ad1889_writel(chip, AD_DMA_ADCCA, addr);
-+}
-+
-+static inline void
+ad1889_load_wave_count(struct snd_ad1889 *chip, u32 count)
+{
+ ad1889_writel(chip, AD_DMA_WAVBC, count);
@@ -9555,13 +9702,6 @@
+ ad1889_writel(chip, AD_DMA_WAVIC, count);
+}
+
-+static inline void
-+ad1889_load_wave_address(struct snd_ad1889 *chip, u32 addr)
-+{
-+ ad1889_writel(chip, AD_DMA_WAVBA, addr);
-+ ad1889_writel(chip, AD_DMA_WAVCA, addr);
-+}
-+
+static void
+ad1889_channel_reset(struct snd_ad1889 *chip, unsigned int channel)
+{
@@ -9571,6 +9711,7 @@
+ /* Disable wave channel */
+ reg = ad1889_readw(chip, AD_DS_WSMC) & ~AD_DS_WSMC_WAEN;
+ ad1889_writew(chip, AD_DS_WSMC, reg);
++ chip->wave.reg = reg;
+
+ /* disable IRQs */
+ reg = ad1889_readw(chip, AD_DMA_WAV);
@@ -9578,9 +9719,10 @@
+ reg &= ~AD_DMA_LOOP;
+ ad1889_writew(chip, AD_DMA_WAV, reg);
+
-+ /* clear IRQ counters */
++ /* clear IRQ and address counters and pointers */
+ ad1889_load_wave_count(chip, 0x0);
-+ ad1889_load_wave_address(chip, 0x0);
++ ad1889_writel(chip, AD_DMA_WAVBA, 0x0);
++ ad1889_writel(chip, AD_DMA_WAVCA, 0x0);
+
+ /* flush */
+ ad1889_readw(chip, AD_DMA_WAV);
@@ -9590,6 +9732,7 @@
+ /* Disable ADC channel */
+ reg = ad1889_readw(chip, AD_DS_RAMC) & ~AD_DS_RAMC_ADEN;
+ ad1889_writew(chip, AD_DS_RAMC, reg);
++ chip->ramc.reg = reg;
+
+ reg = ad1889_readw(chip, AD_DMA_ADC);
+ reg &= AD_DMA_IM_DIS;
@@ -9597,7 +9740,8 @@
+ ad1889_writew(chip, AD_DMA_ADC, reg);
+
+ ad1889_load_adc_count(chip, 0x0);
-+ ad1889_load_adc_address(chip, 0x0);
++ ad1889_writel(chip, AD_DMA_ADCBA, 0x0);
++ ad1889_writel(chip, AD_DMA_ADCCA, 0x0);
+
+ /* flush */
+ ad1889_readw(chip, AD_DMA_ADC);
@@ -9612,9 +9756,7 @@
+}
+
+static inline void
-+snd_ad1889_ac97_write(ac97_t *ac97,
-+ unsigned short reg,
-+ unsigned short val)
++snd_ad1889_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short val)
+{
+ struct snd_ad1889 *chip = ac97->private_data;
+ ad1889_writew(chip, AD_AC97_BASE + reg, val);
@@ -9626,22 +9768,21 @@
+ int retry = 400; /* average needs 352 msec */
+
+ while (!(ad1889_readw(chip, AD_AC97_ACIC) & AD_AC97_ACIC_ACRDY)
-+ && --retry)
++ && --retry)
+ mdelay(1);
+ if (!retry) {
+ snd_printk(KERN_ERR PFX "[%s] Link is not ready.\n",
+ __FUNCTION__);
+ return -EIO;
+ }
-+ ad1889_debug("[%s] ready after %d ms\n", __FUNCTION__,
-+ 400 - retry);
++ ad1889_debug("[%s] ready after %d ms\n", __FUNCTION__, 400 - retry);
+
+ return 0;
+}
+
+static int
+snd_ad1889_hw_params(snd_pcm_substream_t *substream,
-+ snd_pcm_hw_params_t *hw_params)
++ snd_pcm_hw_params_t *hw_params)
+{
+ return snd_pcm_lib_malloc_pages(substream,
+ params_buffer_bytes(hw_params));
@@ -9655,15 +9796,14 @@
+
+static snd_pcm_hardware_t snd_ad1889_playback_hw = {
+ .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-+ SNDRV_PCM_INFO_MMAP_VALID |
-+ SNDRV_PCM_INFO_BLOCK_TRANSFER,
++ SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BLOCK_TRANSFER,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-+ .rate_min = 8000, /* docs says 7000, but we're lazy */
++ .rate_min = 8000, /* docs say 7000, but we're lazy */
+ .rate_max = 48000,
+ .channels_min = 1,
+ .channels_max = 2,
-+ .buffer_bytes_max = DMA_SIZE, /* max buffer size in bytes */
++ .buffer_bytes_max = DMA_SIZE, /* max DMA buffer size in bytes */
+ .period_bytes_min = BUF_SIZE, /* min size of period in bytes */
+ .period_bytes_max = DMA_SIZE, /* max size of period in bytes */
+ .periods_min = 1, /* min nb of periods in buffer */
@@ -9673,15 +9813,14 @@
+
+static snd_pcm_hardware_t snd_ad1889_capture_hw = {
+ .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-+ SNDRV_PCM_INFO_MMAP_VALID |
-+ SNDRV_PCM_INFO_BLOCK_TRANSFER,
++ SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BLOCK_TRANSFER,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
-+ .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-+ .rate_min = 8000, /* docs says 7000, but we're lazy */
++ .rates = SNDRV_PCM_RATE_48000,
++ .rate_min = 48000, /* docs say we could to VSR, but we're lazy */
+ .rate_max = 48000,
+ .channels_min = 1,
+ .channels_max = 2,
-+ .buffer_bytes_max = DMA_SIZE, /* max buffer size in bytes */
++ .buffer_bytes_max = DMA_SIZE, /* max DMA buffer size in bytes */
+ .period_bytes_min = BUF_SIZE, /* min size of period in bytes */
+ .period_bytes_max = DMA_SIZE, /* max size of period in bytes */
+ .periods_min = 1, /* min nb of periods in buffer */
@@ -9758,6 +9897,7 @@
+ chip->wave.count = count;
+ chip->wave.reg = reg;
+ chip->wave.buf = 0;
++ chip->wave.pos = 0;
+ chip->wave.rate = rt->rate;
+ chip->wave.addr = rt->dma_addr;
+
@@ -9766,8 +9906,11 @@
+ /* Set sample rates on the codec */
+ ad1889_writew(chip, AD_DS_WAS, chip->wave.rate);
+
-+ /* Set up DMA */
-+ ad1889_load_wave_address(chip, chip->wave.addr);
++ /* Set up DMA: first chunk address in curr addr, next one in base addr.
++ Base will be loaded into curr by the hardware upon interrupt
++ (as we use LOOP). Count holds the size of the chunk. */
++ ad1889_writel(chip, AD_DMA_WAVCA, chip->wave.addr);
++ ad1889_writel(chip, AD_DMA_WAVBA, chip->wave.addr + (count % size));
+ ad1889_load_wave_count(chip, chip->wave.count);
+
+ /* writes flush */
@@ -9775,9 +9918,9 @@
+
+ spin_unlock_irq(&chip->lock);
+
-+ ad1889_debug("prepare: chip->wave.addr = 0x%x, chip->wave.count = %u, "
-+ "chip->wave.size = %u\n", chip->wave.addr,
-+ count, size);
++ ad1889_debug("prepare playback: addr = 0x%x, count = %u, "
++ "size = %u, reg = 0x%x, rate = %u\n", chip->wave.addr,
++ count, size, reg, chip->wave.rate);
+ return 0;
+}
+
@@ -9810,13 +9953,17 @@
+ chip->ramc.count = count;
+ chip->ramc.reg = reg;
+ chip->ramc.buf = 0;
++ chip->ramc.pos = 0;
+ chip->ramc.rate = rt->rate;
+ chip->ramc.addr = rt->dma_addr;
+
+ ad1889_writew(chip, AD_DS_RAMC, chip->ramc.reg);
+
-+ /* Set up DMA */
-+ ad1889_load_adc_address(chip, chip->ramc.addr);
++ /* Set up DMA: first chunk address in curr addr, next one in base addr.
++ Base will be loaded into curr by the hardware upon interrupt
++ (as we use LOOP). Count holds the size of the chunk. */
++ ad1889_writel(chip, AD_DMA_ADCCA, chip->ramc.addr);
++ ad1889_writel(chip, AD_DMA_ADCBA, chip->ramc.addr + (count % size));
+ ad1889_load_adc_count(chip, chip->ramc.count);
+
+ /* writes flush */
@@ -9824,9 +9971,9 @@
+
+ spin_unlock_irq(&chip->lock);
+
-+ ad1889_debug("prepare: chip->ramc.addr = 0x%x, chip->ramc.count = %u, "
-+ "chip->ramc.size = %u\n", chip->ramc.addr,
-+ count, size);
++ ad1889_debug("prepare capture: addr = 0x%x, count = %u, "
++ "size = %u, reg = 0x%x, rate = %u\n", chip->ramc.addr,
++ count, size, reg, chip->ramc.rate);
+ return 0;
+}
+
@@ -9847,7 +9994,8 @@
+ /* enable DMA loop & interrupts */
+ ad1889_writew(chip, AD_DMA_WAV, AD_DMA_LOOP | AD_DMA_IM_CNT);
+ wsmc |= AD_DS_WSMC_WAEN;
-+ ad1889_writel(chip, AD_DMA_CHSS, AD_DMA_CHSS_WAVS); /* 1 to clear */
++ /* 1 to clear CHSS bit */
++ ad1889_writel(chip, AD_DMA_CHSS, AD_DMA_CHSS_WAVS);
+ ad1889_unmute(chip);
+ break;
+ case SNDRV_PCM_TRIGGER_STOP:
@@ -9871,7 +10019,9 @@
+}
+
+/* this is called in atomic context with IRQ disabled.
-+ Must be as fast as possible and not sleep */
++ Must be as fast as possible and not sleep.
++ DMA should be *triggered* by this call.
++ The RAMC "ADEN" bit triggers DMA ADC On/Off */
+static int
+snd_ad1889_capture_trigger(snd_pcm_substream_t *ss, int cmd)
+{
@@ -9885,7 +10035,8 @@
+ /* enable DMA loop & interrupts */
+ ad1889_writew(chip, AD_DMA_ADC, AD_DMA_LOOP | AD_DMA_IM_CNT);
+ ramc |= AD_DS_RAMC_ADEN;
-+ ad1889_writel(chip, AD_DMA_CHSS, AD_DMA_CHSS_ADCS); /* 1 to clear */
++ /* 1 to clear CHSS bit */
++ ad1889_writel(chip, AD_DMA_CHSS, AD_DMA_CHSS_ADCS);
+ break;
+ case SNDRV_PCM_TRIGGER_STOP:
+ ramc &= ~AD_DS_RAMC_ADEN;
@@ -9918,9 +10069,9 @@
+ ptr = ad1889_readl(chip, AD_DMA_WAVCA);
+ ptr -= chip->wave.addr;
+
-+ snd_assert((ptr > 0) && (ptr < chip->wave.size), return 0);
++ snd_assert((ptr >= 0) && (ptr < chip->wave.size), return 0);
+
-+ return bytes_to_frames(ss->runtime, ptr);
++ return bytes_to_frames(ss->runtime, ptr);
+}
+
+/* Called in atomic context with IRQ disabled */
@@ -9936,9 +10087,9 @@
+ ptr = ad1889_readl(chip, AD_DMA_ADCCA);
+ ptr -= chip->ramc.addr;
+
-+ snd_assert((ptr > 0) && (ptr < chip->ramc.size), return 0);
++ snd_assert((ptr >= 0) && (ptr < chip->ramc.size), return 0);
+
-+ return bytes_to_frames(ss->runtime, ptr);
++ return bytes_to_frames(ss->runtime, ptr);
+}
+
+static snd_pcm_ops_t snd_ad1889_playback_ops = {
@@ -9982,9 +10133,8 @@
+ if (unlikely(!st))
+ return IRQ_NONE;
+
-+ if (st & (AD_DMA_DISR_PMAI|AD_DMA_DISR_PTAI)) {
++ if (st & (AD_DMA_DISR_PMAI|AD_DMA_DISR_PTAI))
+ ad1889_debug("Unexpected master or target abort interrupt!\n");
-+ }
+
+ if (chip->pcm && (st & AD_DMA_DISR_WAVI) && chip->psubs) {
+ spin_lock(&chip->lock);
@@ -10017,10 +10167,10 @@
+ snd_pcm_period_elapsed(chip->psubs);
+#if 0
+ ad1889_debug("chip->wave.pos = %d, chip->wave.count = %d, "
-+ "chip->wave.size = %d\n", chip->wave.pos,
-+ chip->wave.count, chip->wave.size);
++ "chip->wave.size = %d\n", chip->wave.pos,
++ chip->wave.count, chip->wave.size);
+ ad1889_debug("chip->wave.addr (0x%lx) + next (0x%lx) = 0x%lx\n",
-+ chip->wave.addr, next, chip->wave.addr + next);
++ chip->wave.addr, next, chip->wave.addr + next);
+#endif
+ }
+
@@ -10055,14 +10205,14 @@
+ snd_pcm_period_elapsed(chip->csubs);
+#if 0
+ ad1889_debug("chip->ramc.pos = %d, chip->ramc.count = %d, "
-+ "chip->ramc.size = %d\n", chip->ramc.pos,
-+ chip->ramc.count, chip->ramc.size);
++ "chip->ramc.size = %d\n", chip->ramc.pos,
++ chip->ramc.count, chip->ramc.size);
+ ad1889_debug("chip->ramc.addr (0x%lx) + next (0x%lx) = 0x%lx\n",
-+ chip->ramc.addr, next, chip->ramc.addr + next);
++ chip->ramc.addr, next, chip->ramc.addr + next);
+#endif
+ }
+
-+ /* XXX under some circumstances the DISR flushing may not happen */
++ /* XXX under some circumstances the DISR write flush may not happen */
+
+ return IRQ_HANDLED;
+}
@@ -10144,9 +10294,17 @@
+ (reg & AD_DS_WSMC_WAST) ? "stereo" : "mono");
+
+
-+ snd_iprintf(buffer, "Synthesis output: %s\n\n",
++ snd_iprintf(buffer, "Synthesis output: %s\n",
+ reg & AD_DS_WSMC_SYEN ? "enabled" : "disabled");
+
++ /* SYRQ is at offset 4 */
++ tmp = (reg & AD_DS_WSMC_SYRQ) ?
++ (((reg & AD_DS_WSMC_SYRQ >> 4) & 0x01) ? 12 : 18) : 4;
++ tmp /= (reg & AD_DS_WSMC_WAST) ? 2 : 1;
++
++ snd_iprintf(buffer, "Synthesis FIFO: %d %s words\n\n", tmp,
++ (reg & AD_DS_WSMC_WAST) ? "stereo" : "mono");
++
+ reg = ad1889_readw(chip, AD_DS_RAMC);
+ snd_iprintf(buffer, "ADC input: %s\n",
+ (reg & AD_DS_RAMC_ADEN) ? "enabled" : "disabled");
@@ -10203,9 +10361,10 @@
+}
+
+static struct ac97_quirk ac97_quirks[] = {
-+ { /* FIXME: which codec? */
++ {
+ .vendor = 0x11d4, /* AD */
+ .device = 0x1889, /* AD1889 */
++ .codec_id = AC97_ID_AD1819,
+ .name = "AD1889",
+ .type = AC97_TUNE_HP_ONLY
+ },
@@ -10296,7 +10455,7 @@
+ /* Turn off interrupt on count and zero DMA registers */
+ ad1889_channel_reset(chip, AD_CHAN_WAV | AD_CHAN_ADC);
+
-+ /* clear DISR. If we don't, we'd better jump off the Eiffel Tower */
++ /* clear DISR. If we don't, we'd better jump off the Eiffel Tower */
+ ad1889_writel(chip, AD_DMA_DISR, AD_DMA_DISR_PTAI | AD_DMA_DISR_PMAI);
+ ad1889_readl(chip, AD_DMA_DISR); /* flush, dammit! */
+
@@ -10334,7 +10493,7 @@
+snd_ad1889_init(struct snd_ad1889 *chip)
+{
+ ad1889_writew(chip, AD_DS_CCS, AD_DS_CCS_CLKEN); /* turn on clock */
-+ ad1889_readw(chip, AD_DS_CCS); /* flush posted write */
++ ad1889_readw(chip, AD_DS_CCS); /* flush posted write */
+
+ mdelay(10);
+
@@ -10536,10 +10695,10 @@
+MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);
+
+static struct pci_driver ad1889_pci = {
-+ .name = "AD1889 Audio",
-+ .id_table = snd_ad1889_ids,
-+ .probe = snd_ad1889_probe,
-+ .remove = __devexit_p(snd_ad1889_remove),
++ .name = "AD1889 Audio",
++ .id_table = snd_ad1889_ids,
++ .probe = snd_ad1889_probe,
++ .remove = __devexit_p(snd_ad1889_remove),
+};
+
+static int __init
@@ -10556,9 +10715,10 @@
+
+module_init(alsa_ad1889_init);
+module_exit(alsa_ad1889_fini);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/pci/ad1889.h CVS2_6_12_PA2/sound/pci/ad1889.h
---- LINUS_2_6_12/sound/pci/ad1889.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/sound/pci/ad1889.h 2005-06-24 19:08:25.000000000 -0600
+Index: linux-2.6-2.6.12/sound/pci/ad1889.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/sound/pci/ad1889.h 2005-08-09 17:53:36.000000000 -0400
@@ -0,0 +1,187 @@
+/* Analog Devices 1889 audio driver
+ * Copyright (C) 2004, Kyle McMartin <kyle at parisc-linux.org>
@@ -10644,7 +10804,7 @@
+#define AD_DMA_WAVIB 0x9c /* wave dma interrupt base byte count */
+
+#define AD_DMA_ICC 0xffffff /* current byte count mask */
-+#define AD_DMA_IBC 0xffffff /* base byte count mask */
++#define AD_DMA_IBC 0xffffff /* base byte count mask */
+/* bits 24 -> 31 reserved */
+
+/* 4 bytes pad */
@@ -10662,7 +10822,7 @@
+#define AD_DMA_IM_EOL 0x000c /* interrupt on End of Linked List */
+#define AD_DMA_SGDS 0x0030 /* SGD status */
+#define AD_DMA_SFLG 0x0040 /* SGD flag */
-+#define AD_DMA_EOL 0x0080 /* SGD end of list */
++#define AD_DMA_EOL 0x0080 /* SGD end of list */
+/* bits 8 -> 15 reserved */
+
+#define AD_DMA_DISR 0xc0 /* dma interrupt status */
Modified: trunk/kernel/source/linux-2.6/debian/templates/control.source.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.source.in 2005-08-09 22:53:37 UTC (rev 3799)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.source.in 2005-08-10 01:47:11 UTC (rev 3800)
@@ -4,5 +4,5 @@
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>
Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!sparc !alpha !m68k], gcc-3.3 [sparc alpha m68k], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.005)
+Build-Depends: gcc (>= 4:4.0) [!sparc !alpha !m68k], gcc-3.3 [sparc alpha m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.005)
Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)
More information about the Kernel-svn-changes
mailing list