debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Update hppa.patch from upstream 2.6.17-pa2. 

svn path=/dists/trunk/linux-2.6/; revision=6830
This commit is contained in:
Kyle McMartin 2006-06-19 13:05:39 +00:00
parent bccd88862c
commit 1c79e194f1
1 changed files with 91 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
debian/patches/hppa.patch vendored
View File

@ -1,6 +1,6 @@
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/CREDITS CVS2_6_17_PA0/CREDITS
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/CREDITS CVS2_6_17_PA2/CREDITS
--- LINUS_2_6_17/CREDITS 2006-06-17 22:24:34.000000000 -0600
+++ CVS2_6_17_PA0/CREDITS 2006-05-27 10:29:47.000000000 -0600
+++ CVS2_6_17_PA2/CREDITS 2006-05-27 10:29:47.000000000 -0600
@@ -3400,10 +3400,10 @@
N: Thibaut Varene
@ -14,9 +14,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
D: AD1889 sound driver
S: Paris, France
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/Documentation/pci.txt CVS2_6_17_PA0/Documentation/pci.txt
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/Documentation/pci.txt CVS2_6_17_PA2/Documentation/pci.txt
--- LINUS_2_6_17/Documentation/pci.txt 2006-06-17 22:24:34.000000000 -0600
+++ CVS2_6_17_PA0/Documentation/pci.txt 2006-06-05 15:32:03.000000000 -0600
+++ CVS2_6_17_PA2/Documentation/pci.txt 2006-06-05 15:32:03.000000000 -0600
@@ -213,9 +213,17 @@
See Documentation/IO-mapping.txt for how to access device memory.
@ -38,9 +38,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
All interrupt handlers should be registered with SA_SHIRQ and use the devid
to map IRQs to devices (remember that all PCI interrupts are shared).
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/cache.c CVS2_6_17_PA0/arch/parisc/kernel/cache.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/cache.c CVS2_6_17_PA2/arch/parisc/kernel/cache.c
--- LINUS_2_6_17/arch/parisc/kernel/cache.c 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/cache.c 2006-06-16 12:20:00.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/cache.c 2006-06-18 19:02:09.000000000 -0600
@@ -97,15 +97,16 @@
void
show_cache_info(struct seq_file *m)
@ -100,22 +100,23 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
switch (boot_cpu_data.cpu_type) {
case pcx: /* We shouldn't get this far. setup.c should prevent it. */
@@ -260,6 +262,12 @@
@@ -260,6 +262,13 @@
}
disable_sr_hashing_asm(srhash_type);
+
+ retval = pdc_spaceid_bits(&space_bits);
+ if (retval < 0)
+ /* If this procedure isn't implemented, don't panic. */
+ if (retval < 0 && retval != PDC_BAD_OPTION)
+ panic("pdc_spaceid_bits call failed.\n");
+ if (space_bits != 0)
+ panic("SpaceID hashing is still on!\n");
}
void flush_dcache_page(struct page *page)
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/entry.S CVS2_6_17_PA0/arch/parisc/kernel/entry.S
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/entry.S CVS2_6_17_PA2/arch/parisc/kernel/entry.S
--- LINUS_2_6_17/arch/parisc/kernel/entry.S 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/entry.S 2006-04-23 20:26:57.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/entry.S 2006-04-23 20:26:57.000000000 -0600
@@ -1638,7 +1638,7 @@
load32 PA(pa_dbit_lock),t0
@ -143,9 +144,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
cmpib,= 0,t1,dbit_spin_20
nop
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/firmware.c CVS2_6_17_PA0/arch/parisc/kernel/firmware.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/firmware.c CVS2_6_17_PA2/arch/parisc/kernel/firmware.c
--- LINUS_2_6_17/arch/parisc/kernel/firmware.c 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/firmware.c 2006-06-16 12:20:00.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/firmware.c 2006-06-18 19:02:09.000000000 -0600
@@ -11,7 +11,7 @@
* Copyright 1999 The Puffin Group, (Alex deVries, David Kennedy)
* Copyright 2003 Grant Grundler <grundler parisc-linux org>
@ -190,7 +191,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
* pdc_coproc_cfg - To identify coprocessors attached to the processor.
* @pdc_coproc_info: Return buffer address.
*
@@ -498,6 +512,25 @@
@@ -498,6 +512,26 @@
return retval;
}
@ -205,6 +206,7 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
+ int retval;
+
+ spin_lock_irq(&pdc_lock);
+ pdc_result[0] = 0;
+ retval = mem_pdc_call(PDC_CACHE, PDC_CACHE_RET_SPID, __pa(pdc_result), 0);
+ convert_to_wide(pdc_result);
+ *space_bits = pdc_result[0];
@ -216,9 +218,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
#ifndef CONFIG_PA20
/**
* pdc_btlb_info - Return block TLB information.
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/pdc_chassis.c CVS2_6_17_PA0/arch/parisc/kernel/pdc_chassis.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/pdc_chassis.c CVS2_6_17_PA2/arch/parisc/kernel/pdc_chassis.c
--- LINUS_2_6_17/arch/parisc/kernel/pdc_chassis.c 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/pdc_chassis.c 2006-05-04 09:29:32.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/pdc_chassis.c 2006-05-04 09:29:32.000000000 -0600
@@ -1,8 +1,8 @@
/*
- * interfaces to log Chassis Codes via PDC (firmware)
@ -402,9 +404,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
+
+#endif /* CONFIG_PROC_FS */
+#endif /* CONFIG_PDC_CHASSIS_WARN */
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/ptrace.c CVS2_6_17_PA0/arch/parisc/kernel/ptrace.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/ptrace.c CVS2_6_17_PA2/arch/parisc/kernel/ptrace.c
--- LINUS_2_6_17/arch/parisc/kernel/ptrace.c 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/ptrace.c 2006-06-16 13:10:02.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/ptrace.c 2006-06-16 13:10:02.000000000 -0600
@@ -91,7 +91,7 @@
int copied;
@ -441,9 +443,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
if (addr & (sizeof(int)-1))
goto out_tsk;
if ((addr = translate_usr_offset(addr)) < 0)
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/real2.S CVS2_6_17_PA0/arch/parisc/kernel/real2.S
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/real2.S CVS2_6_17_PA2/arch/parisc/kernel/real2.S
--- LINUS_2_6_17/arch/parisc/kernel/real2.S 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/real2.S 2006-05-25 10:22:30.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/real2.S 2006-05-25 10:22:30.000000000 -0600
@@ -276,15 +276,6 @@
#endif
@ -460,9 +462,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
.export __canonicalize_funcptr_for_compare
.text
/* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/setup.c CVS2_6_17_PA0/arch/parisc/kernel/setup.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/setup.c CVS2_6_17_PA2/arch/parisc/kernel/setup.c
--- LINUS_2_6_17/arch/parisc/kernel/setup.c 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/setup.c 2006-05-04 18:43:33.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/setup.c 2006-05-04 18:43:33.000000000 -0600
@@ -303,6 +303,8 @@
static int __init parisc_init(void)
@ -482,9 +484,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
processor_init();
printk(KERN_INFO "CPU(s): %d x %s at %d.%06d MHz\n",
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/signal.c CVS2_6_17_PA0/arch/parisc/kernel/signal.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/signal.c CVS2_6_17_PA2/arch/parisc/kernel/signal.c
--- LINUS_2_6_17/arch/parisc/kernel/signal.c 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/signal.c 2006-06-16 13:10:02.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/signal.c 2006-06-16 13:10:02.000000000 -0600
@@ -76,7 +76,7 @@
#ifdef __LP64__
compat_sigset_t newset32;
@ -571,9 +573,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
regs->gr[25] = A(&compat_frame->info); /* siginfo pointer */
regs->gr[24] = A(&compat_frame->uc); /* ucontext pointer */
} else
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/syscall.S CVS2_6_17_PA0/arch/parisc/kernel/syscall.S
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/syscall.S CVS2_6_17_PA2/arch/parisc/kernel/syscall.S
--- LINUS_2_6_17/arch/parisc/kernel/syscall.S 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/syscall.S 2006-06-17 11:53:43.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/syscall.S 2006-06-17 11:53:43.000000000 -0600
@@ -29,18 +29,6 @@
.level 1.1
#endif
@ -608,9 +610,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
.end
-
-
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/traps.c CVS2_6_17_PA0/arch/parisc/kernel/traps.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/traps.c CVS2_6_17_PA2/arch/parisc/kernel/traps.c
--- LINUS_2_6_17/arch/parisc/kernel/traps.c 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/traps.c 2006-06-01 05:33:33.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/traps.c 2006-06-01 05:33:33.000000000 -0600
@@ -111,7 +111,10 @@
* in our way, otherwise we're screwed.
* The fldd is used to restore the T-bit if there was one, as the
@ -631,9 +633,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
cr30 = mfctl(30);
cr31 = mfctl(31);
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/unaligned.c CVS2_6_17_PA0/arch/parisc/kernel/unaligned.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/arch/parisc/kernel/unaligned.c CVS2_6_17_PA2/arch/parisc/kernel/unaligned.c
--- LINUS_2_6_17/arch/parisc/kernel/unaligned.c 2006-06-17 22:24:39.000000000 -0600
+++ CVS2_6_17_PA0/arch/parisc/kernel/unaligned.c 2006-04-22 14:47:20.000000000 -0600
+++ CVS2_6_17_PA2/arch/parisc/kernel/unaligned.c 2006-04-22 14:47:20.000000000 -0600
@@ -43,6 +43,8 @@
"\tldil L%%" #lbl ", %%r1\n" \
"\tldo R%%" #lbl "(%%r1), %%r1\n" \
@ -715,9 +717,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
}
#endif
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/dummy.c CVS2_6_17_PA0/drivers/net/dummy.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/dummy.c CVS2_6_17_PA2/drivers/net/dummy.c
--- LINUS_2_6_17/drivers/net/dummy.c 2006-06-17 22:24:44.000000000 -0600
+++ CVS2_6_17_PA0/drivers/net/dummy.c 2006-04-20 14:25:07.000000000 -0600
+++ CVS2_6_17_PA2/drivers/net/dummy.c 2006-04-20 14:25:07.000000000 -0600
@@ -57,7 +57,7 @@
{
}
@ -727,9 +729,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
{
/* Initialize the device structure. */
dev->get_stats = dummy_get_stats;
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/21142.c CVS2_6_17_PA0/drivers/net/tulip/21142.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/21142.c CVS2_6_17_PA2/drivers/net/tulip/21142.c
--- LINUS_2_6_17/drivers/net/tulip/21142.c 2006-06-17 22:24:45.000000000 -0600
+++ CVS2_6_17_PA0/drivers/net/tulip/21142.c 2006-06-14 09:23:41.000000000 -0600
+++ CVS2_6_17_PA2/drivers/net/tulip/21142.c 2006-06-14 09:23:41.000000000 -0600
@@ -26,9 +26,9 @@
/* Handle the 21143 uniquely: do autoselect with NWay, not the EEPROM list
@ -742,9 +744,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
struct tulip_private *tp = netdev_priv(dev);
void __iomem *ioaddr = tp->base_addr;
int csr12 = ioread32(ioaddr + CSR12);
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/de2104x.c CVS2_6_17_PA0/drivers/net/tulip/de2104x.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/de2104x.c CVS2_6_17_PA2/drivers/net/tulip/de2104x.c
--- LINUS_2_6_17/drivers/net/tulip/de2104x.c 2006-06-17 22:24:45.000000000 -0600
+++ CVS2_6_17_PA0/drivers/net/tulip/de2104x.c 2006-04-20 14:25:07.000000000 -0600
+++ CVS2_6_17_PA2/drivers/net/tulip/de2104x.c 2006-04-20 14:25:07.000000000 -0600
@@ -1731,7 +1731,7 @@
}
@ -772,9 +774,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
{
struct net_device *dev = pci_get_drvdata(pdev);
struct de_private *de = dev->priv;
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/interrupt.c CVS2_6_17_PA0/drivers/net/tulip/interrupt.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/interrupt.c CVS2_6_17_PA2/drivers/net/tulip/interrupt.c
--- LINUS_2_6_17/drivers/net/tulip/interrupt.c 2006-06-17 22:24:45.000000000 -0600
+++ CVS2_6_17_PA0/drivers/net/tulip/interrupt.c 2006-05-30 00:46:14.000000000 -0600
+++ CVS2_6_17_PA2/drivers/net/tulip/interrupt.c 2006-05-30 00:46:14.000000000 -0600
@@ -88,6 +88,10 @@
}
tp->rx_ring[entry].status = cpu_to_le32(DescOwned);
@ -786,9 +788,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
if(tp->chip_id == LC82C168) {
if(((ioread32(tp->base_addr + CSR5)>>17)&0x07) == 4) {
/* Rx stopped due to out of buffers,
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/media.c CVS2_6_17_PA0/drivers/net/tulip/media.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/media.c CVS2_6_17_PA2/drivers/net/tulip/media.c
--- LINUS_2_6_17/drivers/net/tulip/media.c 2006-06-17 22:24:45.000000000 -0600
+++ CVS2_6_17_PA0/drivers/net/tulip/media.c 2006-06-14 10:12:39.000000000 -0600
+++ CVS2_6_17_PA2/drivers/net/tulip/media.c 2006-06-14 10:12:39.000000000 -0600
@@ -44,8 +44,10 @@
/* MII transceiver control section.
@ -860,9 +862,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
tmp_info = get_u16(&misc_info[1]);
if (tmp_info)
tp->advertising[phy_num] = tmp_info | 1;
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/timer.c CVS2_6_17_PA0/drivers/net/tulip/timer.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/timer.c CVS2_6_17_PA2/drivers/net/tulip/timer.c
--- LINUS_2_6_17/drivers/net/tulip/timer.c 2006-06-17 22:24:45.000000000 -0600
+++ CVS2_6_17_PA0/drivers/net/tulip/timer.c 2006-06-14 09:23:41.000000000 -0600
+++ CVS2_6_17_PA2/drivers/net/tulip/timer.c 2006-06-14 09:23:41.000000000 -0600
@@ -18,13 +18,14 @@
#include "tulip.h"
@ -896,9 +898,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
/* mod_timer synchronizes us with potential add_timer calls
* from interrupts.
*/
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/tulip.h CVS2_6_17_PA0/drivers/net/tulip/tulip.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/tulip.h CVS2_6_17_PA2/drivers/net/tulip/tulip.h
--- LINUS_2_6_17/drivers/net/tulip/tulip.h 2006-06-17 22:24:45.000000000 -0600
+++ CVS2_6_17_PA0/drivers/net/tulip/tulip.h 2006-06-14 09:23:41.000000000 -0600
+++ CVS2_6_17_PA2/drivers/net/tulip/tulip.h 2006-06-14 09:23:41.000000000 -0600
@@ -31,11 +31,10 @@
/* undefine, or define to various debugging levels (>4 == obscene levels) */
#define TULIP_DEBUG 1
@ -1012,9 +1014,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
+}
+
#endif /* __NET_TULIP_H__ */
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/tulip_core.c CVS2_6_17_PA0/drivers/net/tulip/tulip_core.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/tulip_core.c CVS2_6_17_PA2/drivers/net/tulip/tulip_core.c
--- LINUS_2_6_17/drivers/net/tulip/tulip_core.c 2006-06-17 22:24:45.000000000 -0600
+++ CVS2_6_17_PA0/drivers/net/tulip/tulip_core.c 2006-06-14 09:28:08.000000000 -0600
+++ CVS2_6_17_PA2/drivers/net/tulip/tulip_core.c 2006-06-14 09:28:08.000000000 -0600
@@ -18,11 +18,11 @@
#define DRV_NAME "tulip"
@ -1270,9 +1272,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
pci_save_state(pdev);
pci_disable_device(pdev);
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/winbond-840.c CVS2_6_17_PA0/drivers/net/tulip/winbond-840.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/net/tulip/winbond-840.c CVS2_6_17_PA2/drivers/net/tulip/winbond-840.c
--- LINUS_2_6_17/drivers/net/tulip/winbond-840.c 2006-06-17 22:24:45.000000000 -0600
+++ CVS2_6_17_PA0/drivers/net/tulip/winbond-840.c 2006-05-30 00:46:14.000000000 -0600
+++ CVS2_6_17_PA2/drivers/net/tulip/winbond-840.c 2006-05-30 00:46:14.000000000 -0600
@@ -90,10 +90,8 @@
Making the Tx ring too large decreases the effectiveness of channel
bonding and packet priority.
@ -1484,9 +1486,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
}
iowrite32(mc_filter[0], ioaddr + MulticastFilter0);
iowrite32(mc_filter[1], ioaddr + MulticastFilter1);
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/parisc/Kconfig CVS2_6_17_PA0/drivers/parisc/Kconfig
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/parisc/Kconfig CVS2_6_17_PA2/drivers/parisc/Kconfig
--- LINUS_2_6_17/drivers/parisc/Kconfig 2006-06-17 22:24:46.000000000 -0600
+++ CVS2_6_17_PA0/drivers/parisc/Kconfig 2006-05-03 17:27:35.000000000 -0600
+++ CVS2_6_17_PA2/drivers/parisc/Kconfig 2006-05-03 17:27:35.000000000 -0600
@@ -140,18 +140,37 @@
If unsure, say Y.
@ -1532,9 +1534,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
config PDC_STABLE
tristate "PDC Stable Storage support"
depends on SYSFS
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/parisc/pdc_stable.c CVS2_6_17_PA0/drivers/parisc/pdc_stable.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/parisc/pdc_stable.c CVS2_6_17_PA2/drivers/parisc/pdc_stable.c
--- LINUS_2_6_17/drivers/parisc/pdc_stable.c 2006-06-17 22:24:46.000000000 -0600
+++ CVS2_6_17_PA0/drivers/parisc/pdc_stable.c 2006-05-05 04:58:32.000000000 -0600
+++ CVS2_6_17_PA2/drivers/parisc/pdc_stable.c 2006-05-05 04:58:32.000000000 -0600
@@ -28,8 +28,15 @@
* following code can deal with just 96 bytes of Stable Storage, and all
* sizes between 96 and 192 bytes (provided they are multiple of struct
@ -1870,9 +1872,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
goto fail_subsysreg;
/* now we create all "files" for the paths subsys */
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/parisc/sba_iommu.c CVS2_6_17_PA0/drivers/parisc/sba_iommu.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/parisc/sba_iommu.c CVS2_6_17_PA2/drivers/parisc/sba_iommu.c
--- LINUS_2_6_17/drivers/parisc/sba_iommu.c 2006-06-17 22:24:46.000000000 -0600
+++ CVS2_6_17_PA0/drivers/parisc/sba_iommu.c 2006-05-31 06:58:33.000000000 -0600
+++ CVS2_6_17_PA2/drivers/parisc/sba_iommu.c 2006-05-31 06:58:33.000000000 -0600
@@ -39,15 +39,12 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
@ -1942,9 +1944,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
printk(KERN_INFO MODULE_NAME " FDC/SYNC required.\n");
} else {
printk(KERN_INFO MODULE_NAME " IOC has cache coherent PDIR.\n");
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/scsi/53c700.c CVS2_6_17_PA0/drivers/scsi/53c700.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/scsi/53c700.c CVS2_6_17_PA2/drivers/scsi/53c700.c
--- LINUS_2_6_17/drivers/scsi/53c700.c 2006-06-17 22:24:46.000000000 -0600
+++ CVS2_6_17_PA0/drivers/scsi/53c700.c 2006-04-03 07:44:53.000000000 -0600
+++ CVS2_6_17_PA2/drivers/scsi/53c700.c 2006-04-03 07:44:53.000000000 -0600
@@ -294,6 +294,7 @@
__u8 *memory;
__u32 *script;
@ -1969,9 +1971,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
/* reset the chip */
NCR_700_chip_reset(host);
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/scsi/constants.c CVS2_6_17_PA0/drivers/scsi/constants.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/scsi/constants.c CVS2_6_17_PA2/drivers/scsi/constants.c
--- LINUS_2_6_17/drivers/scsi/constants.c 2006-06-17 22:24:46.000000000 -0600
+++ CVS2_6_17_PA0/drivers/scsi/constants.c 2006-01-17 07:51:48.000000000 -0700
+++ CVS2_6_17_PA2/drivers/scsi/constants.c 2006-01-17 07:51:48.000000000 -0700
@@ -114,8 +114,7 @@
{0xd, "Report supported task management functions"},
{0xe, "Report priority"},
@ -2056,9 +2058,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
void scsi_print_driverbyte(int scsiresult)
{
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/scsi/sym53c8xx_2/sym_glue.c CVS2_6_17_PA0/drivers/scsi/sym53c8xx_2/sym_glue.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/scsi/sym53c8xx_2/sym_glue.c CVS2_6_17_PA2/drivers/scsi/sym53c8xx_2/sym_glue.c
--- LINUS_2_6_17/drivers/scsi/sym53c8xx_2/sym_glue.c 2006-06-17 22:24:47.000000000 -0600
+++ CVS2_6_17_PA0/drivers/scsi/sym53c8xx_2/sym_glue.c 2006-04-28 00:43:26.000000000 -0600
+++ CVS2_6_17_PA2/drivers/scsi/sym53c8xx_2/sym_glue.c 2006-04-28 00:43:26.000000000 -0600
@@ -210,13 +210,6 @@
cmd->scsi_done(cmd);
}
@ -2137,9 +2139,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
spin_unlock_irqrestore(instance->host_lock, flags);
return instance;
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/scsi/sym53c8xx_2/sym_glue.h CVS2_6_17_PA0/drivers/scsi/sym53c8xx_2/sym_glue.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/scsi/sym53c8xx_2/sym_glue.h CVS2_6_17_PA2/drivers/scsi/sym53c8xx_2/sym_glue.h
--- LINUS_2_6_17/drivers/scsi/sym53c8xx_2/sym_glue.h 2006-06-17 22:24:47.000000000 -0600
+++ CVS2_6_17_PA0/drivers/scsi/sym53c8xx_2/sym_glue.h 2006-04-19 22:08:31.000000000 -0600
+++ CVS2_6_17_PA2/drivers/scsi/sym53c8xx_2/sym_glue.h 2006-04-19 22:08:31.000000000 -0600
@@ -185,7 +185,6 @@
void __iomem * ioaddr; /* MMIO kernel io address */
void __iomem * ramaddr; /* RAM kernel io address */
@ -2148,9 +2150,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
struct timer_list timer; /* Timer handler link header */
u_long lasttime;
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/serial/serial_core.c CVS2_6_17_PA0/drivers/serial/serial_core.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/serial/serial_core.c CVS2_6_17_PA2/drivers/serial/serial_core.c
--- LINUS_2_6_17/drivers/serial/serial_core.c 2006-06-17 22:24:47.000000000 -0600
+++ CVS2_6_17_PA0/drivers/serial/serial_core.c 2006-05-27 10:30:14.000000000 -0600
+++ CVS2_6_17_PA2/drivers/serial/serial_core.c 2006-05-27 10:30:14.000000000 -0600
@@ -2015,6 +2015,7 @@
uart_report_port(struct uart_driver *drv, struct uart_port *port)
{
@ -2181,9 +2183,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
}
static void
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/usb/host/pci-quirks.c CVS2_6_17_PA0/drivers/usb/host/pci-quirks.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/usb/host/pci-quirks.c CVS2_6_17_PA2/drivers/usb/host/pci-quirks.c
--- LINUS_2_6_17/drivers/usb/host/pci-quirks.c 2006-06-17 22:24:47.000000000 -0600
+++ CVS2_6_17_PA0/drivers/usb/host/pci-quirks.c 2006-06-16 12:21:45.000000000 -0600
+++ CVS2_6_17_PA2/drivers/usb/host/pci-quirks.c 2006-06-16 12:21:45.000000000 -0600
@@ -168,8 +168,6 @@
static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
{
@ -2214,9 +2216,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
#endif
/*
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/usb/input/hid-core.c CVS2_6_17_PA0/drivers/usb/input/hid-core.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/drivers/usb/input/hid-core.c CVS2_6_17_PA2/drivers/usb/input/hid-core.c
--- LINUS_2_6_17/drivers/usb/input/hid-core.c 2006-06-17 22:24:48.000000000 -0600
+++ CVS2_6_17_PA0/drivers/usb/input/hid-core.c 2006-05-27 10:30:15.000000000 -0600
+++ CVS2_6_17_PA2/drivers/usb/input/hid-core.c 2006-05-27 10:30:15.000000000 -0600
@@ -752,21 +752,31 @@
}
@ -2256,9 +2258,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
}
/*
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/assembly.h CVS2_6_17_PA0/include/asm-parisc/assembly.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/assembly.h CVS2_6_17_PA2/include/asm-parisc/assembly.h
--- LINUS_2_6_17/include/asm-parisc/assembly.h 2006-06-17 22:24:50.000000000 -0600
+++ CVS2_6_17_PA0/include/asm-parisc/assembly.h 2006-04-23 20:26:58.000000000 -0600
+++ CVS2_6_17_PA2/include/asm-parisc/assembly.h 2006-04-23 20:26:58.000000000 -0600
@@ -48,6 +48,7 @@
#define CALLEE_SAVE_FRAME_SIZE (CALLEE_REG_FRAME_SIZE + CALLEE_FLOAT_FRAME_SIZE)
@ -2275,9 +2277,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
#define BL bl
#define LEVEL 1.1
#endif
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/compat.h CVS2_6_17_PA0/include/asm-parisc/compat.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/compat.h CVS2_6_17_PA2/include/asm-parisc/compat.h
--- LINUS_2_6_17/include/asm-parisc/compat.h 2006-06-17 22:24:50.000000000 -0600
+++ CVS2_6_17_PA0/include/asm-parisc/compat.h 2006-06-16 13:10:02.000000000 -0600
+++ CVS2_6_17_PA2/include/asm-parisc/compat.h 2006-06-16 13:10:02.000000000 -0600
@@ -5,6 +5,7 @@
*/
#include <linux/types.h>
@ -2301,9 +2303,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
+}
+
#endif /* _ASM_PARISC_COMPAT_H */
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/mckinley.h CVS2_6_17_PA0/include/asm-parisc/mckinley.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/mckinley.h CVS2_6_17_PA2/include/asm-parisc/mckinley.h
--- LINUS_2_6_17/include/asm-parisc/mckinley.h 1969-12-31 17:00:00.000000000 -0700
+++ CVS2_6_17_PA0/include/asm-parisc/mckinley.h 2006-05-31 06:58:34.000000000 -0600
+++ CVS2_6_17_PA2/include/asm-parisc/mckinley.h 2006-05-31 06:58:34.000000000 -0600
@@ -0,0 +1,9 @@
+#ifndef ASM_PARISC_MCKINLEY_H
+#define ASM_PARISC_MCKINLEY_H
@ -2314,9 +2316,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
+
+#endif /*__KERNEL__*/
+#endif /*ASM_PARISC_MCKINLEY_H*/
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/pdc.h CVS2_6_17_PA0/include/asm-parisc/pdc.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/pdc.h CVS2_6_17_PA2/include/asm-parisc/pdc.h
--- LINUS_2_6_17/include/asm-parisc/pdc.h 2006-06-17 22:24:50.000000000 -0600
+++ CVS2_6_17_PA0/include/asm-parisc/pdc.h 2006-06-16 12:20:01.000000000 -0600
+++ CVS2_6_17_PA2/include/asm-parisc/pdc.h 2006-06-16 12:20:01.000000000 -0600
@@ -353,8 +353,8 @@
cc_wt : 1, /* 0 = WT-Dcache, 1 = WB-Dcache */
cc_sh : 2, /* 0 = separate I/D-cache, else shared I/D-cache */
@ -2344,9 +2346,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
#ifndef CONFIG_PA20
int pdc_btlb_info(struct pdc_btlb_info *btlb);
int pdc_mem_map_hpa(struct pdc_memory_map *r_addr, struct pdc_module_path *mod_path);
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/pgtable.h CVS2_6_17_PA0/include/asm-parisc/pgtable.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/pgtable.h CVS2_6_17_PA2/include/asm-parisc/pgtable.h
--- LINUS_2_6_17/include/asm-parisc/pgtable.h 2006-06-17 22:24:50.000000000 -0600
+++ CVS2_6_17_PA0/include/asm-parisc/pgtable.h 2006-04-20 20:20:37.000000000 -0600
+++ CVS2_6_17_PA2/include/asm-parisc/pgtable.h 2006-04-20 20:20:37.000000000 -0600
@@ -507,13 +507,13 @@
/* TLB page size encoding - see table 3-1 in parisc20.pdf */
@ -2365,9 +2367,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
#if defined(CONFIG_PARISC_PAGE_SIZE_4KB)
# define _PAGE_SIZE_ENCODING_DEFAULT _PAGE_SIZE_ENCODING_4K
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/processor.h CVS2_6_17_PA0/include/asm-parisc/processor.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/processor.h CVS2_6_17_PA2/include/asm-parisc/processor.h
--- LINUS_2_6_17/include/asm-parisc/processor.h 2006-06-17 22:24:50.000000000 -0600
+++ CVS2_6_17_PA0/include/asm-parisc/processor.h 2006-05-19 14:18:17.000000000 -0600
+++ CVS2_6_17_PA2/include/asm-parisc/processor.h 2006-05-19 14:18:17.000000000 -0600
@@ -27,14 +27,12 @@
* Default implementation of macro that returns current
* instruction pointer ("program counter").
@ -2389,9 +2391,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
#define TASK_SIZE (current->thread.task_size)
#define TASK_UNMAPPED_BASE (current->thread.map_base)
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/system.h CVS2_6_17_PA0/include/asm-parisc/system.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/system.h CVS2_6_17_PA2/include/asm-parisc/system.h
--- LINUS_2_6_17/include/asm-parisc/system.h 2006-06-17 22:24:50.000000000 -0600
+++ CVS2_6_17_PA0/include/asm-parisc/system.h 2006-04-23 20:26:58.000000000 -0600
+++ CVS2_6_17_PA2/include/asm-parisc/system.h 2006-04-23 20:26:58.000000000 -0600
@@ -156,13 +156,14 @@
type and dynamically select the 16-byte aligned int from the array
for the semaphore. */
@ -2438,9 +2440,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
})
#ifdef CONFIG_SMP
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/uaccess.h CVS2_6_17_PA0/include/asm-parisc/uaccess.h
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/asm-parisc/uaccess.h CVS2_6_17_PA2/include/asm-parisc/uaccess.h
--- LINUS_2_6_17/include/asm-parisc/uaccess.h 2006-06-17 22:24:50.000000000 -0600
+++ CVS2_6_17_PA0/include/asm-parisc/uaccess.h 2006-04-22 14:47:20.000000000 -0600
+++ CVS2_6_17_PA2/include/asm-parisc/uaccess.h 2006-04-22 14:47:20.000000000 -0600
@@ -172,7 +172,11 @@
/*
* The "__put_user/kernel_asm()" macros tell gcc they read from memory
@ -2464,36 +2466,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
#define __put_user_asm(stx,x,ptr) \
__asm__ __volatile__ ( \
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/scsi/scsi_device.h CVS2_6_17_PA0/include/scsi/scsi_device.h
--- LINUS_2_6_17/include/scsi/scsi_device.h 2006-06-17 22:24:52.000000000 -0600
+++ CVS2_6_17_PA0/include/scsi/scsi_device.h 2006-05-18 20:43:19.000000000 -0600
@@ -298,6 +298,10 @@
void (*done)(void *, char *, int, int),
gfp_t gfp);
+struct async_scan_data;
+struct async_scan_data * scsi_prep_async_scan(struct Scsi_Host *shost);
+void scsi_finish_async_scan(struct async_scan_data *data);
+
static inline void scsi_device_reprobe(struct scsi_device *sdev)
{
device_reprobe(&sdev->sdev_gendev);
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/include/scsi/scsi_host.h CVS2_6_17_PA0/include/scsi/scsi_host.h
--- LINUS_2_6_17/include/scsi/scsi_host.h 2006-06-17 22:24:52.000000000 -0600
+++ CVS2_6_17_PA0/include/scsi/scsi_host.h 2006-05-18 20:43:19.000000000 -0600
@@ -541,6 +541,9 @@
*/
unsigned ordered_tag:1;
+ /* Are we currently performing an async scan? */
+ unsigned async_scan:1;
+
/*
* Optional work queue to be utilized by the transport
*/
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/kernel/resource.c CVS2_6_17_PA0/kernel/resource.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/kernel/resource.c CVS2_6_17_PA2/kernel/resource.c
--- LINUS_2_6_17/kernel/resource.c 2006-06-17 22:24:52.000000000 -0600
+++ CVS2_6_17_PA0/kernel/resource.c 2006-01-17 07:53:00.000000000 -0700
+++ CVS2_6_17_PA2/kernel/resource.c 2006-01-17 07:53:00.000000000 -0700
@@ -181,6 +181,8 @@
{
struct resource *tmp, **p;
@ -2553,9 +2528,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
}
for (next = first; ; next = next->sibling) {
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/mm/shmem.c CVS2_6_17_PA0/mm/shmem.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/mm/shmem.c CVS2_6_17_PA2/mm/shmem.c
--- LINUS_2_6_17/mm/shmem.c 2006-06-17 22:24:52.000000000 -0600
+++ CVS2_6_17_PA0/mm/shmem.c 2006-06-17 22:34:52.000000000 -0600
+++ CVS2_6_17_PA2/mm/shmem.c 2006-06-17 22:34:52.000000000 -0600
@@ -627,7 +627,7 @@
}
}
@ -2565,9 +2540,9 @@ diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontd
{
shmem_truncate_range(inode, inode->i_size, (loff_t)-1);
}
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/sound/pci/ad1889.c CVS2_6_17_PA0/sound/pci/ad1889.c
diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_17/sound/pci/ad1889.c CVS2_6_17_PA2/sound/pci/ad1889.c
--- LINUS_2_6_17/sound/pci/ad1889.c 2006-06-17 22:24:53.000000000 -0600
+++ CVS2_6_17_PA0/sound/pci/ad1889.c 2006-05-12 22:12:43.000000000 -0600
+++ CVS2_6_17_PA2/sound/pci/ad1889.c 2006-05-12 22:12:43.000000000 -0600
@@ -100,6 +100,7 @@
struct snd_pcm *pcm;
struct snd_info_entry *proc;