[kernel] r7321 - in
dists/sarge-security/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8:
. debian
Dann Frazier
dannf at costa.debian.org
Tue Sep 5 06:04:41 UTC 2006
Author: dannf
Date: Tue Sep 5 06:04:40 2006
New Revision: 7321
Modified:
dists/sarge-security/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/debian/changelog
dists/sarge-security/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/hppa_2.6.8.diff
Log:
revert r7312; I had to respin kernel-source-2.6.8 to fix sparc anyway, might as well include this patch there as well
Modified: dists/sarge-security/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/debian/changelog
==============================================================================
--- dists/sarge-security/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/debian/changelog (original)
+++ dists/sarge-security/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/debian/changelog Tue Sep 5 06:04:40 2006
@@ -1,14 +1,3 @@
-kernel-patch-2.6.8-hppa (2.6.8-5sarge1) stable-security; urgency=high
-
- * Backport a fix to the mb() definition that removes an extraneous
- semi-colon - this is needed to fix a build failure with the
- kfree_skb-race.dpatch patch added in kernel-tree-2.6.8-16sarge5.
- Thanks to Matthew Wilcox for identifying this fix.
- Original changeset is here:
- http://linux.bkbits.net:8080/linux-2.6/cset@4230b3b4mCvy8DiByvjRhlEfhF6Zdg?nav=index.html|src/|src/include|src/include/asm-parisc|related/include/asm-parisc/system.h
-
- -- dann frazier <dannf at debian.org> Mon, 4 Sep 2006 12:32:14 -0600
-
kernel-patch-2.6.8-hppa (2.6.8-5) unstable; urgency=high
* Fix a reject in drivers/serial/8250.c.
Modified: dists/sarge-security/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/hppa_2.6.8.diff
==============================================================================
--- dists/sarge-security/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/hppa_2.6.8.diff (original)
+++ dists/sarge-security/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/hppa_2.6.8.diff Tue Sep 5 06:04:40 2006
@@ -1,6 +1,7 @@
-diff -urN kernel-source-2.6.8.orig/Documentation/parisc/00-INDEX kernel-source-2.6.8/Documentation/parisc/00-INDEX
---- kernel-source-2.6.8.orig/Documentation/parisc/00-INDEX 2004-08-13 23:37:25.000000000 -0600
-+++ kernel-source-2.6.8/Documentation/parisc/00-INDEX 2006-09-04 12:31:01.778374750 -0600
+Index: debian-kernel-hppa-2.6.8/Documentation/parisc/00-INDEX
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/Documentation/parisc/00-INDEX 2004-08-14 01:37:25.000000000 -0400
++++ debian-kernel-hppa-2.6.8/Documentation/parisc/00-INDEX 2005-02-01 01:38:33.000000000 -0500
@@ -2,9 +2,16 @@
- this file.
IODC.txt
@@ -18,9 +19,10 @@
+
+todo
+ - The things we need to work on...
-diff -urN kernel-source-2.6.8.orig/Documentation/parisc/todo kernel-source-2.6.8/Documentation/parisc/todo
---- kernel-source-2.6.8.orig/Documentation/parisc/todo 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/Documentation/parisc/todo 2006-09-04 12:31:01.782375000 -0600
+Index: debian-kernel-hppa-2.6.8/Documentation/parisc/todo
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/Documentation/parisc/todo 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,83 @@
+Status 2004-08-16 :
+-------------------
@@ -105,9 +107,10 @@
+ _HIL_KBD (to improve)
+ _HIL_PTR (to improve)
+
-diff -urN kernel-source-2.6.8.orig/arch/parisc/Makefile kernel-source-2.6.8/arch/parisc/Makefile
---- kernel-source-2.6.8.orig/arch/parisc/Makefile 2004-08-13 23:37:41.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/Makefile 2006-09-04 12:31:01.782375000 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/Makefile 2004-08-14 01:37:41.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/Makefile 2005-02-01 01:38:33.000000000 -0500
@@ -52,7 +52,6 @@
cflags-$(CONFIG_PA8X00) += -march=2.0 -mschedule=8000
@@ -116,9 +119,10 @@
CFLAGS += $(cflags-y)
-diff -urN kernel-source-2.6.8.orig/arch/parisc/configs/a500_defconfig kernel-source-2.6.8/arch/parisc/configs/a500_defconfig
---- kernel-source-2.6.8.orig/arch/parisc/configs/a500_defconfig 2004-08-13 23:36:32.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/configs/a500_defconfig 2006-09-04 12:31:01.782375000 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/configs/a500_defconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/configs/a500_defconfig 2004-08-14 01:36:32.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/configs/a500_defconfig 2005-02-01 01:38:33.000000000 -0500
@@ -11,7 +11,6 @@
#
CONFIG_EXPERIMENTAL=y
@@ -314,9 +318,10 @@
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=m
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/Makefile kernel-source-2.6.8/arch/parisc/kernel/Makefile
---- kernel-source-2.6.8.orig/arch/parisc/kernel/Makefile 2004-08-13 23:36:44.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/Makefile 2006-09-04 12:31:01.782375000 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/Makefile 2004-08-14 01:36:44.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/Makefile 2005-02-01 01:38:33.000000000 -0500
@@ -3,7 +3,6 @@
#
@@ -325,9 +330,10 @@
extra-y := init_task.o $(head-y) vmlinux.lds.s
AFLAGS_entry.o := -traditional
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/cache.c kernel-source-2.6.8/arch/parisc/kernel/cache.c
---- kernel-source-2.6.8.orig/arch/parisc/kernel/cache.c 2004-08-13 23:36:56.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/cache.c 2006-09-04 12:31:01.782375000 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/cache.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/cache.c 2004-08-14 01:36:56.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/cache.c 2005-02-01 01:38:33.000000000 -0500
@@ -33,6 +33,17 @@
int icache_stride;
EXPORT_SYMBOL(dcache_stride);
@@ -360,9 +366,10 @@
+ __clear_user_page_asm(page, vaddr);
+ purge_tlb_end();
+}
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/entry.S kernel-source-2.6.8/arch/parisc/kernel/entry.S
---- kernel-source-2.6.8.orig/arch/parisc/kernel/entry.S 2004-08-13 23:36:32.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/entry.S 2006-09-04 12:31:01.786375250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/entry.S
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/entry.S 2004-08-14 01:36:32.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/entry.S 2005-02-01 01:38:32.000000000 -0500
@@ -440,8 +440,17 @@
mfctl %cr25,\reg
.endm
@@ -670,9 +677,10 @@
copy %r0, %r26 /* sigset_t *oldset = NULL */
LDREG TI_TASK-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r1
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/firmware.c kernel-source-2.6.8/arch/parisc/kernel/firmware.c
---- kernel-source-2.6.8.orig/arch/parisc/kernel/firmware.c 2004-08-13 23:36:16.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/firmware.c 2006-09-04 12:31:01.786375250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/firmware.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/firmware.c 2004-08-14 01:36:16.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/firmware.c 2005-02-01 01:38:33.000000000 -0500
@@ -1276,7 +1276,7 @@
long real64_call(unsigned long fn, ...)
{
@@ -682,9 +690,10 @@
extern unsigned long real64_call_asm(unsigned long *,
unsigned long *,
unsigned long);
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/head.S kernel-source-2.6.8/arch/parisc/kernel/head.S
---- kernel-source-2.6.8.orig/arch/parisc/kernel/head.S 2004-08-13 23:37:38.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/head.S 2006-09-04 12:31:01.786375250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/head.S
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/head.S 2004-08-14 01:37:38.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/head.S 2005-02-01 01:38:32.000000000 -0500
@@ -1,12 +1,13 @@
-/*
- *
@@ -1096,9 +1105,10 @@
$global$:
.word 0
+#endif /*!LP64*/
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/pacache.S kernel-source-2.6.8/arch/parisc/kernel/pacache.S
---- kernel-source-2.6.8.orig/arch/parisc/kernel/pacache.S 2004-08-13 23:36:31.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/pacache.S 2006-09-04 12:31:01.786375250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/pacache.S
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/pacache.S 2004-08-14 01:36:31.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/pacache.S 2005-02-01 01:38:33.000000000 -0500
@@ -68,7 +68,7 @@
* consolidated.
*/
@@ -1120,9 +1130,10 @@
.proc
.callinfo NO_CALLS
.entry
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/pci-dma.c kernel-source-2.6.8/arch/parisc/kernel/pci-dma.c
---- kernel-source-2.6.8.orig/arch/parisc/kernel/pci-dma.c 2004-08-13 23:37:42.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/pci-dma.c 2006-09-04 12:31:01.790375500 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/pci-dma.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/pci-dma.c 2004-08-14 01:37:42.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/pci-dma.c 2005-02-01 01:38:33.000000000 -0500
@@ -104,7 +104,9 @@
if (!pte_none(*pte))
printk(KERN_ERR "map_pte_uncached: page already exists\n");
@@ -1143,9 +1154,10 @@
vaddr += PAGE_SIZE;
orig_vaddr += PAGE_SIZE;
pte++;
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/pdc_cons.c kernel-source-2.6.8/arch/parisc/kernel/pdc_cons.c
---- kernel-source-2.6.8.orig/arch/parisc/kernel/pdc_cons.c 2004-08-13 23:38:11.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/pdc_cons.c 2006-09-04 12:31:01.790375500 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/pdc_cons.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/pdc_cons.c 2004-08-14 01:38:11.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/pdc_cons.c 2005-02-01 01:38:32.000000000 -0500
@@ -71,6 +71,19 @@
pdc_iodc_outc(c);
}
@@ -1166,9 +1178,10 @@
int pdc_console_poll_key(struct console *co)
{
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/perf_asm.S kernel-source-2.6.8/arch/parisc/kernel/perf_asm.S
---- kernel-source-2.6.8.orig/arch/parisc/kernel/perf_asm.S 2004-08-13 23:37:38.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/perf_asm.S 2006-09-04 12:31:01.794375750 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/perf_asm.S
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/perf_asm.S 2004-08-14 01:37:38.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/perf_asm.S 2005-02-01 01:38:33.000000000 -0500
@@ -1,18 +1,19 @@
/* low-level asm for "intrigue" (PA8500-8700 CPU perf counters)
@@ -2755,9 +2768,10 @@
nop
perf_rdr_shift_out_U_leave:
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/perf_images.h kernel-source-2.6.8/arch/parisc/kernel/perf_images.h
---- kernel-source-2.6.8.orig/arch/parisc/kernel/perf_images.h 2004-08-13 23:36:17.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/perf_images.h 2006-09-04 12:31:01.798376000 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/perf_images.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/perf_images.h 2004-08-14 01:36:17.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/perf_images.h 2005-02-01 01:38:33.000000000 -0500
@@ -2,6 +2,7 @@
* Imagine for use with the Onyx (PCX-U) CPU interface
*
@@ -2766,9 +2780,10 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/real2.S kernel-source-2.6.8/arch/parisc/kernel/real2.S
---- kernel-source-2.6.8.orig/arch/parisc/kernel/real2.S 2004-08-13 23:36:58.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/real2.S 2006-09-04 12:31:01.798376000 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/real2.S
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/real2.S 2004-08-14 01:36:58.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/real2.S 2005-02-01 01:38:33.000000000 -0500
@@ -149,7 +149,7 @@
rfi_virt2real:
/* switch to real mode... */
@@ -2787,9 +2802,10 @@
nop
nop
nop
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/smp.c kernel-source-2.6.8/arch/parisc/kernel/smp.c
---- kernel-source-2.6.8.orig/arch/parisc/kernel/smp.c 2004-08-13 23:38:08.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/smp.c 2006-09-04 12:31:01.798376000 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/smp.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/smp.c 2004-08-14 01:38:08.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/smp.c 2005-02-01 01:38:33.000000000 -0500
@@ -333,6 +333,7 @@
struct smp_call_struct data;
unsigned long timeout;
@@ -2826,9 +2842,10 @@
while (wait && atomic_read (&data.unfinished_count) > 0)
barrier ();
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/syscall.S kernel-source-2.6.8/arch/parisc/kernel/syscall.S
---- kernel-source-2.6.8.orig/arch/parisc/kernel/syscall.S 2004-08-13 23:38:10.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/syscall.S 2006-09-04 12:31:01.798376000 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/syscall.S
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/syscall.S 2004-08-14 01:38:10.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/syscall.S 2005-02-01 01:38:33.000000000 -0500
@@ -16,6 +16,14 @@
#include <asm/assembly.h>
#include <asm/processor.h>
@@ -3257,9 +3274,10 @@
- .export end_linux_gateway_page
-end_linux_gateway_page:
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/syscall_table.S kernel-source-2.6.8/arch/parisc/kernel/syscall_table.S
---- kernel-source-2.6.8.orig/arch/parisc/kernel/syscall_table.S 2004-08-13 23:36:13.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/syscall_table.S 2006-09-04 12:31:01.846379000 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/syscall_table.S
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/syscall_table.S 2004-08-14 01:36:13.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/syscall_table.S 2005-02-01 01:38:33.000000000 -0500
@@ -334,12 +334,12 @@
ENTRY_SAME(epoll_ctl) /* 225 */
ENTRY_SAME(epoll_wait)
@@ -3281,9 +3299,10 @@
+ ENTRY_SAME(mq_getsetattr)
+ /* Nothing yet */ /* 235 */
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/traps.c kernel-source-2.6.8/arch/parisc/kernel/traps.c
---- kernel-source-2.6.8.orig/arch/parisc/kernel/traps.c 2004-08-13 23:38:10.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/traps.c 2006-09-04 12:31:01.850379250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/traps.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/traps.c 2004-08-14 01:38:10.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/traps.c 2005-02-01 01:38:33.000000000 -0500
@@ -135,32 +135,19 @@
EXPORT_SYMBOL(dump_stack);
@@ -3479,9 +3498,10 @@
#ifdef PRINT_USER_FAULTS
if (fault_space == 0)
printk(KERN_DEBUG "User Fault on Kernel Space ");
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/unaligned.c kernel-source-2.6.8/arch/parisc/kernel/unaligned.c
---- kernel-source-2.6.8.orig/arch/parisc/kernel/unaligned.c 2004-08-13 23:36:44.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/unaligned.c 2006-09-04 12:31:01.850379250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/unaligned.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/unaligned.c 2004-08-14 01:36:44.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/unaligned.c 2005-02-01 01:38:33.000000000 -0500
@@ -559,7 +559,7 @@
if (regs->isr != regs->sr[7])
@@ -3491,9 +3511,10 @@
regs->isr, regs->sr[7]);
/* don't kill him though, since he has appropriate access to the page, or we
-diff -urN kernel-source-2.6.8.orig/arch/parisc/kernel/unwind.c kernel-source-2.6.8/arch/parisc/kernel/unwind.c
---- kernel-source-2.6.8.orig/arch/parisc/kernel/unwind.c 2004-08-13 23:36:13.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/kernel/unwind.c 2006-09-04 12:31:01.850379250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/unwind.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/unwind.c 2004-08-14 01:36:13.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/unwind.c 2005-02-01 01:38:33.000000000 -0500
@@ -12,8 +12,10 @@
#include <linux/kernel.h>
#include <linux/init.h>
@@ -3715,9 +3736,10 @@
return 0;
}
-diff -urN kernel-source-2.6.8.orig/arch/parisc/lib/bitops.c kernel-source-2.6.8/arch/parisc/lib/bitops.c
---- kernel-source-2.6.8.orig/arch/parisc/lib/bitops.c 2004-08-13 23:36:16.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/lib/bitops.c 2006-09-04 12:31:01.850379250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/lib/bitops.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/lib/bitops.c 2004-08-14 01:36:16.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/lib/bitops.c 2005-02-01 01:38:33.000000000 -0500
@@ -13,8 +13,8 @@
#include <asm/atomic.h>
@@ -3793,9 +3815,10 @@
+ _atomic_spin_unlock_irqrestore(ptr, flags);
return (unsigned long)prev;
}
-diff -urN kernel-source-2.6.8.orig/arch/parisc/lib/debuglocks.c kernel-source-2.6.8/arch/parisc/lib/debuglocks.c
---- kernel-source-2.6.8.orig/arch/parisc/lib/debuglocks.c 2004-08-13 23:37:25.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/lib/debuglocks.c 2006-09-04 12:31:01.850379250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/lib/debuglocks.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/lib/debuglocks.c 2004-08-14 01:37:25.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/lib/debuglocks.c 2005-02-01 01:38:33.000000000 -0500
@@ -18,6 +18,11 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
@@ -3926,9 +3949,10 @@
"%s:%d: read_lock grabbed in %s at %p(%d) %ld ticks\n",
bfile, bline, current->comm, inline_pc,
cpu, jiffies - started);
-diff -urN kernel-source-2.6.8.orig/arch/parisc/mm/init.c kernel-source-2.6.8/arch/parisc/mm/init.c
---- kernel-source-2.6.8.orig/arch/parisc/mm/init.c 2004-08-13 23:36:58.000000000 -0600
-+++ kernel-source-2.6.8/arch/parisc/mm/init.c 2006-09-04 12:31:01.850379250 -0600
+Index: debian-kernel-hppa-2.6.8/arch/parisc/mm/init.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/mm/init.c 2004-08-14 01:36:58.000000000 -0400
++++ debian-kernel-hppa-2.6.8/arch/parisc/mm/init.c 2005-02-01 01:38:33.000000000 -0500
@@ -750,7 +750,7 @@
#if PTRS_PER_PMD == 1
pmd = (pmd_t *)__pa(pg_dir);
@@ -3961,9 +3985,10 @@
/* now change pg_table to kernel virtual addresses */
-diff -urN kernel-source-2.6.8.orig/drivers/char/Kconfig kernel-source-2.6.8/drivers/char/Kconfig
---- kernel-source-2.6.8.orig/drivers/char/Kconfig 2006-09-04 08:48:02.000000000 -0600
-+++ kernel-source-2.6.8/drivers/char/Kconfig 2006-09-04 12:31:01.854379500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/char/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/char/Kconfig 2005-02-01 01:36:40.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/char/Kconfig 2005-02-01 01:38:32.000000000 -0500
@@ -689,7 +689,7 @@
config HW_RANDOM
@@ -3973,9 +3998,10 @@
---help---
This driver provides kernel-side support for the Random Number
Generator hardware found on Intel i8xx-based motherboards,
-diff -urN kernel-source-2.6.8.orig/drivers/ide/pci/ns87415.c kernel-source-2.6.8/drivers/ide/pci/ns87415.c
---- kernel-source-2.6.8.orig/drivers/ide/pci/ns87415.c 2006-09-04 08:48:00.000000000 -0600
-+++ kernel-source-2.6.8/drivers/ide/pci/ns87415.c 2006-09-04 12:31:01.854379500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/ide/pci/ns87415.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/ide/pci/ns87415.c 2005-02-01 01:36:40.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/ide/pci/ns87415.c 2005-02-01 01:38:32.000000000 -0500
@@ -24,6 +24,9 @@
#include <linux/init.h>
@@ -3986,9 +4012,10 @@
static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 };
-diff -urN kernel-source-2.6.8.orig/drivers/input/keyboard/Kconfig kernel-source-2.6.8/drivers/input/keyboard/Kconfig
---- kernel-source-2.6.8.orig/drivers/input/keyboard/Kconfig 2004-08-13 23:38:04.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/keyboard/Kconfig 2006-09-04 12:31:01.854379500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/keyboard/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/keyboard/Kconfig 2004-08-14 01:38:04.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/Kconfig 2005-02-01 01:38:33.000000000 -0500
@@ -96,3 +96,33 @@
To compile this driver as a module, choose M here: the
@@ -4023,9 +4050,10 @@
+ This driver implements support for HIL-keyboards attached
+ to your machine, so normally you should say Y here.
+
-diff -urN kernel-source-2.6.8.orig/drivers/input/keyboard/Makefile kernel-source-2.6.8/drivers/input/keyboard/Makefile
---- kernel-source-2.6.8.orig/drivers/input/keyboard/Makefile 2004-08-13 23:38:11.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/keyboard/Makefile 2006-09-04 12:31:01.854379500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/keyboard/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/keyboard/Makefile 2004-08-14 01:38:11.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/Makefile 2005-02-01 01:38:33.000000000 -0500
@@ -2,8 +2,6 @@
# Makefile for the input core drivers.
#
@@ -4041,9 +4069,10 @@
obj-$(CONFIG_KEYBOARD_98KBD) += 98kbd.o
+obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
+obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
-diff -urN kernel-source-2.6.8.orig/drivers/input/keyboard/atkbd.c kernel-source-2.6.8/drivers/input/keyboard/atkbd.c
---- kernel-source-2.6.8.orig/drivers/input/keyboard/atkbd.c 2004-08-13 23:37:38.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/keyboard/atkbd.c 2006-09-04 12:31:01.854379500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/keyboard/atkbd.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/keyboard/atkbd.c 2004-08-14 01:37:38.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/atkbd.c 2005-02-01 01:38:33.000000000 -0500
@@ -64,12 +64,13 @@
* are loadable via an userland utility.
*/
@@ -4108,9 +4137,10 @@
if (atkbd_reset)
if (atkbd_command(atkbd, NULL, ATKBD_CMD_RESET_BAT))
printk(KERN_WARNING "atkbd.c: keyboard reset failed on %s\n", atkbd->serio->phys);
-diff -urN kernel-source-2.6.8.orig/drivers/input/keyboard/hil_kbd.c kernel-source-2.6.8/drivers/input/keyboard/hil_kbd.c
---- kernel-source-2.6.8.orig/drivers/input/keyboard/hil_kbd.c 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/drivers/input/keyboard/hil_kbd.c 2006-09-04 12:31:01.854379500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/keyboard/hil_kbd.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/hil_kbd.c 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,372 @@
+/*
+ * Generic linux-input device driver for keyboard devices
@@ -4484,9 +4514,10 @@
+
+module_init(hil_kbd_init);
+module_exit(hil_kbd_exit);
-diff -urN kernel-source-2.6.8.orig/drivers/input/keyboard/hilkbd.c kernel-source-2.6.8/drivers/input/keyboard/hilkbd.c
---- kernel-source-2.6.8.orig/drivers/input/keyboard/hilkbd.c 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/drivers/input/keyboard/hilkbd.c 2006-09-04 12:31:01.854379500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/keyboard/hilkbd.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/hilkbd.c 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,345 @@
+/*
+ * linux/drivers/hil/hilkbd.c
@@ -4833,9 +4864,10 @@
+module_init(hil_init);
+module_exit(hil_exit);
+
-diff -urN kernel-source-2.6.8.orig/drivers/input/keyboard/hpps2atkbd.h kernel-source-2.6.8/drivers/input/keyboard/hpps2atkbd.h
---- kernel-source-2.6.8.orig/drivers/input/keyboard/hpps2atkbd.h 2004-08-13 23:36:13.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/keyboard/hpps2atkbd.h 2006-09-04 12:31:01.854379500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/keyboard/hpps2atkbd.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/keyboard/hpps2atkbd.h 2004-08-14 01:36:13.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/hpps2atkbd.h 2005-02-01 01:38:33.000000000 -0500
@@ -50,10 +50,10 @@
/* 60 */ KEY_DOWN, C_61, KEY_PAUSE, KEY_UP, KEY_DELETE, KEY_END, KEY_BACKSPACE, KEY_INSERT,
/* 68 */ KEY_RESERVED, KEY_KP1, KEY_RIGHT, KEY_KP4, KEY_KP7, KEY_PAGEDOWN, KEY_HOME, KEY_PAGEUP,
@@ -4849,9 +4881,10 @@
/* 98 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_CAPSLOCK, KEY_RESERVED, KEY_LEFTMETA,
/* a0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RIGHTMETA,
/* a8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_COMPOSE,
-diff -urN kernel-source-2.6.8.orig/drivers/input/misc/Kconfig kernel-source-2.6.8/drivers/input/misc/Kconfig
---- kernel-source-2.6.8.orig/drivers/input/misc/Kconfig 2004-08-13 23:36:56.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/misc/Kconfig 2006-09-04 12:31:01.858379750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/misc/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/misc/Kconfig 2004-08-14 01:36:56.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/misc/Kconfig 2005-02-01 01:38:33.000000000 -0500
@@ -50,3 +50,11 @@
To compile this driver as a module, choose M here: the
module will be called uinput.
@@ -4864,17 +4897,19 @@
+ Say Y here if you want to support the built-in real time clock
+ of the HP SDC controller.
+
-diff -urN kernel-source-2.6.8.orig/drivers/input/misc/Makefile kernel-source-2.6.8/drivers/input/misc/Makefile
---- kernel-source-2.6.8.orig/drivers/input/misc/Makefile 2004-08-13 23:37:15.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/misc/Makefile 2006-09-04 12:31:01.858379750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/misc/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/misc/Makefile 2004-08-14 01:37:15.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/misc/Makefile 2005-02-01 01:38:33.000000000 -0500
@@ -9,3 +9,4 @@
obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o
obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o
obj-$(CONFIG_INPUT_UINPUT) += uinput.o
+obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
-diff -urN kernel-source-2.6.8.orig/drivers/input/misc/hp_sdc_rtc.c kernel-source-2.6.8/drivers/input/misc/hp_sdc_rtc.c
---- kernel-source-2.6.8.orig/drivers/input/misc/hp_sdc_rtc.c 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/drivers/input/misc/hp_sdc_rtc.c 2006-09-04 12:31:01.858379750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/misc/hp_sdc_rtc.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/drivers/input/misc/hp_sdc_rtc.c 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,726 @@
+/*
+ * HP i8042 SDC + MSM-58321 BBRTC driver.
@@ -5602,9 +5637,10 @@
+
+module_init(hp_sdc_rtc_init);
+module_exit(hp_sdc_rtc_exit);
-diff -urN kernel-source-2.6.8.orig/drivers/input/mouse/Kconfig kernel-source-2.6.8/drivers/input/mouse/Kconfig
---- kernel-source-2.6.8.orig/drivers/input/mouse/Kconfig 2004-08-13 23:37:38.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/mouse/Kconfig 2006-09-04 12:31:01.862380000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/mouse/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/mouse/Kconfig 2004-08-14 01:37:38.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/mouse/Kconfig 2005-02-01 01:38:33.000000000 -0500
@@ -130,3 +130,11 @@
described in the source file). This driver should, in theory,
also work with the digitizer DEC produced, but it isn't tested
@@ -5617,9 +5653,10 @@
+ select HIL_MLC
+ help
+ Say Y here to support HIL pointers.
-diff -urN kernel-source-2.6.8.orig/drivers/input/mouse/Makefile kernel-source-2.6.8/drivers/input/mouse/Makefile
---- kernel-source-2.6.8.orig/drivers/input/mouse/Makefile 2004-08-13 23:36:32.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/mouse/Makefile 2006-09-04 12:31:01.862380000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/mouse/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/mouse/Makefile 2004-08-14 01:36:32.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/mouse/Makefile 2005-02-01 01:38:33.000000000 -0500
@@ -12,6 +12,7 @@
obj-$(CONFIG_MOUSE_PC110PAD) += pc110pad.o
obj-$(CONFIG_MOUSE_PS2) += psmouse.o
@@ -5628,9 +5665,10 @@
obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o
psmouse-objs := psmouse-base.o logips2pp.o synaptics.o
-diff -urN kernel-source-2.6.8.orig/drivers/input/mouse/hil_ptr.c kernel-source-2.6.8/drivers/input/mouse/hil_ptr.c
---- kernel-source-2.6.8.orig/drivers/input/mouse/hil_ptr.c 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/drivers/input/mouse/hil_ptr.c 2006-09-04 12:31:01.862380000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/mouse/hil_ptr.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/drivers/input/mouse/hil_ptr.c 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,409 @@
+/*
+ * Generic linux-input device driver for axis-bearing devices
@@ -6041,9 +6079,10 @@
+
+module_init(hil_ptr_init);
+module_exit(hil_ptr_exit);
-diff -urN kernel-source-2.6.8.orig/drivers/input/serio/Kconfig kernel-source-2.6.8/drivers/input/serio/Kconfig
---- kernel-source-2.6.8.orig/drivers/input/serio/Kconfig 2004-08-13 23:36:59.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/serio/Kconfig 2006-09-04 12:31:01.862380000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/serio/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/serio/Kconfig 2004-08-14 01:36:59.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/Kconfig 2005-02-01 01:38:33.000000000 -0500
@@ -111,6 +111,32 @@
To compile this driver as a module, choose M here: the
module will be called gscps2.
@@ -6077,9 +6116,10 @@
config SERIO_PCIPS2
tristate "PCI PS/2 keyboard and PS/2 mouse controller"
depends on PCI && SERIO
-diff -urN kernel-source-2.6.8.orig/drivers/input/serio/Makefile kernel-source-2.6.8/drivers/input/serio/Makefile
---- kernel-source-2.6.8.orig/drivers/input/serio/Makefile 2004-08-13 23:36:13.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/serio/Makefile 2006-09-04 12:31:01.862380000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/serio/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/serio/Makefile 2004-08-14 01:36:13.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/Makefile 2005-02-01 01:38:33.000000000 -0500
@@ -2,8 +2,6 @@
# Makefile for the input core drivers.
#
@@ -6097,9 +6137,10 @@
+obj-$(CONFIG_HIL_MLC) += hp_sdc_mlc.o hil_mlc.o
obj-$(CONFIG_SERIO_PCIPS2) += pcips2.o
obj-$(CONFIG_SERIO_MACEPS2) += maceps2.o
-diff -urN kernel-source-2.6.8.orig/drivers/input/serio/gscps2.c kernel-source-2.6.8/drivers/input/serio/gscps2.c
---- kernel-source-2.6.8.orig/drivers/input/serio/gscps2.c 2004-08-13 23:38:09.000000000 -0600
-+++ kernel-source-2.6.8/drivers/input/serio/gscps2.c 2006-09-04 12:31:01.862380000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/serio/gscps2.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/serio/gscps2.c 2004-08-14 01:38:09.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/gscps2.c 2005-02-01 01:38:32.000000000 -0500
@@ -38,7 +38,7 @@
#include <asm/parisc-device.h>
@@ -6127,9 +6168,10 @@
.id_table = gscps2_device_tbl,
.probe = gscps2_probe,
.remove = gscps2_remove,
-diff -urN kernel-source-2.6.8.orig/drivers/input/serio/hil_mlc.c kernel-source-2.6.8/drivers/input/serio/hil_mlc.c
---- kernel-source-2.6.8.orig/drivers/input/serio/hil_mlc.c 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/drivers/input/serio/hil_mlc.c 2006-09-04 12:31:01.866380250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/serio/hil_mlc.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/hil_mlc.c 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,951 @@
+/*
+ * HIL MLC state machine and serio interface driver
@@ -7082,9 +7124,10 @@
+
+module_init(hil_mlc_init);
+module_exit(hil_mlc_exit);
-diff -urN kernel-source-2.6.8.orig/drivers/input/serio/hp_sdc.c kernel-source-2.6.8/drivers/input/serio/hp_sdc.c
---- kernel-source-2.6.8.orig/drivers/input/serio/hp_sdc.c 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/drivers/input/serio/hp_sdc.c 2006-09-04 12:31:01.866380250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/serio/hp_sdc.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/hp_sdc.c 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,1067 @@
+/*
+ * HP i8042-based System Device Controller driver.
@@ -8153,9 +8196,10 @@
+ * task 1655209 cycles 6937 calls (includes put)
+ *
+ */
-diff -urN kernel-source-2.6.8.orig/drivers/input/serio/hp_sdc_mlc.c kernel-source-2.6.8/drivers/input/serio/hp_sdc_mlc.c
---- kernel-source-2.6.8.orig/drivers/input/serio/hp_sdc_mlc.c 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/drivers/input/serio/hp_sdc_mlc.c 2006-09-04 12:31:01.866380250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/input/serio/hp_sdc_mlc.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/hp_sdc_mlc.c 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,370 @@
+/*
+ * Access to HP-HIL MLC through HP System Device Controller.
@@ -8527,9 +8571,10 @@
+
+module_init(hp_sdc_mlc_init);
+module_exit(hp_sdc_mlc_exit);
-diff -urN kernel-source-2.6.8.orig/drivers/net/tulip/media.c kernel-source-2.6.8/drivers/net/tulip/media.c
---- kernel-source-2.6.8.orig/drivers/net/tulip/media.c 2004-08-13 23:36:32.000000000 -0600
-+++ kernel-source-2.6.8/drivers/net/tulip/media.c 2006-09-04 12:31:01.866380250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/net/tulip/media.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/net/tulip/media.c 2004-08-14 01:36:32.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/net/tulip/media.c 2005-02-01 01:38:33.000000000 -0500
@@ -43,8 +43,10 @@
/* MII transceiver control section.
@@ -8573,9 +8618,10 @@
tmp_info = get_u16(&misc_info[1]);
if (tmp_info)
tp->advertising[phy_num] = tmp_info | 1;
-diff -urN kernel-source-2.6.8.orig/drivers/parisc/power.c kernel-source-2.6.8/drivers/parisc/power.c
---- kernel-source-2.6.8.orig/drivers/parisc/power.c 2004-08-13 23:36:16.000000000 -0600
-+++ kernel-source-2.6.8/drivers/parisc/power.c 2006-09-04 12:31:01.890381750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/parisc/power.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/parisc/power.c 2004-08-14 01:36:16.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/parisc/power.c 2005-02-01 01:38:33.000000000 -0500
@@ -54,9 +54,9 @@
@@ -8605,9 +8651,10 @@
#ifdef CONFIG_CHASSIS_LCD_LED
lcd_print(msg);
#endif
-diff -urN kernel-source-2.6.8.orig/drivers/parisc/sba_iommu.c kernel-source-2.6.8/drivers/parisc/sba_iommu.c
---- kernel-source-2.6.8.orig/drivers/parisc/sba_iommu.c 2004-08-13 23:37:37.000000000 -0600
-+++ kernel-source-2.6.8/drivers/parisc/sba_iommu.c 2006-09-04 12:31:01.890381750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/parisc/sba_iommu.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/parisc/sba_iommu.c 2004-08-14 01:37:37.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/parisc/sba_iommu.c 2005-02-01 01:38:33.000000000 -0500
@@ -1,8 +1,9 @@
/*
** System Bus Adapter (SBA) I/O MMU manager
@@ -8620,9 +8667,10 @@
**
** Portions (c) 1999 Dave S. Miller (from sparc64 I/O MMU code)
**
-diff -urN kernel-source-2.6.8.orig/drivers/pcmcia/Kconfig kernel-source-2.6.8/drivers/pcmcia/Kconfig
---- kernel-source-2.6.8.orig/drivers/pcmcia/Kconfig 2004-08-13 23:37:37.000000000 -0600
-+++ kernel-source-2.6.8/drivers/pcmcia/Kconfig 2006-09-04 12:31:01.890381750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/pcmcia/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/pcmcia/Kconfig 2004-08-14 01:37:37.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/pcmcia/Kconfig 2005-02-01 01:38:33.000000000 -0500
@@ -136,7 +136,7 @@
config PCMCIA_PROBE
@@ -8632,9 +8680,10 @@
endmenu
-diff -urN kernel-source-2.6.8.orig/drivers/pcmcia/rsrc_mgr.c kernel-source-2.6.8/drivers/pcmcia/rsrc_mgr.c
---- kernel-source-2.6.8.orig/drivers/pcmcia/rsrc_mgr.c 2004-08-13 23:37:15.000000000 -0600
-+++ kernel-source-2.6.8/drivers/pcmcia/rsrc_mgr.c 2006-09-04 12:31:01.914383250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/pcmcia/rsrc_mgr.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/pcmcia/rsrc_mgr.c 2004-08-14 01:37:15.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/pcmcia/rsrc_mgr.c 2005-02-01 01:38:33.000000000 -0500
@@ -59,10 +59,12 @@
#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0444)
@@ -8649,9 +8698,10 @@
#endif
/*======================================================================
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/lasi700.c kernel-source-2.6.8/drivers/scsi/lasi700.c
---- kernel-source-2.6.8.orig/drivers/scsi/lasi700.c 2004-08-13 23:36:16.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/lasi700.c 2006-09-04 12:31:01.914383250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/lasi700.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/lasi700.c 2004-08-14 01:36:16.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/lasi700.c 2005-02-01 01:38:32.000000000 -0500
@@ -110,7 +110,7 @@
host->irq = dev->irq;
@@ -8661,9 +8711,10 @@
printk(KERN_ERR "%s: irq problem, detaching\n",
dev->dev.bus_id);
goto out_put_host;
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym53c8xx.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym53c8xx.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym53c8xx.h 2004-08-13 23:38:10.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym53c8xx.h 2006-09-04 12:31:01.914383250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym53c8xx.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym53c8xx.h 2004-08-14 01:38:10.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym53c8xx.h 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8710,9 +8761,10 @@
*/
#ifndef SYM53C8XX_H
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_conf.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_conf.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_conf.h 2004-08-13 23:37:38.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_conf.h 2006-09-04 12:31:01.914383250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_conf.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_conf.h 2004-08-14 01:37:38.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_conf.h 2005-02-01 01:38:32.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8757,9 +8809,10 @@
*/
#ifndef SYM_CONF_H
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_defs.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_defs.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_defs.h 2004-08-13 23:36:56.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_defs.h 2006-09-04 12:31:01.914383250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_defs.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_defs.h 2004-08-14 01:36:56.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8806,9 +8859,10 @@
*/
#ifndef SYM_DEFS_H
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw.c kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.c
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw.c 2004-08-13 23:38:08.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.c 2006-09-04 12:31:01.938384750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw.c 2004-08-14 01:38:08.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.c 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8869,9 +8923,10 @@
}
/*
* If PREFETCH feature not enabled, remove
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw.h 2004-08-13 23:37:14.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.h 2006-09-04 12:31:01.938384750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw.h 2004-08-14 01:37:14.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.h 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8918,9 +8973,10 @@
*/
#ifndef SYM_FW_H
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw1.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw1.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw1.h 2004-08-13 23:37:38.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw1.h 2006-09-04 12:31:01.938384750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw1.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw1.h 2004-08-14 01:37:38.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw1.h 2005-02-01 01:38:32.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8965,9 +9021,10 @@
*/
/*
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw2.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw2.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw2.h 2004-08-13 23:37:40.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw2.h 2006-09-04 12:31:01.962386250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw2.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw2.h 2004-08-14 01:37:40.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw2.h 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9012,9 +9069,10 @@
*/
/*
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_glue.c kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.c
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_glue.c 2006-09-04 08:48:01.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.c 2006-09-04 12:31:01.962386250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-02-01 01:36:43.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9067,9 +9125,10 @@
break;
default:
break;
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_glue.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_glue.h 2006-09-04 08:48:01.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.h 2006-09-04 12:31:01.962386250 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_glue.h 2004-08-14 01:38:10.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9134,9 +9193,10 @@
/*
* A 'read barrier' flushes any data that have been prefetched
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_hipd.c kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.c
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_hipd.c 2006-09-04 08:48:01.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.c 2006-09-04 12:31:01.990388000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_hipd.c 2004-08-14 01:36:10.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-02-01 01:38:33.000000000 -0500
@@ -3,6 +3,7 @@
* of PCI-SCSI IO processors.
*
@@ -9250,9 +9310,10 @@
* Prepare controller and devices settings, according
* to chip features, user set-up and driver set-up.
*/
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_hipd.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_hipd.h 2004-08-13 23:36:48.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.h 2006-09-04 12:31:02.014389500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_hipd.h 2004-08-14 01:36:48.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9318,9 +9379,10 @@
#define UDELAY sym_udelay
#endif /* SYM_HIPD_H */
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_malloc.c kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_malloc.c
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_malloc.c 2004-08-13 23:37:39.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_malloc.c 2006-09-04 12:31:02.014389500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_malloc.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_malloc.c 2004-08-14 01:37:39.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_malloc.c 2005-02-01 01:38:32.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9365,9 +9427,10 @@
*/
#ifdef __FreeBSD__
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_misc.c kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.c
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_misc.c 2004-08-13 23:37:40.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.c 2006-09-04 12:31:02.014389500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_misc.c 2004-08-14 01:37:40.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.c 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9412,9 +9475,10 @@
*/
#ifdef __FreeBSD__
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_misc.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_misc.h 2004-08-13 23:38:10.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.h 2006-09-04 12:31:02.014389500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_misc.h 2004-08-14 01:38:10.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.h 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9459,9 +9523,10 @@
*/
#ifndef SYM_MISC_H
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_nvram.c kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.c
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_nvram.c 2004-08-13 23:37:15.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.c 2006-09-04 12:31:02.038391000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_nvram.c 2004-08-14 01:37:15.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9506,9 +9571,10 @@
*/
#include "sym_glue.h"
-diff -urN kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_nvram.h kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.h
---- kernel-source-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_nvram.h 2004-08-13 23:37:40.000000000 -0600
-+++ kernel-source-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.h 2006-09-04 12:31:02.038391000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_nvram.h 2004-08-14 01:37:40.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.h 2005-02-01 01:38:33.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9553,9 +9619,10 @@
*/
#ifndef SYM_NVRAM_H
-diff -urN kernel-source-2.6.8.orig/drivers/serial/8250.c kernel-source-2.6.8/drivers/serial/8250.c
---- kernel-source-2.6.8.orig/drivers/serial/8250.c 2006-09-04 08:48:04.000000000 -0600
-+++ kernel-source-2.6.8/drivers/serial/8250.c 2006-09-04 12:31:02.038391000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/serial/8250.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/8250.c 2005-02-01 01:36:43.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/serial/8250.c 2005-02-01 01:38:33.000000000 -0500
@@ -2023,8 +2023,18 @@
.data = &serial8250_reg,
};
@@ -9585,9 +9652,10 @@
static int __init serial8250_late_console_init(void)
{
-diff -urN kernel-source-2.6.8.orig/drivers/serial/8250_gsc.c kernel-source-2.6.8/drivers/serial/8250_gsc.c
---- kernel-source-2.6.8.orig/drivers/serial/8250_gsc.c 2004-08-13 23:37:28.000000000 -0600
-+++ kernel-source-2.6.8/drivers/serial/8250_gsc.c 2006-09-04 12:31:02.062392500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/serial/8250_gsc.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/8250_gsc.c 2004-08-14 01:37:28.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/serial/8250_gsc.c 2005-02-01 01:38:32.000000000 -0500
@@ -82,7 +82,11 @@
kfree(serial);
return -ENODEV;
@@ -9601,9 +9669,10 @@
return 0;
}
-diff -urN kernel-source-2.6.8.orig/drivers/serial/8250_pci.c kernel-source-2.6.8/drivers/serial/8250_pci.c
---- kernel-source-2.6.8.orig/drivers/serial/8250_pci.c 2004-08-13 23:37:38.000000000 -0600
-+++ kernel-source-2.6.8/drivers/serial/8250_pci.c 2006-09-04 12:31:02.062392500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/serial/8250_pci.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/8250_pci.c 2004-08-14 01:37:38.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/serial/8250_pci.c 2005-02-01 01:38:33.000000000 -0500
@@ -2177,7 +2177,14 @@
static int __init serial8250_pci_init(void)
@@ -9620,9 +9689,10 @@
}
static void __exit serial8250_pci_exit(void)
-diff -urN kernel-source-2.6.8.orig/drivers/serial/Kconfig kernel-source-2.6.8/drivers/serial/Kconfig
---- kernel-source-2.6.8.orig/drivers/serial/Kconfig 2004-08-13 23:37:42.000000000 -0600
-+++ kernel-source-2.6.8/drivers/serial/Kconfig 2006-09-04 12:31:02.086394000 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/serial/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/Kconfig 2004-08-14 01:37:42.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/serial/Kconfig 2005-02-01 01:38:32.000000000 -0500
@@ -450,7 +450,7 @@
config PDC_CONSOLE
@@ -9632,9 +9702,10 @@
default n
help
Saying Y here will enable the software based PDC console to be
-diff -urN kernel-source-2.6.8.orig/drivers/serial/serial_core.c kernel-source-2.6.8/drivers/serial/serial_core.c
---- kernel-source-2.6.8.orig/drivers/serial/serial_core.c 2006-09-04 08:48:04.000000000 -0600
-+++ kernel-source-2.6.8/drivers/serial/serial_core.c 2006-09-04 12:31:02.110395500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/serial/serial_core.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/serial_core.c 2005-02-01 01:36:43.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/serial/serial_core.c 2005-02-01 01:38:33.000000000 -0500
@@ -231,7 +231,8 @@
/*
* Ensure that the IRQ handler isn't running on another CPU.
@@ -9658,9 +9729,10 @@
}
static void
-diff -urN kernel-source-2.6.8.orig/drivers/video/console/Kconfig kernel-source-2.6.8/drivers/video/console/Kconfig
---- kernel-source-2.6.8.orig/drivers/video/console/Kconfig 2004-08-13 23:36:32.000000000 -0600
-+++ kernel-source-2.6.8/drivers/video/console/Kconfig 2006-09-04 12:31:02.110395500 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/video/console/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/video/console/Kconfig 2004-08-14 01:36:32.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/video/console/Kconfig 2005-02-01 01:38:33.000000000 -0500
@@ -6,7 +6,7 @@
config VGA_CONSOLE
@@ -9679,9 +9751,10 @@
default y
help
The STI console is the builtin display/keyboard on HP-PARISC
-diff -urN kernel-source-2.6.8.orig/drivers/video/stifb.c kernel-source-2.6.8/drivers/video/stifb.c
---- kernel-source-2.6.8.orig/drivers/video/stifb.c 2004-08-13 23:38:11.000000000 -0600
-+++ kernel-source-2.6.8/drivers/video/stifb.c 2006-09-04 12:31:02.114395750 -0600
+Index: debian-kernel-hppa-2.6.8/drivers/video/stifb.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/video/stifb.c 2004-08-14 01:38:11.000000000 -0400
++++ debian-kernel-hppa-2.6.8/drivers/video/stifb.c 2005-02-01 01:38:33.000000000 -0500
@@ -1379,6 +1379,7 @@
stifb_init(void)
{
@@ -9711,9 +9784,10 @@
break;
if (bpp > 0)
stifb_force_bpp[i] = bpp;
-diff -urN kernel-source-2.6.8.orig/fs/smbfs/inode.c kernel-source-2.6.8/fs/smbfs/inode.c
---- kernel-source-2.6.8.orig/fs/smbfs/inode.c 2004-08-13 23:36:17.000000000 -0600
-+++ kernel-source-2.6.8/fs/smbfs/inode.c 2006-09-04 12:31:02.114395750 -0600
+Index: debian-kernel-hppa-2.6.8/fs/smbfs/inode.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/fs/smbfs/inode.c 2004-08-14 01:36:17.000000000 -0400
++++ debian-kernel-hppa-2.6.8/fs/smbfs/inode.c 2005-02-01 01:38:33.000000000 -0500
@@ -558,6 +558,7 @@
mnt->ttl = SMB_TTL_DEFAULT;
@@ -9732,9 +9806,10 @@
} else {
if (parse_options(mnt, raw_data))
goto out_bad_option;
-diff -urN kernel-source-2.6.8.orig/include/asm-generic/compat_signal.h kernel-source-2.6.8/include/asm-generic/compat_signal.h
---- kernel-source-2.6.8.orig/include/asm-generic/compat_signal.h 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/include/asm-generic/compat_signal.h 2006-09-04 12:31:02.134397000 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-generic/compat_signal.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/include/asm-generic/compat_signal.h 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,25 @@
+#ifndef _ASM_GENERIC_COMPAT_SIGNAL_H
+#define _ASM_GENERIC_COMPAT_SIGNAL_H
@@ -9761,9 +9836,10 @@
+
+#endif /* !__ASSEMBLY__ */
+#endif /* !_ASM_GENERIC_COMPAT_SIGNAL_H */
-diff -urN kernel-source-2.6.8.orig/include/asm-ia64/compat.h kernel-source-2.6.8/include/asm-ia64/compat.h
---- kernel-source-2.6.8.orig/include/asm-ia64/compat.h 2004-08-13 23:38:04.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-ia64/compat.h 2006-09-04 12:31:02.134397000 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-ia64/compat.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-ia64/compat.h 2004-08-14 01:38:04.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-ia64/compat.h 2005-02-01 01:38:33.000000000 -0500
@@ -27,6 +27,7 @@
typedef s32 compat_daddr_t;
typedef u32 compat_caddr_t;
@@ -9772,15 +9848,17 @@
typedef s32 compat_int_t;
typedef s32 compat_long_t;
-diff -urN kernel-source-2.6.8.orig/include/asm-ia64/compat_siginfo.h kernel-source-2.6.8/include/asm-ia64/compat_siginfo.h
---- kernel-source-2.6.8.orig/include/asm-ia64/compat_siginfo.h 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/include/asm-ia64/compat_siginfo.h 2006-09-04 12:31:02.134397000 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-ia64/compat_siginfo.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/include/asm-ia64/compat_siginfo.h 2005-02-01 01:38:32.000000000 -0500
@@ -0,0 +1,2 @@
+/* We use the generic compat struct */
+#include <asm-generic/compat_siginfo.h>
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/assembly.h kernel-source-2.6.8/include/asm-parisc/assembly.h
---- kernel-source-2.6.8.orig/include/asm-parisc/assembly.h 2004-08-13 23:36:59.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/assembly.h 2006-09-04 12:31:02.138397250 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/assembly.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/assembly.h 2004-08-14 01:36:59.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/assembly.h 2005-02-01 01:38:33.000000000 -0500
@@ -27,8 +27,10 @@
#define LDREGX ldd,s
#define LDREGM ldd,mb
@@ -9846,9 +9924,10 @@
.endm
#endif /* ! __LP64__ */
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/atomic.h kernel-source-2.6.8/include/asm-parisc/atomic.h
---- kernel-source-2.6.8.orig/include/asm-parisc/atomic.h 2004-08-13 23:36:45.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/atomic.h 2006-09-04 12:31:02.138397250 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/atomic.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/atomic.h 2004-08-14 01:36:45.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/atomic.h 2005-02-01 01:38:33.000000000 -0500
@@ -14,10 +14,9 @@
*/
@@ -9950,9 +10029,10 @@
}
static __inline__ int atomic_read(const atomic_t *v)
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/bitops.h kernel-source-2.6.8/include/asm-parisc/bitops.h
---- kernel-source-2.6.8.orig/include/asm-parisc/bitops.h 2004-08-13 23:36:11.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/bitops.h 2006-09-04 12:31:02.138397250 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/bitops.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/bitops.h 2004-08-14 01:36:11.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/bitops.h 2005-02-01 01:38:32.000000000 -0500
@@ -38,9 +38,9 @@
addr += (nr >> SHIFT_PER_LONG);
@@ -10028,9 +10108,10 @@
return oldbit;
}
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/pci.h kernel-source-2.6.8/include/asm-parisc/pci.h
---- kernel-source-2.6.8.orig/include/asm-parisc/pci.h 2004-08-13 23:37:29.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/pci.h 2006-09-04 12:31:02.162398750 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/pci.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/pci.h 2004-08-14 01:37:29.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/pci.h 2005-02-01 01:38:33.000000000 -0500
@@ -150,16 +150,25 @@
#endif
@@ -10067,9 +10148,10 @@
#define PCIBIOS_MIN_IO 0x10
#define PCIBIOS_MIN_MEM 0x1000 /* NBPG - but pci/setup-res.c dies */
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/pdc.h kernel-source-2.6.8/include/asm-parisc/pdc.h
---- kernel-source-2.6.8.orig/include/asm-parisc/pdc.h 2004-08-13 23:36:09.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/pdc.h 2006-09-04 12:31:02.162398750 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/pdc.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/pdc.h 2004-08-14 01:36:09.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/pdc.h 2005-02-01 01:38:33.000000000 -0500
@@ -754,6 +754,7 @@
int pdc_iodc_getc(void);
void pdc_iodc_putc(unsigned char c);
@@ -10078,9 +10160,10 @@
void pdc_emergency_unlock(void);
int pdc_sti_call(unsigned long func, unsigned long flags,
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/posix_types.h kernel-source-2.6.8/include/asm-parisc/posix_types.h
---- kernel-source-2.6.8.orig/include/asm-parisc/posix_types.h 2004-08-13 23:37:39.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/posix_types.h 2006-09-04 12:31:02.162398750 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/posix_types.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/posix_types.h 2004-08-14 01:37:39.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/posix_types.h 2005-02-01 01:38:33.000000000 -0500
@@ -15,7 +15,7 @@
typedef unsigned int __kernel_uid_t;
typedef unsigned int __kernel_gid_t;
@@ -10090,9 +10173,10 @@
typedef int __kernel_timer_t;
typedef int __kernel_clockid_t;
typedef int __kernel_daddr_t;
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/ptrace.h kernel-source-2.6.8/include/asm-parisc/ptrace.h
---- kernel-source-2.6.8.orig/include/asm-parisc/ptrace.h 2004-08-13 23:36:57.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/ptrace.h 2006-09-04 12:31:02.182400000 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/ptrace.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/ptrace.h 2004-08-14 01:36:57.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/ptrace.h 2005-02-01 01:38:33.000000000 -0500
@@ -46,7 +46,8 @@
#ifdef __KERNEL__
@@ -10103,9 +10187,10 @@
#define instruction_pointer(regs) ((regs)->iaoq[0] & ~3)
extern void show_regs(struct pt_regs *);
#endif
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/spinlock.h kernel-source-2.6.8/include/asm-parisc/spinlock.h
---- kernel-source-2.6.8.orig/include/asm-parisc/spinlock.h 2004-08-13 23:38:11.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/spinlock.h 2006-09-04 12:31:02.182400000 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/spinlock.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/spinlock.h 2004-08-14 01:38:11.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/spinlock.h 2005-02-01 01:38:33.000000000 -0500
@@ -27,21 +27,35 @@
static inline void _raw_spin_lock(spinlock_t *x)
@@ -10146,9 +10231,10 @@
}
#define spin_lock_own(LOCK, LOCATION) ((void)0)
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/system.h kernel-source-2.6.8/include/asm-parisc/system.h
---- kernel-source-2.6.8.orig/include/asm-parisc/system.h 2004-08-13 23:37:14.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/system.h 2006-09-04 12:31:11.462980000 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/system.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/system.h 2004-08-14 01:37:14.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/system.h 2005-02-01 01:38:33.000000000 -0500
@@ -80,7 +80,7 @@
#define mtctl(gr, cr) \
__asm__ __volatile__("mtctl %0,%1" \
@@ -10167,15 +10253,6 @@
/*
-@@ -125,7 +125,7 @@
- ** The __asm__ op below simple prevents gcc/ld from reordering
- ** instructions across the mb() "call".
- */
--#define mb() __asm__ __volatile__("":::"memory"); /* barrier() */
-+#define mb() __asm__ __volatile__("":::"memory") /* barrier() */
- #define rmb() mb()
- #define wmb() mb()
- #define smp_mb() mb()
@@ -154,7 +154,7 @@
for the semaphore. */
#define __PA_LDCW_ALIGNMENT 16
@@ -10208,9 +10285,10 @@
+#endif
+
#endif
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/thread_info.h kernel-source-2.6.8/include/asm-parisc/thread_info.h
---- kernel-source-2.6.8.orig/include/asm-parisc/thread_info.h 2004-08-13 23:36:44.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/thread_info.h 2006-09-04 12:31:02.182400000 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/thread_info.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/thread_info.h 2004-08-14 01:36:44.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/thread_info.h 2005-02-01 01:38:33.000000000 -0500
@@ -18,12 +18,15 @@
#define INIT_THREAD_INFO(tsk) \
@@ -10233,9 +10311,10 @@
}
#define init_thread_info (init_thread_union.thread_info)
-diff -urN kernel-source-2.6.8.orig/include/asm-parisc/tlbflush.h kernel-source-2.6.8/include/asm-parisc/tlbflush.h
---- kernel-source-2.6.8.orig/include/asm-parisc/tlbflush.h 2004-08-13 23:38:09.000000000 -0600
-+++ kernel-source-2.6.8/include/asm-parisc/tlbflush.h 2006-09-04 12:31:02.182400000 -0600
+Index: debian-kernel-hppa-2.6.8/include/asm-parisc/tlbflush.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/tlbflush.h 2004-08-14 01:38:09.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/tlbflush.h 2005-02-01 01:38:33.000000000 -0500
@@ -51,9 +51,12 @@
{
/* For one page, it's not worth testing the split_tlb variable */
@@ -10278,9 +10357,10 @@
}
}
}
-diff -urN kernel-source-2.6.8.orig/include/linux/compat.h kernel-source-2.6.8/include/linux/compat.h
---- kernel-source-2.6.8.orig/include/linux/compat.h 2004-08-13 23:36:57.000000000 -0600
-+++ kernel-source-2.6.8/include/linux/compat.h 2006-09-04 12:31:02.186400250 -0600
+Index: debian-kernel-hppa-2.6.8/include/linux/compat.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/linux/compat.h 2004-08-14 01:36:57.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/linux/compat.h 2005-02-01 01:38:33.000000000 -0500
@@ -6,10 +6,16 @@
*/
#include <linux/config.h>
@@ -10339,9 +10419,10 @@
long compat_sys_semctl(int first, int second, int third, void __user *uptr);
long compat_sys_msgsnd(int first, int second, int third, void __user *uptr);
long compat_sys_msgrcv(int first, int second, int msgtyp, int third,
-diff -urN kernel-source-2.6.8.orig/include/linux/compat_siginfo.h kernel-source-2.6.8/include/linux/compat_siginfo.h
---- kernel-source-2.6.8.orig/include/linux/compat_siginfo.h 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/include/linux/compat_siginfo.h 2006-09-04 12:31:02.186400250 -0600
+Index: debian-kernel-hppa-2.6.8/include/linux/compat_siginfo.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/include/linux/compat_siginfo.h 2005-02-01 01:38:32.000000000 -0500
@@ -0,0 +1,178 @@
+#ifndef _ASM_GENERIC_COMPAT_SIGINFO_H
+#define _ASM_GENERIC_COMPAT_SIGINFO_H
@@ -10521,9 +10602,10 @@
+#endif /* CONFIG_COMPAT */
+#endif /* _ASM_GENERIC_COMPAT_SIGINFO_H */
+
-diff -urN kernel-source-2.6.8.orig/include/linux/console.h kernel-source-2.6.8/include/linux/console.h
---- kernel-source-2.6.8.orig/include/linux/console.h 2004-08-13 23:36:56.000000000 -0600
-+++ kernel-source-2.6.8/include/linux/console.h 2006-09-04 12:31:02.186400250 -0600
+Index: debian-kernel-hppa-2.6.8/include/linux/console.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/linux/console.h 2004-08-14 01:36:56.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/linux/console.h 2005-02-01 01:38:33.000000000 -0500
@@ -84,6 +84,7 @@
#define CON_PRINTBUFFER (1)
#define CON_CONSDEV (2) /* Last on the command line */
@@ -10532,9 +10614,10 @@
struct console
{
-diff -urN kernel-source-2.6.8.orig/include/linux/hil.h kernel-source-2.6.8/include/linux/hil.h
---- kernel-source-2.6.8.orig/include/linux/hil.h 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/include/linux/hil.h 2006-09-04 12:31:02.186400250 -0600
+Index: debian-kernel-hppa-2.6.8/include/linux/hil.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/include/linux/hil.h 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,483 @@
+#ifndef _HIL_H_
+#define _HIL_H_
@@ -11019,9 +11102,10 @@
+
+
+#endif /* _HIL_H_ */
-diff -urN kernel-source-2.6.8.orig/include/linux/hil_mlc.h kernel-source-2.6.8/include/linux/hil_mlc.h
---- kernel-source-2.6.8.orig/include/linux/hil_mlc.h 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/include/linux/hil_mlc.h 2006-09-04 12:31:02.206401500 -0600
+Index: debian-kernel-hppa-2.6.8/include/linux/hil_mlc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/include/linux/hil_mlc.h 2005-02-01 01:38:32.000000000 -0500
@@ -0,0 +1,171 @@
+/*
+ * HP Human Interface Loop Master Link Controller driver.
@@ -11194,9 +11278,10 @@
+
+int hil_mlc_register(hil_mlc *mlc);
+int hil_mlc_unregister(hil_mlc *mlc);
-diff -urN kernel-source-2.6.8.orig/include/linux/hp_sdc.h kernel-source-2.6.8/include/linux/hp_sdc.h
---- kernel-source-2.6.8.orig/include/linux/hp_sdc.h 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/include/linux/hp_sdc.h 2006-09-04 12:31:02.206401500 -0600
+Index: debian-kernel-hppa-2.6.8/include/linux/hp_sdc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/include/linux/hp_sdc.h 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,300 @@
+/*
+ * HP i8042 System Device Controller -- header
@@ -11498,9 +11583,10 @@
+} hp_i8042_sdc;
+
+#endif /* _LINUX_HP_SDC_H */
-diff -urN kernel-source-2.6.8.orig/include/linux/input.h kernel-source-2.6.8/include/linux/input.h
---- kernel-source-2.6.8.orig/include/linux/input.h 2004-08-13 23:36:57.000000000 -0600
-+++ kernel-source-2.6.8/include/linux/input.h 2006-09-04 12:31:02.210401750 -0600
+Index: debian-kernel-hppa-2.6.8/include/linux/input.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/linux/input.h 2004-08-14 01:36:57.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/linux/input.h 2005-02-01 01:38:33.000000000 -0500
@@ -586,6 +586,7 @@
#define BUS_ADB 0x17
#define BUS_I2C 0x18
@@ -11509,9 +11595,10 @@
/*
* Values describing the status of an effect
-diff -urN kernel-source-2.6.8.orig/include/linux/serial_core.h kernel-source-2.6.8/include/linux/serial_core.h
---- kernel-source-2.6.8.orig/include/linux/serial_core.h 2004-08-13 23:36:16.000000000 -0600
-+++ kernel-source-2.6.8/include/linux/serial_core.h 2006-09-04 12:31:02.210401750 -0600
+Index: debian-kernel-hppa-2.6.8/include/linux/serial_core.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/linux/serial_core.h 2004-08-14 01:36:16.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/linux/serial_core.h 2005-02-01 01:38:33.000000000 -0500
@@ -89,6 +89,8 @@
/* MPC52xx type numbers */
#define PORT_MPC52xx 59
@@ -11521,10 +11608,11 @@
#ifdef __KERNEL__
#include <linux/config.h>
-diff -urN kernel-source-2.6.8.orig/include/linux/signal.h kernel-source-2.6.8/include/linux/signal.h
---- kernel-source-2.6.8.orig/include/linux/signal.h 2006-09-04 08:48:07.000000000 -0600
-+++ kernel-source-2.6.8/include/linux/signal.h 2006-09-04 12:31:02.210401750 -0600
-@@ -226,6 +226,9 @@
+Index: debian-kernel-hppa-2.6.8/include/linux/signal.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/include/linux/signal.h 2004-08-14 01:36:17.000000000 -0400
++++ debian-kernel-hppa-2.6.8/include/linux/signal.h 2005-02-01 01:38:33.000000000 -0500
+@@ -220,6 +220,9 @@
extern int get_signal_to_deliver(siginfo_t *info, struct pt_regs *regs, void *cookie);
#endif
@@ -11534,9 +11622,10 @@
#endif /* __KERNEL__ */
#endif /* _LINUX_SIGNAL_H */
-diff -urN kernel-source-2.6.8.orig/ipc/compat_mq.c kernel-source-2.6.8/ipc/compat_mq.c
---- kernel-source-2.6.8.orig/ipc/compat_mq.c 2004-08-13 23:36:46.000000000 -0600
-+++ kernel-source-2.6.8/ipc/compat_mq.c 2006-09-04 12:31:02.230403000 -0600
+Index: debian-kernel-hppa-2.6.8/ipc/compat_mq.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/ipc/compat_mq.c 2004-08-14 01:36:46.000000000 -0400
++++ debian-kernel-hppa-2.6.8/ipc/compat_mq.c 2005-02-01 01:38:33.000000000 -0500
@@ -7,6 +7,7 @@
*/
@@ -11545,9 +11634,10 @@
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/mqueue.h>
-diff -urN kernel-source-2.6.8.orig/kernel/Makefile kernel-source-2.6.8/kernel/Makefile
---- kernel-source-2.6.8.orig/kernel/Makefile 2004-08-13 23:36:32.000000000 -0600
-+++ kernel-source-2.6.8/kernel/Makefile 2006-09-04 12:31:02.230403000 -0600
+Index: debian-kernel-hppa-2.6.8/kernel/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/kernel/Makefile 2004-08-14 01:36:32.000000000 -0400
++++ debian-kernel-hppa-2.6.8/kernel/Makefile 2005-02-01 01:38:33.000000000 -0500
@@ -17,7 +17,7 @@
obj-$(CONFIG_KALLSYMS) += kallsyms.o
obj-$(CONFIG_PM) += power/
@@ -11557,9 +11647,10 @@
obj-$(CONFIG_IKCONFIG) += configs.o
obj-$(CONFIG_IKCONFIG_PROC) += configs.o
obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
-diff -urN kernel-source-2.6.8.orig/kernel/compat_signal.c kernel-source-2.6.8/kernel/compat_signal.c
---- kernel-source-2.6.8.orig/kernel/compat_signal.c 1969-12-31 17:00:00.000000000 -0700
-+++ kernel-source-2.6.8/kernel/compat_signal.c 2006-09-04 12:31:02.230403000 -0600
+Index: debian-kernel-hppa-2.6.8/kernel/compat_signal.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-kernel-hppa-2.6.8/kernel/compat_signal.c 2005-02-01 01:38:33.000000000 -0500
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2003 Carlos O'Donell
@@ -11767,9 +11858,10 @@
+}
+
+#endif
-diff -urN kernel-source-2.6.8.orig/kernel/printk.c kernel-source-2.6.8/kernel/printk.c
---- kernel-source-2.6.8.orig/kernel/printk.c 2004-08-13 23:38:10.000000000 -0600
-+++ kernel-source-2.6.8/kernel/printk.c 2006-09-04 12:31:02.234403250 -0600
+Index: debian-kernel-hppa-2.6.8/kernel/printk.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/kernel/printk.c 2004-08-14 01:38:10.000000000 -0400
++++ debian-kernel-hppa-2.6.8/kernel/printk.c 2005-02-01 01:38:33.000000000 -0500
@@ -91,8 +91,8 @@
* must be masked before subscripting
*/
@@ -11793,9 +11885,10 @@
/*
* Put this console in the list - keep the
* preferred driver at the head of the list.
-diff -urN kernel-source-2.6.8.orig/kernel/ptrace.c kernel-source-2.6.8/kernel/ptrace.c
---- kernel-source-2.6.8.orig/kernel/ptrace.c 2006-09-04 08:48:07.000000000 -0600
-+++ kernel-source-2.6.8/kernel/ptrace.c 2006-09-04 12:31:02.234403250 -0600
+Index: debian-kernel-hppa-2.6.8/kernel/ptrace.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/kernel/ptrace.c 2004-08-14 01:38:10.000000000 -0400
++++ debian-kernel-hppa-2.6.8/kernel/ptrace.c 2005-02-01 01:38:33.000000000 -0500
@@ -290,7 +290,7 @@
{
if (child->last_siginfo == NULL)
@@ -11805,9 +11898,10 @@
return -EFAULT;
return 0;
}
-diff -urN kernel-source-2.6.8.orig/kernel/resource.c kernel-source-2.6.8/kernel/resource.c
---- kernel-source-2.6.8.orig/kernel/resource.c 2004-08-13 23:37:25.000000000 -0600
-+++ kernel-source-2.6.8/kernel/resource.c 2006-09-04 12:31:02.234403250 -0600
+Index: debian-kernel-hppa-2.6.8/kernel/resource.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/kernel/resource.c 2004-08-14 01:37:25.000000000 -0400
++++ debian-kernel-hppa-2.6.8/kernel/resource.c 2005-02-01 01:38:32.000000000 -0500
@@ -179,6 +179,8 @@
{
struct resource *tmp, **p;
@@ -11817,9 +11911,10 @@
p = &old->parent->child;
for (;;) {
tmp = *p;
-diff -urN kernel-source-2.6.8.orig/kernel/signal.c kernel-source-2.6.8/kernel/signal.c
---- kernel-source-2.6.8.orig/kernel/signal.c 2006-09-04 08:48:07.000000000 -0600
-+++ kernel-source-2.6.8/kernel/signal.c 2006-09-04 12:31:02.254404500 -0600
+Index: debian-kernel-hppa-2.6.8/kernel/signal.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/kernel/signal.c 2004-08-14 01:36:56.000000000 -0400
++++ debian-kernel-hppa-2.6.8/kernel/signal.c 2005-02-01 01:38:33.000000000 -0500
@@ -21,6 +21,7 @@
#include <linux/binfmts.h>
#include <linux/security.h>
@@ -11828,7 +11923,7 @@
#include <asm/param.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-@@ -2063,17 +2064,35 @@
+@@ -2024,17 +2025,35 @@
return do_sigpending(set, sigsetsize);
}
@@ -11864,7 +11959,7 @@
/*
* If you change siginfo_t structure, please be sure
* this code is fixed accordingly.
-@@ -2310,7 +2329,7 @@
+@@ -2271,7 +2290,7 @@
{
siginfo_t info;
@@ -11873,9 +11968,10 @@
return -EFAULT;
/* Not even root can pretend to send signals from the kernel.
-diff -urN kernel-source-2.6.8.orig/mm/shmem.c kernel-source-2.6.8/mm/shmem.c
---- kernel-source-2.6.8.orig/mm/shmem.c 2006-09-04 08:48:06.000000000 -0600
-+++ kernel-source-2.6.8/mm/shmem.c 2006-09-04 12:31:02.254404500 -0600
+Index: debian-kernel-hppa-2.6.8/mm/shmem.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/mm/shmem.c 2005-02-01 01:36:44.000000000 -0500
++++ debian-kernel-hppa-2.6.8/mm/shmem.c 2005-02-01 01:38:33.000000000 -0500
@@ -410,7 +410,7 @@
return freed;
}
@@ -11885,9 +11981,10 @@
{
struct shmem_inode_info *info = SHMEM_I(inode);
unsigned long idx;
-diff -urN kernel-source-2.6.8.orig/sound/oss/Kconfig kernel-source-2.6.8/sound/oss/Kconfig
---- kernel-source-2.6.8.orig/sound/oss/Kconfig 2004-08-13 23:37:38.000000000 -0600
-+++ kernel-source-2.6.8/sound/oss/Kconfig 2006-09-04 12:31:02.258404750 -0600
+Index: debian-kernel-hppa-2.6.8/sound/oss/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/sound/oss/Kconfig 2004-08-14 01:37:38.000000000 -0400
++++ debian-kernel-hppa-2.6.8/sound/oss/Kconfig 2005-02-01 01:38:33.000000000 -0500
@@ -162,7 +162,10 @@
config SOUND_HARMONY
@@ -11900,9 +11997,10 @@
config SOUND_SONICVIBES
tristate "S3 SonicVibes"
-diff -urN kernel-source-2.6.8.orig/sound/oss/ad1889.c kernel-source-2.6.8/sound/oss/ad1889.c
---- kernel-source-2.6.8.orig/sound/oss/ad1889.c 2004-08-13 23:36:45.000000000 -0600
-+++ kernel-source-2.6.8/sound/oss/ad1889.c 2006-09-04 12:31:02.258404750 -0600
+Index: debian-kernel-hppa-2.6.8/sound/oss/ad1889.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/sound/oss/ad1889.c 2004-08-14 01:36:45.000000000 -0400
++++ debian-kernel-hppa-2.6.8/sound/oss/ad1889.c 2005-02-01 01:38:33.000000000 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright 2001 Randolph Chung <tausq at debian.org>
@@ -12099,9 +12197,10 @@
}
static int __devinit ad1889_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
-diff -urN kernel-source-2.6.8.orig/sound/oss/ad1889.h kernel-source-2.6.8/sound/oss/ad1889.h
---- kernel-source-2.6.8.orig/sound/oss/ad1889.h 2004-08-13 23:37:25.000000000 -0600
-+++ kernel-source-2.6.8/sound/oss/ad1889.h 2006-09-04 12:31:02.258404750 -0600
+Index: debian-kernel-hppa-2.6.8/sound/oss/ad1889.h
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/sound/oss/ad1889.h 2004-08-14 01:37:25.000000000 -0400
++++ debian-kernel-hppa-2.6.8/sound/oss/ad1889.h 2005-02-01 01:38:33.000000000 -0500
@@ -34,9 +34,9 @@
#define AD_DMAWAVICC 0x98 /* WAV interrupt current count */
#define AD_DMAWAVIBC 0x9c /* WAV interrupt base count */
@@ -12115,9 +12214,10 @@
#define AD_DMADISR 0xc0 /* PCI DMA intr status */
#define AD_DMACHSS 0xc4 /* PCI DMA channel stop status */
-diff -urN kernel-source-2.6.8.orig/sound/oss/harmony.c kernel-source-2.6.8/sound/oss/harmony.c
---- kernel-source-2.6.8.orig/sound/oss/harmony.c 2004-08-13 23:37:38.000000000 -0600
-+++ kernel-source-2.6.8/sound/oss/harmony.c 2006-09-04 12:31:02.258404750 -0600
+Index: debian-kernel-hppa-2.6.8/sound/oss/harmony.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/sound/oss/harmony.c 2004-08-14 01:37:38.000000000 -0400
++++ debian-kernel-hppa-2.6.8/sound/oss/harmony.c 2005-02-01 01:38:33.000000000 -0500
@@ -12,6 +12,7 @@
Copyright 2000-2003 (c) Helge Deller <deller at gmx.de>
Copyright 2001 (c) Matthieu Delahaye <delahaym at esiee.fr>
@@ -12422,9 +12522,10 @@
/* Grab the ID and revision from the device */
id = gsc_readb(&harmony.hpa->id);
if ((id | 1) != 0x15) {
-diff -urN kernel-source-2.6.8.orig/sound/parisc/harmony.c kernel-source-2.6.8/sound/parisc/harmony.c
---- kernel-source-2.6.8.orig/sound/parisc/harmony.c 2004-08-13 23:36:56.000000000 -0600
-+++ kernel-source-2.6.8/sound/parisc/harmony.c 2006-09-04 12:31:02.278406000 -0600
+Index: debian-kernel-hppa-2.6.8/sound/parisc/harmony.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/sound/parisc/harmony.c 2004-08-14 01:36:56.000000000 -0400
++++ debian-kernel-hppa-2.6.8/sound/parisc/harmony.c 2005-02-01 01:38:33.000000000 -0500
@@ -6,7 +6,7 @@
*
* Harmony is found in HP 712s, 715/new and many other GSC based machines.
More information about the Kernel-svn-changes
mailing list