r2805 - in trunk/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8: . debian
Kyle McMartin
kyle@costa.debian.org
Thu, 24 Mar 2005 06:35:16 +0000
Author: kyle
Date: 2005-03-24 06:35:14 +0000 (Thu, 24 Mar 2005)
New Revision: 2805
Modified:
trunk/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/debian/changelog
trunk/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/hppa_2.6.8.diff
Log:
* Backport some important patches from Grant Grundler:
- sba_iommu: low memory fixes - Remove MEM to IOV ratio, make it 1:1.
Message-Id: <20050227070123.5061C495DD2@palinux.hppa>
- ccio-dma: low memory fixes - Remove MEM to IOV ratio, make it 1:1.
Message-Id: <20050306234840.5340A4957B3@palinux.hppa>
- sba_iommu: Explicitly set D4 and DD bits in IOC_CTRL, as some
firmware sets this register differently.
Message-Id: <20050221002144.7898F4958B3@palinux.hppa>
Modified: trunk/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/debian/changelog 2005-03-23 13:07:24 UTC (rev 2804)
+++ trunk/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/debian/changelog 2005-03-24 06:35:14 UTC (rev 2805)
@@ -1,3 +1,16 @@
+kernel-patch-2.6.8-hppa (2.6.8-6) UNRELEASED; urgency=low
+
+ * Backport patches from Grant Grundler:
+ - sba_iommu: low memory fixes - Remove MEM to IOV ratio, make it 1:1.
+ Message-Id: <20050227070123.5061C495DD2@palinux.hppa>
+ - ccio-dma: low memory fixes - Remove MEM to IOV ratio, make it 1:1.
+ Message-Id: <20050306234840.5340A4957B3@palinux.hppa>
+ - sba_iommu: Explicitly set D4 and DD bits in IOC_CTRL, as some
+ firmware sets this register differently.
+ Message-Id: <20050221002144.7898F4958B3@palinux.hppa>
+
+ -- Kyle McMartin <kyle@debian.org> Thu, 24 Mar 2005 01:27:46 -0500
+
kernel-patch-2.6.8-hppa (2.6.8-5) unstable; urgency=low
* Fix a reject in drivers/serial/8250.c.
Modified: trunk/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/hppa_2.6.8.diff
===================================================================
--- trunk/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/hppa_2.6.8.diff 2005-03-23 13:07:24 UTC (rev 2804)
+++ trunk/kernel/hppa/kernel-patch-2.6.8-hppa-2.6.8/hppa_2.6.8.diff 2005-03-24 06:35:14 UTC (rev 2805)
@@ -1,128 +1,7 @@
-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
- - Documentation IODC
-+ = Removed.
-+
- debugging
- - some debugging hints for real-mode code
- mm
- - Documentation on parisc mm status
-+ = Removed.
-+
- registers
- - current/planned usage of registers
-+
-+todo
-+ - The things we need to work on...
-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 :
-+-------------------
-+ - Merged to 2.6.8.1, boots on 712, 715, C3000, and A500
-+ (AFAIK, probably every machine we used to support boots on this kernel.)
-+ - Changes to the 2.4 branch are pretty much non-existant,
-+ Matthew does a good job of merging from upstream though.
-+ - SMP compiles, and seems to work on certain boxes.
-+ - No preemptible support
-+
-+Todo:
-+-----
-+
-+ - 2004-08-16 (Carlos)
-+ Review the gettimeofday implementation, possibly use a
-+ light-weight-syscall and rely on cr16 and cpu speed for
-+ more accurate timing?
-+ - CPU hotplug: we cannot bring up cpus after init, and we don't know if we can
-+ shutdown cpus
-+ - task_struct/thread_info split -- task_struct should not be visible in
-+ entry.S, we need to move some items into thread_info -- this includes
-+ pt_regs and maybe some of the flags (ptrace, etc)
-+ - flush_tlb_kernel_range is horribly inefficient. this has been merged
-+ with the userspace tlb flush, but it has a magic constant that needs
-+ tuning
-+ - syscall signal return path needs work, we don't loop on signal
-+ delivery like other archs
-+ - parisc is the only arch that defines __kernel_clock_t as int instead
-+ of long, find out if we can use long (check compat_signals.c)
-+
-+ - REVIEW ALL THE TODO ENTRIES BELOW!
-+
-+ - the fix for do_fork needs checking
-+ - our PDC early debug console hacks need to be cleaned up somehow
-+ - ad1889 driver: only works with .wav; Convert to ALSA (ggg, tausq, tbone)
-+ - ns87415 dma doesn't work reliably on suckyio-systems
-+ - (ab)use kmap/kunmap on 64-bit to eliminate flush_dcache calls.
-+ - cp_new_stat32 for sys_parisc32.c is inefficient; maybe it's better
-+ to fill in a tmp stat32 and just do copy_to_user in one go at the end?
-+ - investigate not putting in extable entries for put_kernel_asm; will
-+ probably reduce kernel size
-+ - fix HIL problem: ksoftirqd/0 eats 56% cpu (kernel 2.4 & kernel 2.5)
-+ - write floppy driver for lasi
-+ - write floppy driver for suckyio
-+ - spifi driver (rbrad)
-+ - write optimized versions of lcopy_{to,from}_user. Can we port the
-+ hpux versions?
-+ - NPTL kernel support (CLONE_*TID flags need to be correctly handled by
-+ sys_clone() and friends)
-+ - fix ALSA harmony driver to reflect changes in ALSA architecture.
-+
-+
-+ Started and in progress:
-+ ------------------------
-+ - 2004-08-16 (Carlos)
-+ 64-bit binutils needs to be fixed to get multiple stub
-+ section support.
-+
-+ - 2004-08-16 (Carlos)
-+ Working on light-weight-syscall to implement atomic
-+ compare and swap primitive.
-+
-+ - IRQ code (use arch-indep scheme & cpu-affinity support) (jejb, ggg, t-bone)
-+
-+ - REVIEW THE ENTRIES BELOW!
-+
-+ - Some options still need Kconfig help entries (see below!)
-+ - Look at Config.help too. (tbone, HIL -> helge?)
-+ - port hil_kbd.c to new input layer
-+ - port hil_ptr.c to new input layer
-+
-+ - 64-bit userspace (Leandro)
-+
-+
-+ CONFIG options without help:
-+ -----------------------------
-+ - REVIEW THESE ENTRIES!
-+
-+ _USB_OHCI_HCD (add parisc info?)
-+ _HP_SDC_RTC
-+ _HIL_MLC
-+ _HIL_KBD (to improve)
-+ _HIL_PTR (to improve)
-+
-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
-
- head-y := arch/parisc/kernel/head.o
--head-$(CONFIG_PARISC64) := arch/parisc/kernel/head64.o
-
- CFLAGS += $(cflags-y)
-
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/configs/a500_defconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/configs/a500_defconfig 2005-03-24 01:16:08.000000000 -0500
@@ -11,7 +11,6 @@
#
CONFIG_EXPERIMENTAL=y
@@ -318,22 +197,10 @@
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=m
-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 @@
- #
-
- head-y := head.o
--head-$(CONFIG_PARISC64) := head64.o
- extra-y := init_task.o $(head-y) vmlinux.lds.s
-
- AFLAGS_entry.o := -traditional
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/cache.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/cache.c 2005-03-24 01:16:08.000000000 -0500
@@ -33,6 +33,17 @@
int icache_stride;
EXPORT_SYMBOL(dcache_stride);
@@ -368,8 +235,8 @@
+}
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/entry.S 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/entry.S 2005-03-24 01:16:08.000000000 -0500
@@ -440,8 +440,17 @@
mfctl %cr25,\reg
.endm
@@ -679,8 +546,8 @@
LDREG TI_TASK-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r1
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/firmware.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/firmware.c 2005-03-24 01:16:08.000000000 -0500
@@ -1276,7 +1276,7 @@
long real64_call(unsigned long fn, ...)
{
@@ -692,8 +559,8 @@
unsigned long);
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/head.S 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/head.S 2005-03-24 01:16:08.000000000 -0500
@@ -1,12 +1,13 @@
-/*
- *
@@ -1105,10 +972,22 @@
$global$:
.word 0
+#endif /*!LP64*/
+Index: debian-kernel-hppa-2.6.8/arch/parisc/kernel/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/Makefile 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/Makefile 2005-03-24 01:16:08.000000000 -0500
+@@ -3,7 +3,6 @@
+ #
+
+ head-y := head.o
+-head-$(CONFIG_PARISC64) := head64.o
+ extra-y := init_task.o $(head-y) vmlinux.lds.s
+
+ AFLAGS_entry.o := -traditional
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/pacache.S 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/pacache.S 2005-03-24 01:16:08.000000000 -0500
@@ -68,7 +68,7 @@
* consolidated.
*/
@@ -1132,8 +1011,8 @@
.entry
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/pci-dma.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/pci-dma.c 2005-03-24 01:16:08.000000000 -0500
@@ -104,7 +104,9 @@
if (!pte_none(*pte))
printk(KERN_ERR "map_pte_uncached: page already exists\n");
@@ -1156,8 +1035,8 @@
pte++;
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/pdc_cons.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/pdc_cons.c 2005-03-24 01:16:08.000000000 -0500
@@ -71,6 +71,19 @@
pdc_iodc_outc(c);
}
@@ -1180,8 +1059,8 @@
{
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/perf_asm.S 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/perf_asm.S 2005-03-24 01:16:08.000000000 -0500
@@ -1,18 +1,19 @@
/* low-level asm for "intrigue" (PA8500-8700 CPU perf counters)
@@ -2770,8 +2649,8 @@
perf_rdr_shift_out_U_leave:
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/perf_images.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/perf_images.h 2005-03-24 01:16:08.000000000 -0500
@@ -2,6 +2,7 @@
* Imagine for use with the Onyx (PCX-U) CPU interface
*
@@ -2782,8 +2661,8 @@
* it under the terms of the GNU General Public License as published by
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/real2.S 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/real2.S 2005-03-24 01:16:08.000000000 -0500
@@ -149,7 +149,7 @@
rfi_virt2real:
/* switch to real mode... */
@@ -2804,8 +2683,8 @@
nop
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/smp.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/smp.c 2005-03-24 01:16:08.000000000 -0500
@@ -333,6 +333,7 @@
struct smp_call_struct data;
unsigned long timeout;
@@ -2844,8 +2723,8 @@
barrier ();
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/syscall.S 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/syscall.S 2005-03-24 01:16:08.000000000 -0500
@@ -16,6 +16,14 @@
#include <asm/assembly.h>
#include <asm/processor.h>
@@ -3276,8 +3155,8 @@
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/syscall_table.S 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/syscall_table.S 2005-03-24 01:16:08.000000000 -0500
@@ -334,12 +334,12 @@
ENTRY_SAME(epoll_ctl) /* 225 */
ENTRY_SAME(epoll_wait)
@@ -3301,8 +3180,8 @@
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/traps.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/traps.c 2005-03-24 01:16:08.000000000 -0500
@@ -135,32 +135,19 @@
EXPORT_SYMBOL(dump_stack);
@@ -3500,8 +3379,8 @@
printk(KERN_DEBUG "User Fault on Kernel Space ");
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/unaligned.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/unaligned.c 2005-03-24 01:16:08.000000000 -0500
@@ -559,7 +559,7 @@
if (regs->isr != regs->sr[7])
@@ -3513,8 +3392,8 @@
/* don't kill him though, since he has appropriate access to the page, or we
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/kernel/unwind.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/kernel/unwind.c 2005-03-24 01:16:08.000000000 -0500
@@ -12,8 +12,10 @@
#include <linux/kernel.h>
#include <linux/init.h>
@@ -3738,8 +3617,8 @@
}
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/lib/bitops.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/lib/bitops.c 2005-03-24 01:16:08.000000000 -0500
@@ -13,8 +13,8 @@
#include <asm/atomic.h>
@@ -3817,8 +3696,8 @@
}
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/lib/debuglocks.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/lib/debuglocks.c 2005-03-24 01:16:08.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
@@ -3949,10 +3828,22 @@
"%s:%d: read_lock grabbed in %s at %p(%d) %ld ticks\n",
bfile, bline, current->comm, inline_pc,
cpu, jiffies - started);
+Index: debian-kernel-hppa-2.6.8/arch/parisc/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/Makefile 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/Makefile 2005-03-24 01:16:08.000000000 -0500
+@@ -52,7 +52,6 @@
+ cflags-$(CONFIG_PA8X00) += -march=2.0 -mschedule=8000
+
+ head-y := arch/parisc/kernel/head.o
+-head-$(CONFIG_PARISC64) := arch/parisc/kernel/head64.o
+
+ CFLAGS += $(cflags-y)
+
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
+--- debian-kernel-hppa-2.6.8.orig/arch/parisc/mm/init.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/arch/parisc/mm/init.c 2005-03-24 01:16:08.000000000 -0500
@@ -750,7 +750,7 @@
#if PTRS_PER_PMD == 1
pmd = (pmd_t *)__pa(pg_dir);
@@ -3985,10 +3876,119 @@
/* now change pg_table to kernel virtual addresses */
+Index: debian-kernel-hppa-2.6.8/Documentation/parisc/00-INDEX
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/Documentation/parisc/00-INDEX 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/Documentation/parisc/00-INDEX 2005-03-24 01:16:08.000000000 -0500
+@@ -2,9 +2,16 @@
+ - this file.
+ IODC.txt
+ - Documentation IODC
++ = Removed.
++
+ debugging
+ - some debugging hints for real-mode code
+ mm
+ - Documentation on parisc mm status
++ = Removed.
++
+ registers
+ - current/planned usage of registers
++
++todo
++ - The things we need to work on...
+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-03-24 01:16:08.000000000 -0500
+@@ -0,0 +1,83 @@
++Status 2004-08-16 :
++-------------------
++ - Merged to 2.6.8.1, boots on 712, 715, C3000, and A500
++ (AFAIK, probably every machine we used to support boots on this kernel.)
++ - Changes to the 2.4 branch are pretty much non-existant,
++ Matthew does a good job of merging from upstream though.
++ - SMP compiles, and seems to work on certain boxes.
++ - No preemptible support
++
++Todo:
++-----
++
++ - 2004-08-16 (Carlos)
++ Review the gettimeofday implementation, possibly use a
++ light-weight-syscall and rely on cr16 and cpu speed for
++ more accurate timing?
++ - CPU hotplug: we cannot bring up cpus after init, and we don't know if we can
++ shutdown cpus
++ - task_struct/thread_info split -- task_struct should not be visible in
++ entry.S, we need to move some items into thread_info -- this includes
++ pt_regs and maybe some of the flags (ptrace, etc)
++ - flush_tlb_kernel_range is horribly inefficient. this has been merged
++ with the userspace tlb flush, but it has a magic constant that needs
++ tuning
++ - syscall signal return path needs work, we don't loop on signal
++ delivery like other archs
++ - parisc is the only arch that defines __kernel_clock_t as int instead
++ of long, find out if we can use long (check compat_signals.c)
++
++ - REVIEW ALL THE TODO ENTRIES BELOW!
++
++ - the fix for do_fork needs checking
++ - our PDC early debug console hacks need to be cleaned up somehow
++ - ad1889 driver: only works with .wav; Convert to ALSA (ggg, tausq, tbone)
++ - ns87415 dma doesn't work reliably on suckyio-systems
++ - (ab)use kmap/kunmap on 64-bit to eliminate flush_dcache calls.
++ - cp_new_stat32 for sys_parisc32.c is inefficient; maybe it's better
++ to fill in a tmp stat32 and just do copy_to_user in one go at the end?
++ - investigate not putting in extable entries for put_kernel_asm; will
++ probably reduce kernel size
++ - fix HIL problem: ksoftirqd/0 eats 56% cpu (kernel 2.4 & kernel 2.5)
++ - write floppy driver for lasi
++ - write floppy driver for suckyio
++ - spifi driver (rbrad)
++ - write optimized versions of lcopy_{to,from}_user. Can we port the
++ hpux versions?
++ - NPTL kernel support (CLONE_*TID flags need to be correctly handled by
++ sys_clone() and friends)
++ - fix ALSA harmony driver to reflect changes in ALSA architecture.
++
++
++ Started and in progress:
++ ------------------------
++ - 2004-08-16 (Carlos)
++ 64-bit binutils needs to be fixed to get multiple stub
++ section support.
++
++ - 2004-08-16 (Carlos)
++ Working on light-weight-syscall to implement atomic
++ compare and swap primitive.
++
++ - IRQ code (use arch-indep scheme & cpu-affinity support) (jejb, ggg, t-bone)
++
++ - REVIEW THE ENTRIES BELOW!
++
++ - Some options still need Kconfig help entries (see below!)
++ - Look at Config.help too. (tbone, HIL -> helge?)
++ - port hil_kbd.c to new input layer
++ - port hil_ptr.c to new input layer
++
++ - 64-bit userspace (Leandro)
++
++
++ CONFIG options without help:
++ -----------------------------
++ - REVIEW THESE ENTRIES!
++
++ _USB_OHCI_HCD (add parisc info?)
++ _HP_SDC_RTC
++ _HIL_MLC
++ _HIL_KBD (to improve)
++ _HIL_PTR (to improve)
++
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/char/Kconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/char/Kconfig 2005-03-24 01:16:08.000000000 -0500
@@ -689,7 +689,7 @@
config HW_RANDOM
@@ -4000,8 +4000,8 @@
Generator hardware found on Intel i8xx-based motherboards,
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/ide/pci/ns87415.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/ide/pci/ns87415.c 2005-03-24 01:16:08.000000000 -0500
@@ -24,6 +24,9 @@
#include <linux/init.h>
@@ -4012,67 +4012,10 @@
static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 };
-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
- module will be called amikbd.
-+
-+config KEYBOARD_HIL_OLD
-+ tristate "HP HIL keyboard support (simple driver)"
-+ depends on PARISC && INPUT && INPUT_KEYBOARD && !HIL_MLC
-+ default y
-+ help
-+ The "Human Interface Loop" is a older, 8-channel USB-like
-+ controller used in several Hewlett Packard models. This driver
-+ was adapted from the one written for m68k/hp300, and implements
-+ support for a keyboard attached to the HIL port, but not for
-+ any other types of HIL input devices like mice or tablets.
-+ However, it has been thoroughly tested and is stable.
-+
-+ If you want full HIL support including support for multiple
-+ keyboards, mices and tablets, you have to enable the
-+ "HP System Device Controller i8042 Support" in the input/serio
-+ submenu.
-+
-+config KEYBOARD_HIL
-+ tristate "HP HIL keyboard support"
-+ depends on PARISC && INPUT && INPUT_KEYBOARD
-+ default y
-+ select HP_SDC
-+ select HIL_MLC
-+ help
-+ The "Human Interface Loop" is a older, 8-channel USB-like
-+ controller used in several Hewlett Packard models.
-+ This driver implements support for HIL-keyboards attached
-+ to your machine, so normally you should say Y here.
-+
-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.
- #
-
--# Each configuration option enables a list of files.
--
- obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o
- obj-$(CONFIG_KEYBOARD_MAPLE) += maple_keyb.o
- obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o
-@@ -12,3 +10,5 @@
- obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o
- obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o
- obj-$(CONFIG_KEYBOARD_98KBD) += 98kbd.o
-+obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
-+obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/keyboard/atkbd.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/atkbd.c 2005-03-24 01:16:08.000000000 -0500
@@ -64,12 +64,13 @@
* are loadable via an userland utility.
*/
@@ -4140,7 +4083,7 @@
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
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/hil_kbd.c 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,372 @@
+/*
+ * Generic linux-input device driver for keyboard devices
@@ -4517,7 +4460,7 @@
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
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/hilkbd.c 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,345 @@
+/*
+ * linux/drivers/hil/hilkbd.c
@@ -4866,8 +4809,8 @@
+
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/keyboard/hpps2atkbd.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/hpps2atkbd.h 2005-03-24 01:16:08.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,
@@ -4881,35 +4824,67 @@
/* 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,
-Index: debian-kernel-hppa-2.6.8/drivers/input/misc/Kconfig
+Index: debian-kernel-hppa-2.6.8/drivers/input/keyboard/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 @@
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/keyboard/Kconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/Kconfig 2005-03-24 01:16:08.000000000 -0500
+@@ -96,3 +96,33 @@
+
To compile this driver as a module, choose M here: the
- module will be called uinput.
-
-+config HP_SDC_RTC
-+ tristate "HP SDC Real Time Clock"
-+ depends on INPUT && INPUT_MISC && GSC
+ module will be called amikbd.
++
++config KEYBOARD_HIL_OLD
++ tristate "HP HIL keyboard support (simple driver)"
++ depends on PARISC && INPUT && INPUT_KEYBOARD && !HIL_MLC
++ default y
++ help
++ The "Human Interface Loop" is a older, 8-channel USB-like
++ controller used in several Hewlett Packard models. This driver
++ was adapted from the one written for m68k/hp300, and implements
++ support for a keyboard attached to the HIL port, but not for
++ any other types of HIL input devices like mice or tablets.
++ However, it has been thoroughly tested and is stable.
++
++ If you want full HIL support including support for multiple
++ keyboards, mices and tablets, you have to enable the
++ "HP System Device Controller i8042 Support" in the input/serio
++ submenu.
++
++config KEYBOARD_HIL
++ tristate "HP HIL keyboard support"
++ depends on PARISC && INPUT && INPUT_KEYBOARD
++ default y
+ select HP_SDC
++ select HIL_MLC
+ help
-+ Say Y here if you want to support the built-in real time clock
-+ of the HP SDC controller.
++ The "Human Interface Loop" is a older, 8-channel USB-like
++ controller used in several Hewlett Packard models.
++ This driver implements support for HIL-keyboards attached
++ to your machine, so normally you should say Y here.
+
-Index: debian-kernel-hppa-2.6.8/drivers/input/misc/Makefile
+Index: debian-kernel-hppa-2.6.8/drivers/input/keyboard/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
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/keyboard/Makefile 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/keyboard/Makefile 2005-03-24 01:16:08.000000000 -0500
+@@ -2,8 +2,6 @@
+ # Makefile for the input core drivers.
+ #
+
+-# Each configuration option enables a list of files.
+-
+ obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o
+ obj-$(CONFIG_KEYBOARD_MAPLE) += maple_keyb.o
+ obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o
+@@ -12,3 +10,5 @@
+ obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o
+ obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o
+ obj-$(CONFIG_KEYBOARD_98KBD) += 98kbd.o
++obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
++obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
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
++++ debian-kernel-hppa-2.6.8/drivers/input/misc/hp_sdc_rtc.c 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,726 @@
+/*
+ * HP i8042 SDC + MSM-58321 BBRTC driver.
@@ -5637,38 +5612,35 @@
+
+module_init(hp_sdc_rtc_init);
+module_exit(hp_sdc_rtc_exit);
-Index: debian-kernel-hppa-2.6.8/drivers/input/mouse/Kconfig
+Index: debian-kernel-hppa-2.6.8/drivers/input/misc/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
- with that (I don't have the hardware yet).
-+
-+config MOUSE_HIL
-+ tristate "HIL pointers (mice etc)."
-+ depends on PARISC && INPUT_MOUSE
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/misc/Kconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/misc/Kconfig 2005-03-24 01:16:08.000000000 -0500
+@@ -50,3 +50,11 @@
+ To compile this driver as a module, choose M here: the
+ module will be called uinput.
+
++config HP_SDC_RTC
++ tristate "HP SDC Real Time Clock"
++ depends on INPUT && INPUT_MISC && GSC
+ select HP_SDC
-+ select HIL_MLC
+ help
-+ Say Y here to support HIL pointers.
-Index: debian-kernel-hppa-2.6.8/drivers/input/mouse/Makefile
++ Say Y here if you want to support the built-in real time clock
++ of the HP SDC controller.
++
+Index: debian-kernel-hppa-2.6.8/drivers/input/misc/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
- obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o
-+obj-$(CONFIG_MOUSE_HIL) += hil_ptr.o
- obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o
-
- psmouse-objs := psmouse-base.o logips2pp.o synaptics.o
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/misc/Makefile 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/misc/Makefile 2005-03-24 01:16:08.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
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
++++ debian-kernel-hppa-2.6.8/drivers/input/mouse/hil_ptr.c 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,409 @@
+/*
+ * Generic linux-input device driver for axis-bearing devices
@@ -6079,68 +6051,38 @@
+
+module_init(hil_ptr_init);
+module_exit(hil_ptr_exit);
-Index: debian-kernel-hppa-2.6.8/drivers/input/serio/Kconfig
+Index: debian-kernel-hppa-2.6.8/drivers/input/mouse/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.
-
-+config HP_SDC
-+ tristate "HP System Device Controller i8042 Support"
-+ depends on GSC && SERIO
-+ default y
-+ ---help---
-+ This option enables supports for the the "System Device
-+ Controller", an i8042 carrying microcode to manage a
-+ few miscellanous devices on some Hewlett Packard systems.
-+ The SDC itself contains a 10ms resolution timer/clock capable
-+ of delivering interrupts on a periodic and one-shot basis.
-+ The SDC may also be connected to a battery-backed real-time
-+ clock, a basic audio waveform generator, and an HP-HIL Master
-+ Link Controller serving up to seven input devices.
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/mouse/Kconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/mouse/Kconfig 2005-03-24 01:16:08.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
+ with that (I don't have the hardware yet).
+
-+ By itself this option is rather useless, but enabling it will
-+ enable selection of drivers for the abovementioned devices.
-+ It is, however, incompatible with the old, reliable HIL keyboard
-+ driver, and the new HIL driver is experimental, so if you plan
-+ to use a HIL keyboard as your primary keyboard, you may wish
-+ to keep using that driver until the new HIL drivers have had
-+ more testing.
-+
-+config HIL_MLC
-+ tristate "HIL MLC Support (needed for HIL input devices)"
-+ depends on HP_SDC
-+
- config SERIO_PCIPS2
- tristate "PCI PS/2 keyboard and PS/2 mouse controller"
- depends on PCI && SERIO
-Index: debian-kernel-hppa-2.6.8/drivers/input/serio/Makefile
++config MOUSE_HIL
++ tristate "HIL pointers (mice etc)."
++ depends on PARISC && INPUT_MOUSE
++ select HP_SDC
++ select HIL_MLC
++ help
++ Say Y here to support HIL pointers.
+Index: debian-kernel-hppa-2.6.8/drivers/input/mouse/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.
- #
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/mouse/Makefile 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/mouse/Makefile 2005-03-24 01:16:08.000000000 -0500
+@@ -12,6 +12,7 @@
+ obj-$(CONFIG_MOUSE_PC110PAD) += pc110pad.o
+ obj-$(CONFIG_MOUSE_PS2) += psmouse.o
+ obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o
++obj-$(CONFIG_MOUSE_HIL) += hil_ptr.o
+ obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o
--# Each configuration option enables a list of files.
--
- obj-$(CONFIG_SERIO) += serio.o
- obj-$(CONFIG_SERIO_I8042) += i8042.o
- obj-$(CONFIG_SERIO_PARKBD) += parkbd.o
-@@ -15,5 +13,7 @@
- obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o
- obj-$(CONFIG_SERIO_98KBD) += 98kbd-io.o
- obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o
-+obj-$(CONFIG_HP_SDC) += hp_sdc.o
-+obj-$(CONFIG_HIL_MLC) += hp_sdc_mlc.o hil_mlc.o
- obj-$(CONFIG_SERIO_PCIPS2) += pcips2.o
- obj-$(CONFIG_SERIO_MACEPS2) += maceps2.o
+ psmouse-objs := psmouse-base.o logips2pp.o synaptics.o
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/serio/gscps2.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/gscps2.c 2005-03-24 01:16:08.000000000 -0500
@@ -38,7 +38,7 @@
#include <asm/parisc-device.h>
@@ -6171,7 +6113,7 @@
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
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/hil_mlc.c 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,951 @@
+/*
+ * HIL MLC state machine and serio interface driver
@@ -7127,7 +7069,7 @@
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
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/hp_sdc.c 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,1067 @@
+/*
+ * HP i8042-based System Device Controller driver.
@@ -8199,7 +8141,7 @@
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
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/hp_sdc_mlc.c 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,370 @@
+/*
+ * Access to HP-HIL MLC through HP System Device Controller.
@@ -8571,10 +8513,68 @@
+
+module_init(hp_sdc_mlc_init);
+module_exit(hp_sdc_mlc_exit);
+Index: debian-kernel-hppa-2.6.8/drivers/input/serio/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/serio/Kconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/Kconfig 2005-03-24 01:16:08.000000000 -0500
+@@ -111,6 +111,32 @@
+ To compile this driver as a module, choose M here: the
+ module will be called gscps2.
+
++config HP_SDC
++ tristate "HP System Device Controller i8042 Support"
++ depends on GSC && SERIO
++ default y
++ ---help---
++ This option enables supports for the the "System Device
++ Controller", an i8042 carrying microcode to manage a
++ few miscellanous devices on some Hewlett Packard systems.
++ The SDC itself contains a 10ms resolution timer/clock capable
++ of delivering interrupts on a periodic and one-shot basis.
++ The SDC may also be connected to a battery-backed real-time
++ clock, a basic audio waveform generator, and an HP-HIL Master
++ Link Controller serving up to seven input devices.
++
++ By itself this option is rather useless, but enabling it will
++ enable selection of drivers for the abovementioned devices.
++ It is, however, incompatible with the old, reliable HIL keyboard
++ driver, and the new HIL driver is experimental, so if you plan
++ to use a HIL keyboard as your primary keyboard, you may wish
++ to keep using that driver until the new HIL drivers have had
++ more testing.
++
++config HIL_MLC
++ tristate "HIL MLC Support (needed for HIL input devices)"
++ depends on HP_SDC
++
+ config SERIO_PCIPS2
+ tristate "PCI PS/2 keyboard and PS/2 mouse controller"
+ depends on PCI && SERIO
+Index: debian-kernel-hppa-2.6.8/drivers/input/serio/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/input/serio/Makefile 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/input/serio/Makefile 2005-03-24 01:16:08.000000000 -0500
+@@ -2,8 +2,6 @@
+ # Makefile for the input core drivers.
+ #
+
+-# Each configuration option enables a list of files.
+-
+ obj-$(CONFIG_SERIO) += serio.o
+ obj-$(CONFIG_SERIO_I8042) += i8042.o
+ obj-$(CONFIG_SERIO_PARKBD) += parkbd.o
+@@ -15,5 +13,7 @@
+ obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o
+ obj-$(CONFIG_SERIO_98KBD) += 98kbd-io.o
+ obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o
++obj-$(CONFIG_HP_SDC) += hp_sdc.o
++obj-$(CONFIG_HIL_MLC) += hp_sdc_mlc.o hil_mlc.o
+ obj-$(CONFIG_SERIO_PCIPS2) += pcips2.o
+ obj-$(CONFIG_SERIO_MACEPS2) += maceps2.o
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/net/tulip/media.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/net/tulip/media.c 2005-03-24 01:16:08.000000000 -0500
@@ -43,8 +43,10 @@
/* MII transceiver control section.
@@ -8618,10 +8618,141 @@
tmp_info = get_u16(&misc_info[1]);
if (tmp_info)
tp->advertising[phy_num] = tmp_info | 1;
+Index: debian-kernel-hppa-2.6.8/drivers/parisc/ccio-dma.c
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/drivers/parisc/ccio-dma.c 2005-03-24 01:16:00.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/parisc/ccio-dma.c 2005-03-24 01:16:08.000000000 -0500
+@@ -262,8 +262,6 @@
+ struct resource mmio_region[2]; /* The "routed" MMIO regions */
+ };
+
+-/* Ratio of Host MEM to IOV Space size */
+-static unsigned long ccio_mem_ratio = 4;
+ static struct ioc *ioc_list;
+ static int ioc_count;
+
+@@ -559,7 +557,7 @@
+ ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
+ unsigned long hints)
+ {
+- register unsigned long pa = (volatile unsigned long) vba;
++ register unsigned long pa;
+ register unsigned long ci; /* coherent index */
+
+ /* We currently only support kernel addresses */
+@@ -1242,6 +1240,21 @@
+ #define CCIO_CHAINID_MASK 0xff
+ #endif /* 0 */
+
++/* We *can't* support JAVA (T600). Venture there at your own risk. */
++static struct parisc_device_id ccio_tbl[] = {
++ { HPHW_IOA, HVERSION_REV_ANY_ID, U2_IOA_RUNWAY, 0xb }, /* U2 */
++ { HPHW_IOA, HVERSION_REV_ANY_ID, UTURN_IOA_RUNWAY, 0xb }, /* UTurn */
++ { 0, }
++};
++
++static int ccio_probe(struct parisc_device *dev);
++
++static struct parisc_driver ccio_driver = {
++ .name = "U2:Uturn",
++ .id_table = ccio_tbl,
++ .probe = ccio_probe,
++};
++
+ /**
+ * ccio_ioc_init - Initalize the I/O Controller
+ * @ioc: The I/O Controller.
+@@ -1253,9 +1266,9 @@
+ static void
+ ccio_ioc_init(struct ioc *ioc)
+ {
+- int i, iov_order;
++ int i;
++ unsigned int iov_order;
+ u32 iova_space_size;
+- unsigned long physmem;
+
+ /*
+ ** Determine IOVA Space size from memory size.
+@@ -1268,17 +1281,16 @@
+ ** Hot-Plug/Removal of PCI cards. (aka PCI OLARD).
+ */
+
++ iova_space_size = (u32) (num_physpages / count_parisc_driver(&ccio_driver));
++
+ /* limit IOVA space size to 1MB-1GB */
+
+- physmem = num_physpages << PAGE_SHIFT;
+- if(physmem < (ccio_mem_ratio * 1024 * 1024)) {
+- iova_space_size = 1024 * 1024;
++ if (iova_space_size < (1 << (20 - PAGE_SHIFT))) {
++ iova_space_size = 1 << (20 - PAGE_SHIFT);
+ #ifdef __LP64__
+- } else if(physmem > (ccio_mem_ratio * 512 * 1024 * 1024)) {
+- iova_space_size = 512 * 1024 * 1024;
++ } else if (iova_space_size > (1 << (30 - PAGE_SHIFT))) {
++ iova_space_size = 1 << (30 - PAGE_SHIFT);
+ #endif
+- } else {
+- iova_space_size = (u32)(physmem / ccio_mem_ratio);
+ }
+
+ /*
+@@ -1294,10 +1306,10 @@
+ ** this is the case under linux."
+ */
+
+- iov_order = get_order(iova_space_size) >> (IOVP_SHIFT - PAGE_SHIFT);
+- BUG_ON(iov_order > (30 - IOVP_SHIFT)); /* iova_space_size <= 1GB */
+- BUG_ON(iov_order < (20 - IOVP_SHIFT)); /* iova_space_size >= 1MB */
+- iova_space_size = 1 << (iov_order + IOVP_SHIFT);
++ iov_order = get_order(iova_space_size << PAGE_SHIFT);
++
++ /* iova_space_size is now bytes, not pages */
++ iova_space_size = 1 << (iov_order + PAGE_SHIFT);
+
+ ioc->pdir_size = (iova_space_size / IOVP_SIZE) * sizeof(u64);
+
+@@ -1306,9 +1318,12 @@
+ /* Verify it's a power of two */
+ BUG_ON((1 << get_order(ioc->pdir_size)) != (ioc->pdir_size >> PAGE_SHIFT));
+
+- DBG_INIT("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits) PDIR size 0x%0x",
+- __FUNCTION__, ioc->ioc_hpa, physmem>>20, iova_space_size>>20,
+- iov_order + PAGE_SHIFT, ioc->pdir_size);
++ DBG_INIT("%s() hpa 0x%lx mem %luMB IOV %dMB (%d bits)\n",
++ __FUNCTION__,
++ ioc->ioc_hpa,
++ (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
++ iova_space_size>>20,
++ iov_order + PAGE_SHIFT);
+
+ ioc->pdir_base = (u64 *)__get_free_pages(GFP_KERNEL,
+ get_order(ioc->pdir_size));
+@@ -1562,19 +1577,6 @@
+ return 0;
+ }
+
+-/* We *can't* support JAVA (T600). Venture there at your own risk. */
+-static struct parisc_device_id ccio_tbl[] = {
+- { HPHW_IOA, HVERSION_REV_ANY_ID, U2_IOA_RUNWAY, 0xb }, /* U2 */
+- { HPHW_IOA, HVERSION_REV_ANY_ID, UTURN_IOA_RUNWAY, 0xb }, /* UTurn */
+- { 0, }
+-};
+-
+-static struct parisc_driver ccio_driver = {
+- .name = "U2:Uturn",
+- .id_table = ccio_tbl,
+- .probe = ccio_probe,
+-};
+-
+ /**
+ * ccio_init - ccio initalization procedure.
+ *
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/parisc/power.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/parisc/power.c 2005-03-24 01:16:08.000000000 -0500
@@ -54,9 +54,9 @@
@@ -8653,8 +8784,8 @@
#endif
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/parisc/sba_iommu.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/parisc/sba_iommu.c 2005-03-24 01:17:15.000000000 -0500
@@ -1,8 +1,9 @@
/*
** System Bus Adapter (SBA) I/O MMU manager
@@ -8667,10 +8798,121 @@
**
** Portions (c) 1999 Dave S. Miller (from sparc64 I/O MMU code)
**
+@@ -164,6 +165,8 @@
+ #define IOC_CTRL_DE (1 << 2) /* Dillon Enable */
+ #define IOC_CTRL_RM (1 << 8) /* Real Mode */
+ #define IOC_CTRL_NC (1 << 9) /* Non Coherent Mode */
++#define IOC_CTRL_D4 (1 << 11) /* Disable 4-byte coalescing */
++#define IOC_CTRL_DD (1 << 13) /* Disable distr. LMMIO range coalescing */
+
+ #define MAX_IOC 2 /* per Ike. Pluto/Astro only have 1. */
+
+@@ -298,9 +301,6 @@
+
+ static unsigned long ioc_needs_fdc = 0;
+
+-/* Ratio of Host MEM to IOV Space size */
+-static unsigned long sba_mem_ratio = 8;
+-
+ /* global count of IOMMUs in the system */
+ static unsigned int global_ioc_cnt = 0;
+
+@@ -1524,8 +1524,7 @@
+ extern void lba_set_iregs(struct parisc_device *, u32, u32);
+
+ u32 iova_space_size, iova_space_mask;
+- int pdir_size, iov_order;
+- unsigned long physmem;
++ unsigned int pdir_size, iov_order;
+ struct parisc_device *lba;
+
+ /*
+@@ -1542,16 +1541,15 @@
+ ** for DMA hints - ergo only 30 bits max.
+ */
+
+- physmem = num_physpages << PAGE_SHIFT;
+- iova_space_size = (u32) (physmem/(sba_mem_ratio*global_ioc_cnt));
++ iova_space_size = (u32) (num_physpages/global_ioc_cnt);
+
+ /* limit IOVA space size to 1MB-1GB */
+- if (iova_space_size < 1024*1024) {
+- iova_space_size = 1024*1024;
++ if (iova_space_size < (1 << (20 - PAGE_SHIFT))) {
++ iova_space_size = 1 << (20 - PAGE_SHIFT);
+ }
+ #ifdef __LP64__
+- else if (iova_space_size > 512*1024*1024) {
+- iova_space_size = 512*1024*1024;
++ else if (iova_space_size > (1 << (30 - PAGE_SHIFT))) {
++ iova_space_size = 1 << (30 - PAGE_SHIFT);
+ }
+ #endif
+
+@@ -1560,21 +1558,19 @@
+ ** thus, pdir/res_map will also be log2().
+ ** PIRANHA BUG: Exception is when IO Pdir is 2MB (gets reduced)
+ */
+- iov_order = get_order(iova_space_size >> (IOVP_SHIFT-PAGE_SHIFT));
+- ASSERT(iov_order <= (30 - IOVP_SHIFT)); /* iova_space_size <= 1GB */
+- ASSERT(iov_order >= (20 - IOVP_SHIFT)); /* iova_space_size >= 1MB */
+- iova_space_size = 1 << (iov_order + IOVP_SHIFT);
+-
+- ioc->pdir_size = pdir_size = (iova_space_size/IOVP_SIZE) * sizeof(u64);
++ iov_order = get_order(iova_space_size << PAGE_SHIFT);
+
+- ASSERT(pdir_size < 4*1024*1024); /* max pdir size == 2MB */
++ /* iova_space_size is now bytes, not pages */
++ iova_space_size = 1 << (iov_order + PAGE_SHIFT);
+
+- /* Verify it's a power of two */
+- ASSERT((1 << get_order(pdir_size)) == (pdir_size >> PAGE_SHIFT));
++ ioc->pdir_size = pdir_size = (iova_space_size/IOVP_SIZE) * sizeof(u64);
+
+- DBG_INIT("%s() hpa 0x%lx mem %dMB IOV %dMB (%d bits) PDIR size 0x%0x\n",
+- __FUNCTION__, ioc->ioc_hpa, (int) (physmem>>20),
+- iova_space_size>>20, iov_order + PAGE_SHIFT, pdir_size);
++ DBG_INIT("%s() hpa 0x%lx mem %ldMB IOV %dMB (%d bits)\n",
++ __FUNCTION__,
++ ioc->ioc_hpa,
++ (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
++ iova_space_size>>20,
++ iov_order + PAGE_SHIFT);
+
+ ioc->pdir_base = sba_alloc_pdir(pdir_size);
+
+@@ -1685,7 +1681,9 @@
+ DBG_INIT("%s() hpa 0x%lx ioc_ctl 0x%Lx ->",
+ __FUNCTION__, sba_dev->sba_hpa, ioc_ctl);
+ ioc_ctl &= ~(IOC_CTRL_RM | IOC_CTRL_NC | IOC_CTRL_CE);
+- ioc_ctl |= IOC_CTRL_TC; /* Astro: firmware enables this */
++ ioc_ctl |= IOC_CTRL_DD | IOC_CTRL_D4 | IOC_CTRL_TC;
++ /* j6700 v1.6 firmware sets 0x294f */
++ /* A500 firmware sets 0x4d */
+
+ WRITE_REG(ioc_ctl, sba_dev->sba_hpa+IOC_CTRL);
+
+@@ -1730,6 +1728,16 @@
+ /* flush out the writes */
+ READ_REG(sba_dev->ioc[i].ioc_hpa + ROPE7_CTL);
+
++ DBG_INIT(" ioc[%d] ROPE_CFG 0x%Lx ROPE_DBG 0x%Lx\n",
++ i,
++ READ_REG(sba_dev->ioc[i].ioc_hpa + 0x40),
++ READ_REG(sba_dev->ioc[i].ioc_hpa + 0x50)
++ );
++ DBG_INIT(" STATUS_CONTROL 0x%Lx FLUSH_CTRL 0x%Lx\n",
++ READ_REG(sba_dev->ioc[i].ioc_hpa + 0x108),
++ READ_REG(sba_dev->ioc[i].ioc_hpa + 0x400)
++ );
++
+ if (IS_PLUTO(sba_dev->iodc)) {
+ sba_ioc_init_pluto(sba_dev->dev, &(sba_dev->ioc[i]), i);
+ } else {
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/pcmcia/Kconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/pcmcia/Kconfig 2005-03-24 01:16:08.000000000 -0500
@@ -136,7 +136,7 @@
config PCMCIA_PROBE
@@ -8682,8 +8924,8 @@
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/pcmcia/rsrc_mgr.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/pcmcia/rsrc_mgr.c 2005-03-24 01:16:08.000000000 -0500
@@ -59,10 +59,12 @@
#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0444)
@@ -8700,8 +8942,8 @@
/*======================================================================
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/lasi700.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/lasi700.c 2005-03-24 01:16:08.000000000 -0500
@@ -110,7 +110,7 @@
host->irq = dev->irq;
@@ -8713,8 +8955,8 @@
goto out_put_host;
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym53c8xx.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym53c8xx.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8763,8 +9005,8 @@
#ifndef SYM53C8XX_H
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_conf.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_conf.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8811,8 +9053,8 @@
#ifndef SYM_CONF_H
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8859,10 +9101,10 @@
*/
#ifndef SYM_DEFS_H
-Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.c
+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_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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw1.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw1.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8906,27 +9148,11 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
- #ifdef __FreeBSD__
-@@ -411,7 +398,6 @@
- if (opcode == 0) {
- printf ("%s: ERROR0 IN SCRIPT at %d.\n",
- sym_name(np), (int) (cur-start));
-- MDELAY (10000);
- ++cur;
- continue;
- };
-@@ -455,7 +441,6 @@
- if ((tmp1 ^ tmp2) & 3) {
- printf ("%s: ERROR1 IN SCRIPT at %d.\n",
- sym_name(np), (int) (cur-start));
-- MDELAY (10000);
- }
- /*
- * If PREFETCH feature not enabled, remove
-Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.h
+ /*
+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_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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw2.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw2.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -8938,14 +9164,22 @@
- * notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
-- *
++ * 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
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
- * Where this Software is combined with software released under the terms of
- * the GNU Public License ("GPL") and the terms of the GPL would require the
- * combined work to also be released under the terms of the GPL, the terms
- * and conditions of this License will apply in addition to those of the
- * GPL with the exception of any terms or conditions of this License that
- * conflict with, or are expressly prohibited by, the GPL.
-- *
++ * 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
++ * GNU General Public License for more details.
+ *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -8957,26 +9191,16 @@
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-+ * 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
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * 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
-+ * GNU General Public License for more details.
-+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
- #ifndef SYM_FW_H
-Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw1.h
+ /*
+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_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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.c 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9020,11 +9244,27 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
- /*
-Index: debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw2.h
+ #ifdef __FreeBSD__
+@@ -411,7 +398,6 @@
+ if (opcode == 0) {
+ printf ("%s: ERROR0 IN SCRIPT at %d.\n",
+ sym_name(np), (int) (cur-start));
+- MDELAY (10000);
+ ++cur;
+ continue;
+ };
+@@ -455,7 +441,6 @@
+ if ((tmp1 ^ tmp2) & 3) {
+ printf ("%s: ERROR1 IN SCRIPT at %d.\n",
+ sym_name(np), (int) (cur-start));
+- MDELAY (10000);
+ }
+ /*
+ * If PREFETCH feature not enabled, remove
+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_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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_fw.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_fw.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9036,22 +9276,14 @@
- * notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
-+ * 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
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
+- *
- * Where this Software is combined with software released under the terms of
- * the GNU Public License ("GPL") and the terms of the GPL would require the
- * combined work to also be released under the terms of the GPL, the terms
- * and conditions of this License will apply in addition to those of the
- * GPL with the exception of any terms or conditions of this License that
- * conflict with, or are expressly prohibited by, the GPL.
-+ * 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
-+ * GNU General Public License for more details.
- *
+- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -9063,16 +9295,26 @@
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
++ * 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
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * 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
++ * GNU General Public License for more details.
++ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
- /*
+ #ifndef SYM_FW_H
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9127,8 +9369,8 @@
break;
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9195,8 +9437,8 @@
* A 'read barrier' flushes any data that have been prefetched
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-03-24 01:16:08.000000000 -0500
@@ -3,6 +3,7 @@
* of PCI-SCSI IO processors.
*
@@ -9312,8 +9554,8 @@
*/
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9381,8 +9623,8 @@
#endif /* SYM_HIPD_H */
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_malloc.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_malloc.c 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9429,8 +9671,8 @@
#ifdef __FreeBSD__
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_misc.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.c 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9477,8 +9719,8 @@
#ifdef __FreeBSD__
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_misc.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_misc.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9525,8 +9767,8 @@
#ifndef SYM_MISC_H
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9573,8 +9815,8 @@
#include "sym_glue.h"
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/scsi/sym53c8xx_2/sym_nvram.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/scsi/sym53c8xx_2/sym_nvram.h 2005-03-24 01:16:08.000000000 -0500
@@ -22,32 +22,19 @@
*
*-----------------------------------------------------------------------------
@@ -9621,8 +9863,8 @@
#ifndef SYM_NVRAM_H
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/8250.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/serial/8250.c 2005-03-24 01:16:08.000000000 -0500
@@ -2023,8 +2023,18 @@
.data = &serial8250_reg,
};
@@ -9654,8 +9896,8 @@
{
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/8250_gsc.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/serial/8250_gsc.c 2005-03-24 01:16:08.000000000 -0500
@@ -82,7 +82,11 @@
kfree(serial);
return -ENODEV;
@@ -9671,8 +9913,8 @@
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/8250_pci.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/serial/8250_pci.c 2005-03-24 01:16:08.000000000 -0500
@@ -2177,7 +2177,14 @@
static int __init serial8250_pci_init(void)
@@ -9691,8 +9933,8 @@
static void __exit serial8250_pci_exit(void)
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/Kconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/serial/Kconfig 2005-03-24 01:16:08.000000000 -0500
@@ -450,7 +450,7 @@
config PDC_CONSOLE
@@ -9704,8 +9946,8 @@
Saying Y here will enable the software based PDC console to be
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/serial/serial_core.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/serial/serial_core.c 2005-03-24 01:16:08.000000000 -0500
@@ -231,7 +231,8 @@
/*
* Ensure that the IRQ handler isn't running on another CPU.
@@ -9731,8 +9973,8 @@
static void
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/video/console/Kconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/video/console/Kconfig 2005-03-24 01:16:08.000000000 -0500
@@ -6,7 +6,7 @@
config VGA_CONSOLE
@@ -9753,8 +9995,8 @@
The STI console is the builtin display/keyboard on HP-PARISC
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
+--- debian-kernel-hppa-2.6.8.orig/drivers/video/stifb.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/drivers/video/stifb.c 2005-03-24 01:16:08.000000000 -0500
@@ -1379,6 +1379,7 @@
stifb_init(void)
{
@@ -9786,8 +10028,8 @@
stifb_force_bpp[i] = bpp;
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
+--- debian-kernel-hppa-2.6.8.orig/fs/smbfs/inode.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/fs/smbfs/inode.c 2005-03-24 01:16:08.000000000 -0500
@@ -558,6 +558,7 @@
mnt->ttl = SMB_TTL_DEFAULT;
@@ -9809,7 +10051,7 @@
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
++++ debian-kernel-hppa-2.6.8/include/asm-generic/compat_signal.h 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,25 @@
+#ifndef _ASM_GENERIC_COMPAT_SIGNAL_H
+#define _ASM_GENERIC_COMPAT_SIGNAL_H
@@ -9838,8 +10080,8 @@
+#endif /* !_ASM_GENERIC_COMPAT_SIGNAL_H */
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-ia64/compat.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-ia64/compat.h 2005-03-24 01:16:08.000000000 -0500
@@ -27,6 +27,7 @@
typedef s32 compat_daddr_t;
typedef u32 compat_caddr_t;
@@ -9851,14 +10093,14 @@
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
++++ debian-kernel-hppa-2.6.8/include/asm-ia64/compat_siginfo.h 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,2 @@
+/* We use the generic compat struct */
+#include <asm-generic/compat_siginfo.h>
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/assembly.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/assembly.h 2005-03-24 01:16:08.000000000 -0500
@@ -27,8 +27,10 @@
#define LDREGX ldd,s
#define LDREGM ldd,mb
@@ -9926,8 +10168,8 @@
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/atomic.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/atomic.h 2005-03-24 01:16:08.000000000 -0500
@@ -14,10 +14,9 @@
*/
@@ -10031,8 +10273,8 @@
static __inline__ int atomic_read(const atomic_t *v)
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/bitops.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/bitops.h 2005-03-24 01:16:08.000000000 -0500
@@ -38,9 +38,9 @@
addr += (nr >> SHIFT_PER_LONG);
@@ -10110,8 +10352,8 @@
}
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/pci.h 2005-03-24 01:16:00.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/pci.h 2005-03-24 01:16:08.000000000 -0500
@@ -150,16 +150,25 @@
#endif
@@ -10150,8 +10392,8 @@
#define PCIBIOS_MIN_MEM 0x1000 /* NBPG - but pci/setup-res.c dies */
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/pdc.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/pdc.h 2005-03-24 01:16:08.000000000 -0500
@@ -754,6 +754,7 @@
int pdc_iodc_getc(void);
void pdc_iodc_putc(unsigned char c);
@@ -10162,8 +10404,8 @@
int pdc_sti_call(unsigned long func, unsigned long flags,
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/posix_types.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/posix_types.h 2005-03-24 01:16:08.000000000 -0500
@@ -15,7 +15,7 @@
typedef unsigned int __kernel_uid_t;
typedef unsigned int __kernel_gid_t;
@@ -10175,8 +10417,8 @@
typedef int __kernel_daddr_t;
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/ptrace.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/ptrace.h 2005-03-24 01:16:08.000000000 -0500
@@ -46,7 +46,8 @@
#ifdef __KERNEL__
@@ -10189,8 +10431,8 @@
#endif
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/spinlock.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/spinlock.h 2005-03-24 01:16:08.000000000 -0500
@@ -27,21 +27,35 @@
static inline void _raw_spin_lock(spinlock_t *x)
@@ -10233,8 +10475,8 @@
#define spin_lock_own(LOCK, LOCATION) ((void)0)
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/system.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/system.h 2005-03-24 01:16:08.000000000 -0500
@@ -80,7 +80,7 @@
#define mtctl(gr, cr) \
__asm__ __volatile__("mtctl %0,%1" \
@@ -10287,8 +10529,8 @@
#endif
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/thread_info.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/thread_info.h 2005-03-24 01:16:08.000000000 -0500
@@ -18,12 +18,15 @@
#define INIT_THREAD_INFO(tsk) \
@@ -10313,8 +10555,8 @@
#define init_thread_info (init_thread_union.thread_info)
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
+--- debian-kernel-hppa-2.6.8.orig/include/asm-parisc/tlbflush.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/asm-parisc/tlbflush.h 2005-03-24 01:16:08.000000000 -0500
@@ -51,9 +51,12 @@
{
/* For one page, it's not worth testing the split_tlb variable */
@@ -10359,8 +10601,8 @@
}
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
+--- debian-kernel-hppa-2.6.8.orig/include/linux/compat.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/linux/compat.h 2005-03-24 01:16:08.000000000 -0500
@@ -6,10 +6,16 @@
*/
#include <linux/config.h>
@@ -10422,7 +10664,7 @@
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
++++ debian-kernel-hppa-2.6.8/include/linux/compat_siginfo.h 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,178 @@
+#ifndef _ASM_GENERIC_COMPAT_SIGINFO_H
+#define _ASM_GENERIC_COMPAT_SIGINFO_H
@@ -10604,8 +10846,8 @@
+
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
+--- debian-kernel-hppa-2.6.8.orig/include/linux/console.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/linux/console.h 2005-03-24 01:16:08.000000000 -0500
@@ -84,6 +84,7 @@
#define CON_PRINTBUFFER (1)
#define CON_CONSDEV (2) /* Last on the command line */
@@ -10617,7 +10859,7 @@
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
++++ debian-kernel-hppa-2.6.8/include/linux/hil.h 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,483 @@
+#ifndef _HIL_H_
+#define _HIL_H_
@@ -11105,7 +11347,7 @@
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
++++ debian-kernel-hppa-2.6.8/include/linux/hil_mlc.h 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,171 @@
+/*
+ * HP Human Interface Loop Master Link Controller driver.
@@ -11281,7 +11523,7 @@
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
++++ debian-kernel-hppa-2.6.8/include/linux/hp_sdc.h 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,300 @@
+/*
+ * HP i8042 System Device Controller -- header
@@ -11585,8 +11827,8 @@
+#endif /* _LINUX_HP_SDC_H */
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
+--- debian-kernel-hppa-2.6.8.orig/include/linux/input.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/linux/input.h 2005-03-24 01:16:08.000000000 -0500
@@ -586,6 +586,7 @@
#define BUS_ADB 0x17
#define BUS_I2C 0x18
@@ -11597,8 +11839,8 @@
* Values describing the status of an effect
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
+--- debian-kernel-hppa-2.6.8.orig/include/linux/serial_core.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/linux/serial_core.h 2005-03-24 01:16:08.000000000 -0500
@@ -89,6 +89,8 @@
/* MPC52xx type numbers */
#define PORT_MPC52xx 59
@@ -11610,8 +11852,8 @@
#include <linux/config.h>
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
+--- debian-kernel-hppa-2.6.8.orig/include/linux/signal.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/include/linux/signal.h 2005-03-24 01:16:08.000000000 -0500
@@ -220,6 +220,9 @@
extern int get_signal_to_deliver(siginfo_t *info, struct pt_regs *regs, void *cookie);
#endif
@@ -11624,8 +11866,8 @@
#endif /* _LINUX_SIGNAL_H */
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
+--- debian-kernel-hppa-2.6.8.orig/ipc/compat_mq.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/ipc/compat_mq.c 2005-03-24 01:16:08.000000000 -0500
@@ -7,6 +7,7 @@
*/
@@ -11634,23 +11876,10 @@
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/mqueue.h>
-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/
- obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
--obj-$(CONFIG_COMPAT) += compat.o
-+obj-$(CONFIG_COMPAT) += compat.o compat_signal.o
- obj-$(CONFIG_IKCONFIG) += configs.o
- obj-$(CONFIG_IKCONFIG_PROC) += configs.o
- obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
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
++++ debian-kernel-hppa-2.6.8/kernel/compat_signal.c 2005-03-24 01:16:08.000000000 -0500
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2003 Carlos O'Donell
@@ -11858,10 +12087,23 @@
+}
+
+#endif
+Index: debian-kernel-hppa-2.6.8/kernel/Makefile
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/kernel/Makefile 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/kernel/Makefile 2005-03-24 01:16:08.000000000 -0500
+@@ -17,7 +17,7 @@
+ obj-$(CONFIG_KALLSYMS) += kallsyms.o
+ obj-$(CONFIG_PM) += power/
+ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
+-obj-$(CONFIG_COMPAT) += compat.o
++obj-$(CONFIG_COMPAT) += compat.o compat_signal.o
+ obj-$(CONFIG_IKCONFIG) += configs.o
+ obj-$(CONFIG_IKCONFIG_PROC) += configs.o
+ obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
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
+--- debian-kernel-hppa-2.6.8.orig/kernel/printk.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/kernel/printk.c 2005-03-24 01:16:08.000000000 -0500
@@ -91,8 +91,8 @@
* must be masked before subscripting
*/
@@ -11887,8 +12129,8 @@
* preferred driver at the head of the list.
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
+--- debian-kernel-hppa-2.6.8.orig/kernel/ptrace.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/kernel/ptrace.c 2005-03-24 01:16:08.000000000 -0500
@@ -290,7 +290,7 @@
{
if (child->last_siginfo == NULL)
@@ -11900,8 +12142,8 @@
}
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
+--- debian-kernel-hppa-2.6.8.orig/kernel/resource.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/kernel/resource.c 2005-03-24 01:16:08.000000000 -0500
@@ -179,6 +179,8 @@
{
struct resource *tmp, **p;
@@ -11913,8 +12155,8 @@
tmp = *p;
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
+--- debian-kernel-hppa-2.6.8.orig/kernel/signal.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/kernel/signal.c 2005-03-24 01:16:08.000000000 -0500
@@ -21,6 +21,7 @@
#include <linux/binfmts.h>
#include <linux/security.h>
@@ -11970,8 +12212,8 @@
/* Not even root can pretend to send signals from the kernel.
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
+--- debian-kernel-hppa-2.6.8.orig/mm/shmem.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/mm/shmem.c 2005-03-24 01:16:08.000000000 -0500
@@ -410,7 +410,7 @@
return freed;
}
@@ -11981,26 +12223,10 @@
{
struct shmem_inode_info *info = SHMEM_I(inode);
unsigned long idx;
-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
- tristate "PA Harmony audio driver"
-- depends on GSC_LASI && SOUND
-+ depends on GSC_LASI && SOUND_PRIME!=n
-+ help
-+ Say 'Y' or 'M' to include support for Harmony soundchip
-+ on HP 712, 715/new and many other GSC based machines.
-
- config SOUND_SONICVIBES
- tristate "S3 SonicVibes"
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
+--- debian-kernel-hppa-2.6.8.orig/sound/oss/ad1889.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/sound/oss/ad1889.c 2005-03-24 01:16:08.000000000 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright 2001 Randolph Chung <tausq@debian.org>
@@ -12199,8 +12425,8 @@
static int __devinit ad1889_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
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
+--- debian-kernel-hppa-2.6.8.orig/sound/oss/ad1889.h 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/sound/oss/ad1889.h 2005-03-24 01:16:08.000000000 -0500
@@ -34,9 +34,9 @@
#define AD_DMAWAVICC 0x98 /* WAV interrupt current count */
#define AD_DMAWAVIBC 0x9c /* WAV interrupt base count */
@@ -12216,8 +12442,8 @@
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
+--- debian-kernel-hppa-2.6.8.orig/sound/oss/harmony.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/sound/oss/harmony.c 2005-03-24 01:16:08.000000000 -0500
@@ -12,6 +12,7 @@
Copyright 2000-2003 (c) Helge Deller <deller@gmx.de>
Copyright 2001 (c) Matthieu Delahaye <delahaym@esiee.fr>
@@ -12522,10 +12748,26 @@
/* Grab the ID and revision from the device */
id = gsc_readb(&harmony.hpa->id);
if ((id | 1) != 0x15) {
+Index: debian-kernel-hppa-2.6.8/sound/oss/Kconfig
+===================================================================
+--- debian-kernel-hppa-2.6.8.orig/sound/oss/Kconfig 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/sound/oss/Kconfig 2005-03-24 01:16:08.000000000 -0500
+@@ -162,7 +162,10 @@
+
+ config SOUND_HARMONY
+ tristate "PA Harmony audio driver"
+- depends on GSC_LASI && SOUND
++ depends on GSC_LASI && SOUND_PRIME!=n
++ help
++ Say 'Y' or 'M' to include support for Harmony soundchip
++ on HP 712, 715/new and many other GSC based machines.
+
+ config SOUND_SONICVIBES
+ tristate "S3 SonicVibes"
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
+--- debian-kernel-hppa-2.6.8.orig/sound/parisc/harmony.c 2005-03-24 01:16:07.000000000 -0500
++++ debian-kernel-hppa-2.6.8/sound/parisc/harmony.c 2005-03-24 01:16:08.000000000 -0500
@@ -6,7 +6,7 @@
*
* Harmony is found in HP 712s, 715/new and many other GSC based machines.