ChangeSet@1.1523.1.1, 2004-08-23 23:35:41-04:00, jgarzik@pobox.com Merge pobox.com:/spare/repo/linux-2.4 into pobox.com:/spare/repo/libata-upstream-2.4 ChangeSet@1.1503.1.1, 2004-08-23 22:57:40-04:00, jgarzik@pobox.com Merge pobox.com:/spare/repo/linux-2.4 into pobox.com:/spare/repo/libata-upstream-2.4 ChangeSet@1.1524, 2004-08-23 15:01:28-07:00, greg@kroah.com Merge kroah.com:/home/greg/linux/BK/bleed-2.4 into kroah.com:/home/greg/linux/BK/pci-2.4 ChangeSet@1.1523, 2004-08-23 10:14:16-03:00, daniel.ritz@gmx.ch [PATCH] fix EnE Cardbus bridges for HDSP this has been in 2.6 since may 04. the 2.4 version of it. against 2.4-bknow this patch clears an almost undocumented EnE specific test register that makes sound on RME Hammerfall DSP Carbus work... Signed-off-by: Daniel Ritz ChangeSet@1.1522, 2004-08-23 10:13:14-03:00, daniel.ritz@gmx.ch [PATCH] enable read prefetch on o2micro bridges to fix HDSP this is in 2.6 since june 21 and even longer on the linux-pcmcia list (2.6 version). not a single negative report about this until now. ChangeSet@1.1521, 2004-08-23 10:09:31-03:00, B.Zolnierkiewicz@elka.pw.edu.pl [PATCH] Fix IDE Triflex hang on boot with two single-channel controllers ChangeSet@1.1520, 2004-08-23 09:53:57-03:00, schwidefsky@de.ibm.com [PATCH] s390: qeth network driver fixes [PATCH] s390 (7/22): qeth network driver. From: Utz Bacher qeth network driver bug fixes/enhancements: - Add configuration options for qeth to driver/s390/Config.in. - Add HiperSockets Network Concentrator functionality. - Reduce kernel stack usage. - Release spinlock on unsupported ioctl exit path. - Fix MAC header handling when IPv6 is not compiled in. - Fix multicast router handling for OSA cards. - Fix VIPA and Proxy ARP flags when running under VSWITCH. - Fix crashes triggered by s390 network drivers calling dst_link_failure. - Fix fake_ll source MAC handling problem. - Fix race when more than one osasnmpd subagent running. - Fix hang during initialization when I/O errors occur. - Fix DHCP for VM Guest LAN HIPER. - Fix hardware checksumming. - Fix oops when unloading while osasnmpd running. Signed-off-by: Martin Schwidefsky diffstat: Documentation/Configure.help | 31 + arch/s390/defconfig | 8 arch/s390x/defconfig | 8 drivers/s390/Config.in | 17 drivers/s390/Makefile | 2 drivers/s390/net/qeth.c | 1013 ++++++++++++++++++++++++++++--------------- drivers/s390/net/qeth.h | 78 ++- drivers/s390/net/qeth_mpc.h | 10 drivers/s390/qdio.c | 358 +++++++++++---- include/asm-s390/qdio.h | 19 include/asm-s390x/qdio.h | 19 11 files changed, 1099 insertions(+), 464 deletions(-) ChangeSet@1.1519, 2004-08-23 09:53:25-03:00, schwidefsky@de.ibm.com [PATCH] s390: iucv net driver fixes [PATCH] s390 (6/22): iucv network driver. From: Ursula Braun-Krahl From: Fritz Elfert iucv network driver changes: - Fix __FUNCTION__ compiler warnings. - Fix race on iucv pathid table. - Fix race in grab_param. - Set tx_queue_len to message limit returned from iucv accept. - Move release of iucv buffer to iucv_exit to fix module unloading. - Remove dst_link_failure call to avoid oops in icmp.c. - Remove unused fields flags and retry from iucv_connection and timer from netiucv_priv. - Fix reconnect after reboot and after link failure. - Fix off vs. ppos variable name problem. Signed-off-by: Martin Schwidefsky diffstat: drivers/s390/net/iucv.c | 71 ++++++++++++++++-------- drivers/s390/net/netiucv.c | 130 +++++++++++++++++++++------------------------ 2 files changed, 109 insertions(+), 92 deletions(-) ChangeSet@1.1518, 2004-08-23 09:52:41-03:00, schwidefsky@de.ibm.com [PATCH] s390: ctc fixes [PATCH] s390 (5/22): ctc network driver. From: Martin Schwidefsky ctc network driver changes: - Fix typo: sbus -> sbuf. Signed-off-by: Martin Schwidefsky diffstat: drivers/s390/net/ctcmain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ChangeSet@1.1517, 2004-08-23 09:52:09-03:00, schwidefsky@de.ibm.com [PATCH] s390: dasd changes [PATCH] s390 (4/22): dasd changes. From: Horst Hummel dasd driver changes: - Only trigger device bring-up in the oper_handler if the device is down. - Avoid duplicates device entries in /proc/dasd/devices. - Fix memory leak in dasd_statistics_write. - Improve checking of dasd device ranges. - Simplify long buys conditions. - Fix incorrect check in error recovery, the request status in dasd_3990_erp_alternate_path can be ERROR or FILLED. Signed-off-by: Martin Schwidefsky diffstat: drivers/s390/block/dasd.c | 8 +++++--- drivers/s390/block/dasd_3990_erp.c | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 19 deletions(-) ChangeSet@1.1516, 2004-08-23 09:51:54-03:00, schwidefsky@de.ibm.com [PATCH] s390: system tick misaccounting [PATCH] s390 (3/22): system tick misaccounting. From: Martin Schwidefsky s390 core changes: - Fix system tick misaccounting problem where an i/o interrupt consistently overtakes a timer interrupt although the timer interrupt has arrived earlier. To get around this virtulization effect each asynchronous interrupt needs to check for a missed timer interrupt. Signed-off-by: Martin Schwidefsky diffstat: arch/s390/kernel/entry.S | 36 ++++++++++++++-- arch/s390/kernel/time.c | 99 +++++++++++++++++++++++++++++++------------- arch/s390x/kernel/entry.S | 29 ++++++++++++ arch/s390x/kernel/time.c | 87 ++++++++++++++++++++++++++------------ include/asm-s390/lowcore.h | 6 +- include/asm-s390x/lowcore.h | 6 +- 6 files changed, 200 insertions(+), 63 deletions(-) ChangeSet@1.1515, 2004-08-23 09:51:41-03:00, schwidefsky@de.ibm.com [PATCH] s390: ibm partition table [PATCH] s390 (2/22): ibm partition table. From: Carsten Otte From: Holger Smolinski s390 partition table changes: - Fix partition detection for CMS reserved minidisk. - Fix partition detection for FBA volumes with a VOL1 partition table. Signed-off-by: Martin Schwidefsky diffstat: fs/partitions/ibm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) ChangeSet@1.1514, 2004-08-23 09:51:25-03:00, schwidefsky@de.ibm.com [PATCH] s390: core changes [PATCH] s390 (1/22): core changes. From: Jan Glauber From: Cornelia Huck From: Horst Hummel From: Peter Oberparleiter From: Martin Schwidefsky s390 core changes: - Mention zSeries and z990 in the Documentation files. - Add smp_call_function_on to call a function on a particular cpu. - Retry signal processor calls after condition code 2 (sigp busy). - Fix 31 bit emulation for sys_stat64, sys_lstat64 and sys_fstat64. - Export symbols cpcmd and show_trace. - Add some includes to avoid compiler warnings. - Fix special case of deferred condition code 3 after a basic sense. - Fix dirty bit race in SetPageUptodate. - Fix size of siginfo structure for 64 bit. - Add kmap_types.h for s390/s390x. - Regenerate default configuration. Signed-off-by: Martin Schwidefsky diffstat: Documentation/Configure.help | 6 - arch/s390/defconfig | 1 arch/s390/kernel/s390_ksyms.c | 5 + arch/s390/kernel/smp.c | 100 ++++++++++++++++------- arch/s390x/kernel/linux32.c | 8 - arch/s390x/kernel/s390_ksyms.c | 5 + arch/s390x/kernel/smp.c | 178 +++++++++++++++++++++++++---------------- drivers/s390/char/ctrlchar.c | 1 drivers/s390/s390io.c | 13 ++ include/asm-s390/kmap_types.h | 16 +++ include/asm-s390/pgtable.h | 7 + include/asm-s390/processor.h | 2 include/asm-s390/sigp.h | 2 include/asm-s390/smp.h | 18 ++-- include/asm-s390x/kmap_types.h | 16 +++ include/asm-s390x/pgtable.h | 6 - include/asm-s390x/processor.h | 2 include/asm-s390x/siginfo.h | 2 include/asm-s390x/sigp.h | 2 include/asm-s390x/smp.h | 8 + include/linux/mm.h | 8 - 21 files changed, 284 insertions(+), 122 deletions(-) ChangeSet@1.1513, 2004-08-23 09:33:57-03:00, sezeroz@ttnet.net.tr [PATCH] char gcc3.4 inline fixes ChangeSet@1.1512, 2004-08-23 09:33:06-03:00, sezeroz@ttnet.net.tr [PATCH] net gcc3.4 inline fixes ChangeSet@1.1511, 2004-08-23 09:22:49-03:00, sezeroz@ttnet.net.tr [PATCH] USB gcc3.4 inline fixes ChangeSet@1.1510, 2004-08-23 09:21:25-03:00, sezeroz@ttnet.net.tr [PATCH] scsi drivers gcc3.4 inline fixes ChangeSet@1.1509, 2004-08-23 09:12:02-03:00, sezeroz@ttnet.net.tr [PATCH] net drivers gcc3.4 inline fixes ChangeSet@1.1508, 2004-08-23 09:06:26-03:00, sezeroz@ttnet.net.tr [PATCH] mtd gcc3.4 inline fixes ChangeSet@1.1507, 2004-08-23 09:00:45-03:00, sezeroz@ttnet.net.tr [PATCH] radio/video gcc3.4 inline fixes ChangeSet@1.1506, 2004-08-23 08:55:54-03:00, sezeroz@ttnet.net.tr [PATCH] ieee1394/hisax gcc 3.4 inline fixes ChangeSet@1.1505, 2004-08-23 08:46:31-03:00, sezeroz@ttnet.net.tr [PATCH] cpqarray/cciss gcc3.4 inline fixes ChangeSet@1.1504, 2004-08-23 08:25:28-03:00, mbroemme@plusserver.de [PATCH] Fix kernel oops in nsc-ircc.c * fix kernel oops if you load nsc-ircc.o with dongle id which is out of range of available dongle ids. If you try to modprobe the nsc-ircc module with a specific dongle id for example: "modprobe nsc-ircc irq=3 dma=1 io=0x2f8 dongle_id=0x99" the kernel oopses and the module hangs until a reboot on initializing. ChangeSet@1.1503, 2004-08-19 13:11:29-03:00, thor@math.TU-Berlin.DE [PATCH] NetMOS 9805 ParPort interface here's a tiny patch against parport/parport_pc.c. It adds support for the NetMOS 9805 chip, used in several popular parallel port extension cards available here in germany. The patch below has been found working in a beige G3 Mac and a Canon BJC just fine. ChangeSet@1.1502, 2004-08-19 12:52:25-03:00, rainer.weikusat@sncag.com [PATCH] bkgoodman@bradgoodman.com: MTD cfi_cmdset_0002.c - Duplicate cleanup in error path "bradgoodman.com" writes: > Patch to 2.4.x: Corrects an obvious error where all of the cleanups are done > twice in the event of a chip programming error. This can result in > kernel BUG() getting called on subsequent programming attempts. > > +++ linux-2.4.22/drivers/mtd/chips/cfi_cmdset_0002.new > @@ -549,11 +549,6 @@ > } > } else { > printk(KERN_WARNING "Waiting for write to complete timed out in do_write_oneword."); > - > - chip->state = FL_READY; > - wake_up(&chip->wq); > - cfi_spin_unlock(chip->mutex); > - DISABLE_VPP(map); > ret = -EIO; > } > } I suggest to return after the first cleanup. That way, it is consistent with the other low-level chip access functions. But the algorithm is per se buggy, anyway, because except if DQ5 was raised before, the chip is not 'ready' (for reading array data), but still in programming mode and will remain there until the 'embedded programming algorithm' stops, because (according to the docs) a reset command will not be accepted until DQ5 has been raised and the opportunityto check for that is gone after the syscall returned to the caller. ChangeSet@1.1501, 2004-08-19 12:24:20-03:00, bunk@fs.tum.de [PATCH] disallow modular BINFMT_ELF with no 2.4 kernel BINFMT_ELF=m actually worked, you always get a <-- snip --> depmod: *** Unresolved symbols in /lib/modules/2.4.25-pre4/kernel/fs/binfmt_elf.o depmod: smp_num_siblings depmod: put_files_struct depmod: steal_locks <-- snip --> Since BINFMT_ELF=m is a very unusual case, the patch below simply disallows modular BINFMT_ELF. A similar patch I sent was already accepted into 2.6. diffstat output: Documentation/Configure.help | 6 ------ arch/alpha/config.in | 2 +- arch/arm/config.in | 2 +- arch/cris/config.in | 2 +- arch/i386/config.in | 2 +- arch/ia64/config.in | 2 +- arch/m68k/config.in | 2 +- arch/mips/config-shared.in | 2 +- arch/parisc/config.in | 2 +- arch/s390/config.in | 2 +- arch/s390x/config.in | 2 +- arch/sh/config.in | 2 +- arch/sh64/config.in | 2 +- arch/sparc/config.in | 2 +- arch/sparc64/config.in | 2 +- arch/x86_64/config.in | 2 +- 16 files changed, 15 insertions(+), 21 deletions(-) ChangeSet@1.1493.1.11, 2004-08-19 12:15:49-03:00, alan@lxorguk.ukuu.org.uk [PATCH] ad1816 sound driver web page and email address update ChangeSet@1.1493.1.10, 2004-08-19 12:05:14-03:00, david.martinez@rediris.es [PATCH] Update ftape webpage ChangeSet@1.1493.1.9, 2004-08-19 11:26:00-03:00, mikpe@csd.uu.se [PATCH] gcc34 inline failure fixes Marcelo, This patch fixes a number inlining failures with gcc-3.4.1 and the 2.4.28-pre1 kernel. There are five kinds of changes: - Trivial removals of unusable inlines. + get_buffer_flushtime(): defined in fs/buffer.c, only called from fs/jdb/journal.c + nmi_watchdog_tick(): defined in arch/{i386,x86_64}/kernel/nmi.c, only called from arch/{i386,x86_64}/kernel/traps.c + SELECT_INTERRUPT(): defined in drivers/ide/ide-iops.c, only called from drivers/ide/ide-io.c + QUIRK_LIST(): defined in drivers/ide/ide-iops.c, only called from drivers/ide/ide-probe.c - Removals of pointless inlines: + rtl8139_start_thread(): semi-heavy operation called infrequently + SELECT_DRIVE(): defined in drivers/ide/ide-iops.c, called from ide-iops.c and several other files; the calls in ide-iops.c are all in non-performance critical sections + SELECT_MASK(): similar to SELECT_DRIVE() + __mmdrop(): defined in kernel/fork.c, used in fork.c and several other files; the calls in fork.c are not performance critial enough to require inlining - Reordering to allow inlinining: + drivers/scsi/sg.c: move sg_jif_to_ms(), sg_alloc_kiovec(), and sg_free_kiovec() to before their first call sites + net/sunrpc/xprt.c: move do_xprt_reserve() to before its first and only call site - Wrappers to allow partial inlining of critical functions: + blk_get_queue(): split to allow internal calls in ll_rw_block.c to call the inlinable version + blk_seg_merge_ok(): similar to blk_get_queue() + ip_finish_output(): similar to blk_get_queue() - Replacing extern inline/normal functions duplication with only a single set of static inlines: + parport_pc defines a number of low-level functions both as extern inlines with bodies, and as normal functions in one file where those functions' addresses are exported. This causes errors from gcc-3.4. Most of these changes are from the 2.6 kernels. In some cases (the "wrappers to allow partial inlining" cases) the changes enable 2.4 to continue to (partially) inline a function even when 2.6 has elected to drop the inline attribute from that function. Compiled and booted on i386 SMP and UP, x86_64 SMP and UP, and ppc32 UP. Signed-off-by: Mikael Pettersson ChangeSet@1.1472.1.13, 2004-08-18 20:50:31-04:00, achew@nvidia.com [libata sata_nv] fix leak on error Spotted by Francois Romieu. ChangeSet@1.1472.1.12, 2004-08-18 01:52:34-04:00, alan@redhat.com [libata] improve translation of ATA errors to SCSI sense codes ChangeSet@1.1472.1.11, 2004-08-18 01:48:13-04:00, jgarzik@pobox.com [ata] remove 'packed' attributed from struct ata_prd It's not needed, and it generates very poor code on some platforms. Noticed by Bart and David Miller. ChangeSet@1.1472.1.10, 2004-08-18 01:40:47-04:00, bunk@fs.tum.de [PATCH] 2.4.28-pre1: add two SATA Configure.help entries The trivial patch below adds the missing Configure.help entries for two new options. Signed-off-by: Adrian Bunk ChangeSet@1.1472.1.9, 2004-08-18 01:30:57-04:00, dougg@torque.net [libata] fix INQUIRY handling Changes: - send vendor, product and rev strings back for 36 byte INQUIRYs - set the additional length field to indicate 96 byte response is available ChangeSet@1.1472.1.8, 2004-08-18 01:28:59-04:00, jgarzik@pobox.com [libata] fix error recovery reference count and in-recovery flag This bug could potentially lead to soft hangs (processes stuck in D state) if an error occurred. Yet another undocumented nuance of the ->eh_strategy_handler. Thanks to excellent detective work by Brad Campbell tracking this down. Thanks also to Doug Ledford. ChangeSet@1.1498, 2004-08-16 17:10:30-07:00, kaber@trash.net [PKT_SCHED]: Remove unnecessary memsets in packet schedulers This patch removes some more unnecessary memsets in packet schedulers. The qdisc's private data is already set to 0 in qdisc_create/qdisc_create_dflt. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1493.1.7, 2004-08-16 19:37:23-03:00, neilb@cse.unsw.edu.au [PATCH] mark NFS/TCP not EXPERIMENTAL NFS/TCP has been used widely for a long time now, and is now enabled by many distros and typically recommended for lossy or congested networks. This patch removes the EXPERIMENTAL tag, updates the help text, and changes arch defconfigs to set it by default (note that several already did so). From: Greg Banks Signed-off-by: Neil Brown ### Diffstat output ./Documentation/Configure.help | 7 ++++--- ./arch/i386/defconfig | 2 +- ./arch/ia64/defconfig | 2 +- ./arch/mips/defconfig | 2 +- ./arch/mips64/defconfig | 2 +- ./arch/ppc/defconfig | 2 +- ./arch/ppc64/defconfig | 2 +- ./arch/s390/defconfig | 2 +- ./arch/s390x/defconfig | 2 +- ./arch/sh64/defconfig | 2 +- ./fs/Config.in | 2 +- 11 files changed, 14 insertions(+), 13 deletions(-) ChangeSet@1.1493.2.1, 2004-08-16 13:34:59-07:00, davem@nuts.davemloft.net [SPARC64]: Add missing nop to itlb_base.S Signed-off-by: David S. Miller ChangeSet@1.1493.1.6, 2004-08-16 15:05:31-03:00, sezeroz@ttnet.net.tr [PATCH] ns83820.c warning fixes ns83820.c warning fix from 2.6 ChangeSet@1.1493.1.5, 2004-08-16 15:04:52-03:00, sezeroz@ttnet.net.tr [PATCH] pm3fb and kaweth missing casts ChangeSet@1.1493.1.4, 2004-08-16 14:51:05-03:00, neilb@cse.unsw.edu.au [PATCH] Use llseek instead of f_pos= for directory seeking. nfsd currently just sets f_pos when seeking in a directory. This bypasses any checking and other handling that a filesystem might want to do. So instead, we use 'llseek' copied out of fs/read_write.c use that, both to seek at the start, and the find the new position at the end. If it were not too intrusive, would could export llseek as vfs_llseek as was done in 2.6.... Thanks to "Derrick Schommer" "Trond Myklebust" Signed-off-by: Neil Brown ### Diffstat output ./fs/nfsd/vfs.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) ChangeSet@1.1493.1.3, 2004-08-16 14:50:04-03:00, neilb@cse.unsw.edu.au [PATCH] Fixed possibly xdr parsing error if write size exceed 2^31 xdr_argsize_check needs to cope with the possibility that the pointer has wrapped and could be below buf->base. Signed-off-by: Neil Brown ### Diffstat output ./fs/nfsd/nfs3xdr.c | 2 +- ./include/linux/nfsd/xdr3.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ChangeSet@1.1493.1.2, 2004-08-16 14:47:13-03:00, neilb@cse.unsw.edu.au [PATCH] Allow larger NFSd MAXBLKSIZE on architectures with larger PAGE_SIZE This patch makes NFSSVC_MAXBLKSIZE depend on PAGE_SIZE so that machines with large page sizes can take advantage of that feature to serve NFS with larger blocksizes, increasing performance and avoiding a fallback to synchronous traffic between machines with page sizes greater than 8K. Also, documents the actual constraints on NFSSVC_MAXBLKSIZE. From: Greg Banks Signed-off-by: Neil Brown ### Diffstat output ./include/linux/nfsd/const.h | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) ChangeSet@1.1493.1.1, 2004-08-16 14:45:44-03:00, pbadari@us.ibm.com [PATCH] scsi PHYS_4G merging doesn't work We recently found that, BH_PHYS_4G() handling in scsi-merge code is broken. Instead of creating new segment when the IO crosses 4G boundary, its forcing to create a new request. So we end up not merging IOs and start doing small IOs. Only requirement is, driver can't handle crossing 4G boundary in a single segment - but we can have multiple segments doing IOs all over the place. Here is the patch to fix it (suggested by Jens Axboe). ChangeSet@1.1472.1.7, 2004-08-16 12:32:14-04:00, akpm@osdl.org [PATCH] libata build fix drivers/scsi/libata-core.c: In function `swap_buf_le16': drivers/scsi/libata-core.c:2073: `words' undeclared (first use in this function) drivers/scsi/libata-core.c:2073: (Each undeclared identifier is reported only once Signed-off-by: Andrew Morton ChangeSet@1.1497, 2004-08-15 19:29:29-07:00, kaber@trash.net [NET_SCHED]: O(1) children vtoff adjustment in HFSC scheduler Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1496, 2004-08-15 19:29:12-07:00, kaber@trash.net [NET_SCHED]: Replace actlist by rbtrees in HFSC scheduler. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1495, 2004-08-15 19:28:45-07:00, kaber@trash.net [NET_SCHED]: Replace eligible list by rbtree in HFSC scheduler. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1494, 2004-08-15 19:28:06-07:00, kaber@trash.net [RBTREE]: Add rb_{first,last,prev,next} Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.1493, 2004-08-15 21:30:53-03:00, linville@tuxdriver.com [PATCH] Add IOI Media Bay to SCSI quirk list ChangeSet@1.1492, 2004-08-15 16:43:15-03:00, marcelo@logos.cnet Changed Makefile to 2.4.28-pre1 TAG: v2.4.28-pre1