ChangeSet@1.2119.1.68, 2004-12-13 21:07:52+00:00, rmk@flint.arm.linux.org.uk [ARM] Fix ZBOOT_ROM configuration Fix ZBOOT_ROM options help texts to describe what's going on there bettwe. Make ZBOOT_ROM depend on ZBOOT_ROM_TEXT and ZBOOT_ROM_BSS being different values. This allows all*config-created configurations to work where ZBOOT_ROM_TEXT and ZBOOT_ROM_BSS were both zero. ChangeSet@1.2173, 2004-12-13 09:02:47-08:00, js@linuxtv.org [PATCH] fix dvb-net Oops emardsofthome!net discovered an embarrasing bug in dvb_net.c where the NET_REMOVE_IF ioctl will cause an Oops when called with an invalid interface number. Signed-off-by: Johannes Stezenbach Signed-off-by: Linus Torvalds ChangeSet@1.2172, 2004-12-13 09:02:33-08:00, bjorn.helgaas@hp.com [PATCH] hisax: don't look at pci_dev->irq before calling pci_enable_device() The hisax driver looks at dev_avm->irq before calling pci_enable_device(), which means it requests the wrong IRQ. This patch fixes it. Thanks to Thorsten Doil for reporting the problem and testing the fix. Signed-off-by: Bjorn Helgaas Signed-off-by: Linus Torvalds ChangeSet@1.2171, 2004-12-13 08:35:16-08:00, akpm@osdl.org [PATCH] remove speedstep_coppermine docs Avoid documenting something which isn't there. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2170, 2004-12-13 08:35:05-08:00, james4765@gmail.com [PATCH] rocket: documentation changes Add some configuration information to Documentation/rocket.txt that was included with the external driver package. Signed-off-by: James Nelson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2169, 2004-12-13 08:34:52-08:00, magnus.damm@gmail.com [PATCH] documentation for mem= I recently learnt that limiting RAM with by using only "mem=xxxM" is no good on machines equipped with PCI. In my case (vanilla 2.6.9) the cardbus bridge on my laptop got mapped to the unused RAM area which resulted in wierd errors due to the collision. The right solution is to use "mem=" together with "memmap=" to mark the unused RAM area reserved. Henceforth I force the kernel to use 2016MiB by passing "mem=2016M memmap=32M#2016M" instead of just "mem=2016M". Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2168, 2004-12-13 08:34:39-08:00, sundarapandian@gmail.com [PATCH] Code to register amba serial console is missing Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2167, 2004-12-13 08:34:24-08:00, hunold@linuxtv.org [PATCH] dvb: av7110 driver update - av7110: fixed av7110_before_after_tune()/av7110_fe_lock_fix(): firmware >= 261d: wait for empty message queue, firmware <= 261c: wait 50ms - av7110: add __user and __iomem annotations, remove some unnecessary cast (patch by C.Y.M) - av7110: __av7110_send_fw_cmd(): added some sanity checks suggested by Werner Fin - av7110: added support for full-featured DVB-C cards: 13c2:0000 Siemens DVB-C (full-length card) VES1820/Philips CD1516 and 13c2:0003 Haupauge DVB-C 2.1 VES1820/ALPS TDBE2 - av7110: follow saa7146 changes, remove superflous casts, and other misc. minor cleanups - av7110: Fixed race condition between driver and av7110 while accessing the COMMAND register in DPRAM. See http://www.linuxtv.org/mailinglists/vdr/2004/01-2004/msg00331.html - budget: various cleanups by Adrian bunk Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2166, 2004-12-13 08:34:11-08:00, hunold@linuxtv.org [PATCH] dvb: frontend update - dib3000: support for dynamically i2c addresses of the demod - tda1004x: fixed firmware upload problems, forgot to include tune_settings for tda1004x, added setting to allow inversion of OCLK, set fesettings->min_delay_ms = 800 as suggested by Peter Siering - stv0297: code cleanup - mt312: added vp310 support - mt352: decrease verbosity Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2165, 2004-12-13 08:33:58-08:00, hunold@linuxtv.org [PATCH] dvb: dvb-core update - dvb-core: remove unused frequency bending code, simplify internal frontend handling - dvb-net: add ULE dvb-net support according to draft-ietf-ipdvb-ule-03 Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2164, 2004-12-13 08:33:45-08:00, hunold@linuxtv.org [PATCH] dvb: update dib-usb driver - added new usb ids for some more clones - added option to deliver the complete TS with USB2.0 devices - added support for the dib3000mc/p frontend driver Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2163, 2004-12-13 08:33:31-08:00, hunold@linuxtv.org [PATCH] dvb: B2C2 driver splitup - B2C2: move generic b2c2 code a separate module, added basic b2c2-usb support - [DVB] Skystar2: add mt312/vp310 support Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2162, 2004-12-13 08:33:18-08:00, hunold@linuxtv.org [PATCH] dvb: saa7146 driver + misc updates - saa7146: prefix IER_DISABLE and IER_ENABLE with SAA7146_, add SAA7146_ISR_CLEAR - dvb-bt8xx/dst: fix typo - cinergyT2: locking in SET_PARAMETERS and some VDR compatibility code for GET_EVENT (thanks to Stefan Lucke) Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2161, 2004-12-13 08:33:05-08:00, mpm@selenic.com [PATCH] Fix concurrent access to /dev/urandom This patch fixes a problem where /dev/urandom can return duplicate values when two processors read from it at the same time. It relies on the fact that we already are taking a lock in add_entropy_words(), and atomically hashes in some freshly mixed in data into the returned randomness. Signed-off-by: Matt Mackall Signed-off-by: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2160, 2004-12-13 08:32:52-08:00, pavel@ucw.cz [PATCH] swsusp: fix types This fixes types so that sparse has less stuff to complain about. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2159, 2004-12-13 08:32:39-08:00, pavel@ucw.cz [PATCH] swsusp: Fix header typo Fixes typo in header, please apply, Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2158, 2004-12-13 08:32:26-08:00, pavel@ucw.cz [PATCH] swsusp fixes: fix confusing printk This fixes confusing printk. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2157, 2004-12-13 08:32:14-08:00, pavel@ucw.cz [PATCH] swsusp bugfixes: fix memory leak This fixes memory leak when we are low on memory during suspend. Ouch and nr_needed_pages is only used twice, and only written :-(. I guess that can wait for 2.6.10. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2156, 2004-12-13 08:32:01-08:00, pavel@ucw.cz [PATCH] swsusp bugfixes: do not oops when not enough memory during resume This prevents oops when not enough memory is available during resume. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2155, 2004-12-13 08:31:48-08:00, pluto@pld-linux.org [PATCH] gcc4 fixes Fix the below: drivers/atm/zatm.c:1608: error: invalid lvalue in assignment drivers/atm/iphase.c:623: error: invalid storage class for function 'ia_pkt_tx' drivers/cdrom/sbpcd.c: In function 'get_state_T': drivers/cdrom/sbpcd.c:1168: error: invalid storage class for function 'cmd_out_T' drivers/cdrom/sbpcd.c: In function 'cmd_out_T': drivers/cdrom/sbpcd.c:1317: error: invalid storage class for function 'cc_DriveReset' drivers/media/video/saa7134/saa7134-core.c:90: error: static declaration of 'saa7134_devcount' follows non-static declaration drivers/media/video/saa7134/saa7134.h:479: error: previous declaration of 'saa7134_devcount' was here drivers/net/acenic.c:488: error: invalid storage class for function 'ace_watchdog' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2154, 2004-12-13 08:31:34-08:00, trini@kernel.crashing.org [PATCH] Add missing __KERNEL__ (or other) protections As of 2.6.10-rc3, the following is needed to allow various userland packages (sysvinit, dhcp, ppp, libcap, libpcap, lilo) to compile as parts that userland needs (e.g. for ioctls) is in files with stuff userland isn't allowed to see. This adds __KERNEL__ around and some defines ( isn't needed by userland, and is unhappy right now). sysvinit and some other packages need for HDIO_DRIVE_CMD and other IOCTL things. In we were unsafely typedef'ing __le64/__be64 as __u64 only exists when __GNUC__ && !__STRICT_ANSI__ (causing libcap to fail, for example). Finally, provides routines userland simply cannot use on all arches, but is needed by iputils for example. While not all arches put __KERNEL__ around their header, on MIPS including this header currently blows up the build. Signed-off-by: Tom Rini Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2153, 2004-12-13 08:31:21-08:00, bjorn.helgaas@hp.com [PATCH] Documentation for ia64 serial device name changes Document how Linux/ia64 names serial devices and how to use them as console devices. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2152, 2004-12-13 08:31:08-08:00, anton@samba.org [PATCH] ppc64: pSeries shared processor fixes It turns out there are more issues with our VPA code: 1. vpa_init doesnt report errors when it fails. This was masking a bug where the VPA spanned 2 pages and phyp failed to register it. 2. We call idle_setup before we initialise the boot cpus vpa. This means we never select the shared processor idle loop. 3. We dont call vpa_init on UP kernels. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2151, 2004-12-13 08:30:55-08:00, benh@kernel.crashing.org [PATCH] ppc64: Workaround PCI issue on g5 ppc64 has a global called "pci_probe_only" which, when set, prevents the arch PCI code from calling pci_assign_unassigned_resources(). This was cleared by pmac so far, but a bug in the definition of the variable make that ineffective until 2.6.10, and so we never called pci_assign_unassigned_resources(). With 2.6.10, that bug was fixed and so we now call it, which results in some problems. Some devices who have perfectly valid assigned addresses by firmware end up beeing moved around anyway, which is a BAD thing can can break boot on some machines since it breaks the relationship between addresses in Open Firmware device-tree and actual location of PCI devices. (Some low level things like the PIC are ioremap'ed based on their OF address, way before the PCI based ASIC hosting them has been found). This also break the "offb" default framebuffer driver since the video card ends up beeing moved around as well. For now, the fix is to set pci_probe_only on pmac, thus reverting to the old behaviour. In the long run, it would be interesting to "fix" pci_assign_unassigned_resources() so that it does what it's name claims, and only assigns things that have been left unassigned instead of moving things around gratuituously... Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2150, 2004-12-13 08:30:42-08:00, hugh@veritas.com [PATCH] VmLib wrapped: mprotect flags Sometimes /proc//status shows VmLib: 42949..... kB. mprotect_fixup must note oldflags on entry: if vma_merge is successful, vma->vm_flags afterwards may be either the oldflags or the newflags, and the extent of the change will be less than the extent of the vma. And let's use unsigned long for these flags throughout. Signed-off-by: Hugh Dickins Acked-by: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2149, 2004-12-13 08:30:29-08:00, hugh@veritas.com [PATCH] VmLib wrapped: executable brk In some cases /proc//status shows VmLib: 42949..... kB. If READ_IMPLIES_EXEC then the break area is VM_EXEC, but omitted from exec_vm since do_brk contains no __vm_stat_account call. Later munmaps count its pages out of exec_vm, hence (exec_vm - VmExe) can go negative. do_brk is right not to call __vm_stat_account, its pages shouldn't need to be counted. What's wrong is that __vm_stat_account is counting all the VM_EXEC pages, whereas (to mimic 2.4 and earlier 2.6) it should be leaving VM_WRITE areas and non-vm_file areas out of exec_vm. VmLib may still appear larger than before - where a READ_IMPLIES_EXEC personality makes what was a readonly mapping of a file now executable e.g. /usr/lib/locale stuff. And a program which mprotects its own text as writable will appear with wrapped VmLib: sorry, but while it's worth showing ordinary programs as ordinary, it's not worth much effort to avoid showing odd ones as odd. Signed-off-by: Hugh Dickins Acked-by: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2148, 2004-12-13 08:30:17-08:00, hugh@veritas.com [PATCH] shmctl SHM_LOCK perms Michael Kerrisk has observed that at present any process can SHM_LOCK any shm segment of size within process RLIMIT_MEMLOCK, despite having no permissions on the segment: surprising, though not obviously evil. And any process can SHM_UNLOCK any shm segment, despite no permissions on it: that is surely wrong. Unless CAP_IPC_LOCK, restrict both SHM_LOCK and SHM_UNLOCK to when the process euid matches the shm owner or creator: that seems the least surprising behaviour, which could be relaxed if a need appears later. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2147, 2004-12-13 08:30:04-08:00, kraxel@bytesex.org [PATCH] uml: ramdisk config fix ObviouslyCorrect[tm] buildfix ;) Signed-off-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2146, 2004-12-13 08:29:51-08:00, heiko.carstens@de.ibm.com [PATCH] fix ext2/ext3 memory leak The patch below fixes an ext2/ext3 memory leak: the *_fill_super functions allocate percpu data structures but don't free them in *_put_super. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2145, 2004-12-13 08:29:38-08:00, akpm@osdl.org [PATCH] do_task_stat() use pid_alive() Use pid_alive() rather than testing for a zero value of ->pid. Is the right thing to do and addresses an oops dereferencing real_parent which one person reported. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2144, 2004-12-13 08:29:25-08:00, david-b@pacbell.net [PATCH] reduce ext3 log spamming (blank lines) When drives go offline, e.g. usb-storage disconnect, the upper layers don't behave very intelligently yet: ext3 over scsi keeps retrying reads, logging three lines for each error: 10:58:31 scsi0 (0:0): rejecting I/O to dead device 10:58:31 EXT3-fs error (device sda1): ext3_find_entry: reading directory #18089296 offset 0 10:58:31 10:59:47 EXT3-fs error (device sda1): ext3_find_entry: reading directory #18089296 offset 0 This patch shrinks that log spam by the trivial third, getting rid of those needless blank lines. It's not clear to me why the "no such device" errors don't immediately make ext3 (or is it the block layer?) give up ... maybe someone else can make Linux not retry after those errors. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2143, 2004-12-13 08:29:13-08:00, akpm@osdl.org [PATCH] direct-io: set PF_SYNCWRITE We need to set the PF_SYNCWRITE when performing direct-io writes. Otherwise the anticipatory scheduler exhibits bad read-starves-write problems. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2142, 2004-12-13 08:29:00-08:00, paulus@samba.org [PATCH] ppc64: make UP kernel run on POWER4 logical partition Recently I tried booting a UP kernel on a 1-processor logical partition on a POWER4 system. It failed because the CPU we happened to be running on was CPU 2, but hard_smp_processor_id() is defined to 0 for !CONFIG_SMP. (Note that this code runs quite early, as part of init_IRQ, so hard_smp_processor_id() should be the physical ID of the boot cpu.) This patch does a minimal fix to make it work. I think this patch should go in 2.6.10. Ultimately I think the hard_smp_processor_id() definition should be removed from include/linux/smp.h, but that carries a risk of breaking other architectures and probably shouldn't be done pre 2.6.10. Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2141, 2004-12-12 23:28:56-08:00, axboe@suse.de [PATCH] highmem.c: fix bio error propagation Found a subtle bug that caused mount errors on a SATA drive with barriers on reiser and ext3, where it should have recovered and just turned off barriers. The problem is that the EOPNOTSUPP error isn't being propagated properly to the bounced bio. This patch fixes that by correctly passing error all the way down. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds ChangeSet@1.2140, 2004-12-12 22:26:09-08:00, paulus@samba.org [PATCH] ppc64: make sure lppaca doesn't cross page boundary This patch is from Will Schmidt , with some extra comments from me. On iSeries and on POWER5 machines, there is a data structure which is used for communication between the hypervisor and the kernel, called the `lppaca'. The kernel tells the hypervisor where it is, and the hypervisor requires that it doesn't cross a page boundary. With other changes in the last few months we have ended up with a situation where it could cross a page boundary. This patch increases the alignment requirement for the struct to make sure that it can't cross a page boundary. This is a bug fix and should go into 2.6.10. Signed-off-by: Will Schmidt Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds ChangeSet@1.2138, 2004-12-12 21:13:18-06:00, sfrench@sambaltcdom.austin.ibm.com [CIFS] Fix CIFS_MAX_MSGSIZE so it can be configured at module_install time, allowing buffer size to be changed Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2119.8.4, 2004-12-12 12:31:12-08:00, bunk@stusta.de [PATCH] fm801_gp_probe: fix use after free The patch below by "Petri T. Koistinen" in Rusty's trivial patches is IMHO a candidate for 2.6.10 . Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds ChangeSet@1.2119.8.3, 2004-12-12 10:38:02-08:00, torvalds@ppc970.osdl.org x86 sysenter: clear %ebp on exit. It contains the thread info pointer. That's not something that user mode can really use for anything interesting, but it's also not something that user mode should ever really see. Pointed out by Brad Spender as being in PaX. ChangeSet@1.2135, 2004-12-12 00:06:48-06:00, sfrench@sambaltcdom.austin.ibm.com [CIFS] Remove sparse warning in use of cifs_write function Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2134, 2004-12-11 17:04:11-06:00, sfrench@sambaltcdom.austin.ibm.com [CIFS] remove sparse warning Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2133, 2004-12-11 16:27:16-06:00, stevef@smfhome.smfdom Add support for module init parms for number of small and large cifs network buffers and for maximum number of simultaneous requests. Fix directio of userbuffers to use copy_to_user. Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2119.1.67, 2004-12-11 17:07:00+00:00, rmk@flint.arm.linux.org.uk [ARM] Fix compiler warning for set_speed irda method. ChangeSet@1.2119.1.66, 2004-12-10 21:29:56+00:00, rmk@flint.arm.linux.org.uk [ARM] Add resources for sa11x0ir device. ChangeSet@1.2119.9.9, 2004-12-10 20:12:27+01:00, bzolnier@trik.(none) [ide] remove obsolete comment from ide-probe.c Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2119.1.65, 2004-12-10 19:11:32+00:00, rmk@flint.arm.linux.org.uk [ARM] Add platform-based IrDA device support. Move the platform specific IrDA support code out of sa1100_ir into the platform support files. This allows sa1100_ir to build again. ChangeSet@1.2119.9.8, 2004-12-10 20:07:51+01:00, bzolnier@trik.(none) [ide] fix creating of /proc/ide/ entries for legacy VLB modules Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2131, 2004-12-10 12:57:28-06:00, sfrench@sambaltcdom.austin.ibm.com [CIFS] Allow peek to return less than smb header so we do not prematurely kill session to server when socket stack is busy. Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2119.9.7, 2004-12-10 19:56:43+01:00, bzolnier@trik.(none) [ide] final polish on disk ioctl documentation From: Edward Falk Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2119.9.6, 2004-12-10 19:45:40+01:00, bzolnier@trik.(none) [ide] ide-cd: fix possible race in PIO mode From: Alan Cox When we issue an ide command the status bits don't become valid for 400nS. In the DMA case ide_execute_command handles this but in the PIO case we don't do the needed locking, use OUTBSYNC to avoid posting or delay. This means that in some situations we can execute the command handler in PIO mode before the command status bits are valid and the handler may read and act wrongly. Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2119.9.5, 2004-12-10 19:28:35+01:00, bzolnier@trik.(none) [ide] alim15x3: add support for ULi M5228 From: Clear Zhang Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2119.9.4, 2004-12-10 19:15:16+01:00, bzolnier@trik.(none) [ide] atiixp: add new PCI identifier From: Pascal Lengard Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2119.9.3, 2004-12-10 19:07:17+01:00, bzolnier@trik.(none) [ide] pdc202xx_old: fix cable detection pdc202xx_old_cable_detect() always returns '0' (which means 80c cable) due to a sloppy coding - result of CIS & mask is truncated to 8 bits although CIS holds cable info in bits 10-11. Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2119.9.2, 2004-12-10 19:02:19+01:00, bzolnier@trik.(none) [ide] remove SAMSUNG CD-ROM SC-148F from the DMA blacklist Reported to work OK by Alexander E. Patrakov . Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2119.8.2, 2004-12-10 09:57:53-08:00, torvalds@ppc970.osdl.org Clean up open_exec()/kmalloc() error case handling. It's a purely theoretical bug, since the kmalloc() failure that might "leak" file descriptors cannot actually happen (we do not ever fail small GFP_KERNEL allocations), but it's good to do things properly. Noted by Brad Spender. ChangeSet@1.2119.9.1, 2004-12-10 18:56:22+01:00, bzolnier@trik.(none) [ide] remove PLEXTOR CD-R PX-W8432T from the DMA blacklist Reported to work OK by Junio C Hamano , DervishD and Anton <_xman_@mail.ru>. Fixes bugzilla bug #3730. Signed-off-by: Bartlomiej Zolnierkiewicz ChangeSet@1.2119.8.1, 2004-12-10 09:52:42-08:00, torvalds@ppc970.osdl.org Make sure VC resizing fits in s16. Noted by Georgi Guninski ChangeSet@1.2130, 2004-12-10 10:46:32-06:00, stevef@smfhome.smfdom [CIFS] Do not block on FindNotify response Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2119.1.64, 2004-12-10 16:33:49+00:00, nico@org.rmk.(none) [ARM PATCH] 2301/1: fix PXA definition of PSSR_OTGPH Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King ChangeSet@1.2119.1.63, 2004-12-10 16:29:17+00:00, dvrabel@com.rmk.(none) [ARM PATCH] 2300/1: IXP4xx: remove minor type mismatch warnings Patch from David Vrabel Remove some minor type mismatch warnings from some IXP4xx specific code. Signed-off-by: David Vrabel Signed-off-by: Russell King ChangeSet@1.2119.1.62, 2004-12-10 16:24:25+00:00, ben-linux@org.rmk.(none) [ARM PATCH] 2299/1: S3C2410 - pm debug patch Patch from Ben Dooks If CONFIG_S3C2410_PM_CHECK is set and CONFIG_S3C2410_PM_DEBUG is not set, then the pm.c file will not build as uart_save[] is not defined. Signed-off-by: Dimitry Andric Signed-off-by: Ben Dooks Signed-off-by: Russell King ChangeSet@1.2119.1.61, 2004-12-09 20:08:11-08:00, torvalds@ppc970.osdl.org Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6 into ppc970.osdl.org:/home/torvalds/v2.6/linux ChangeSet@1.2128, 2004-12-09 18:50:28-06:00, sfrench@sambaltcdom.austin.ibm.com [CIFS] Check right mid state on hung network responses. Fix remote dnotify to be disabled by default. Fix dnotify endianness. Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2119.1.59, 2004-12-09 13:49:32-08:00, greg@kroah.com USB: fix another sparse warning in the USB core Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.58, 2004-12-09 13:47:47-08:00, nacc@us.ibm.com [PATCH] USB: add wake-up for waitqueues in usbfs_remove_file() to fix bug 387 Description: Bug 387 (http://bugzilla.kernel.org/show_bug.cgi?id=387) is fixed by the attached patch, which sends waitqueue wake-ups to all the appropriate wait-queue entries when a device is removed from the system. Signed-off-by: Nishanth Aravamudan Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.57, 2004-12-09 12:41:33-08:00, greg@kroah.com USB: fix obvious build error in hc_chrisv10.c driver Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.56, 2004-12-09 12:41:17-08:00, greg@kroah.com USB: removed unused hc_sl811 driver from the tree Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.55, 2004-12-09 12:41:01-08:00, greg@kroah.com USB: fix sparse warning in ehci-hcd driver. Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.54, 2004-12-09 12:40:44-08:00, greg@kroah.com USB: fix sparse warnings in sl811-hcd driver. Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.53, 2004-12-09 12:35:50-08:00, david-b@pacbell.net [PATCH] USB: sl811-hcd driver, replaces hc_sl811 This patch provides a new "sl811-hcd" driver, which should replace the older one from Cypress (which has been broken for ages, even on SA-1100). Key features of this new driver: - Small, relatively tight code; - Uses the 2.6 platform_device and usbcore HCD infrastructures; - Compiles (x86, ARM) and works (ARM/PXA255); - Passed a day's worth of "usbtest" stress testing (on 2.6.9). I've enumerated over a dozen different devices with it, and actually tested mice, hubs, keyboards, and usb-storage. There's a hardware erratum that prevents this chip from working with certain external hubs. There's scope yet for some performance work here; and some IRQ quirks linger. This PIO-only driver should serve as a model for some other non-DMA USB host controllers (like isp1161, isp1362, td243) used in embedded Linuxes ... in particular, showing how to maintain async and periodic schedules without pointless emulation of OHCI DMA queues and/or registers. The driver should handle ISO, but since it doesn't implement the special urb->iso_frame_desc[] "pseudo-queue" model (and since Linux can't guarantee low enough IRQ latencies!), ISO is disabled. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.52, 2004-12-09 12:23:36-08:00, david-b@pacbell.net [PATCH] USB: OHCI "resume"/smp fix I noticed an SMP deadlock when connecting devices to an autosuspended root hub. This fix just makes the OHCI hub status reporting logic (used exclusively by khubd) be a NOP until after the worker task (keventd) finishes resuming the port, so they can't deadlock. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.51, 2004-12-09 12:23:20-08:00, bunk@stusta.de [PATCH] USB uhci-debug.c: remove an unused function (fwd) The patch below removes an unused function from drivers/usb/host/uhci-debug.c Signed-off-by: Adrian Bunk Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.50, 2004-12-09 12:23:06-08:00, david-b@pacbell.net [PATCH] USB: EHCI qh update race fix This makes the EHCI driver stop trying to update a live QH ... it's not like OHCI, that can't be done safely because of a hardware race. The fix: - Unlinks the QH before updating it; only the tail can safely be updated "live", not the queue head. The async schedule (all control/bulk QHs) and periodic schedule (interrupt QH) work a bit differently ... high bandwidth transfers will hiccup. - Moves "update QH" and "clear toggle" logic into one new qh_refresh() routine, used in several places. The race shows readily enough under load with the right hardware. The controller silicon might be relatively slow, or maybe it's the bus that's slow/busy: Host Controller --- ---------- reads two TD pointers update two TD pointers wmb() activate QH reads rest of QH Net result is that the HC treated old TD pointers as valid, and things started misbehaving. Busy controllers would misbehave worse; some systems wouldn't notice more than a slowdown, especially with light USB loads. This affects behavior in two cases. The uncommon one is when an endpoint gets an error and halts. The more common one happens when the controller runs off the end of its queue and overlays an inactive "dummy" TD into the QH ... something the spec says shouldn't happen, but which more silicon seems to be doing. (Presumably to reduce DMA chatter.) Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.49, 2004-12-09 12:22:49-08:00, stern@rowland.harvard.edu [PATCH] USB UHCI: minor bugfix for port resume This patch fixes two small problems in the port suspend/resume handling for the UHCI driver. There were a couple of spots where I neglected to store I/O addresses in unsigned _long_ variables (required for 64-bit architectures). And it turns out the host controller will continue to indicate a resume is in progress for a few microseconds after it has been turned off, so an extra delay is needed. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.48, 2004-12-09 12:22:35-08:00, rddunlap@osdl.org [PATCH] PCI/x86-64: build with PCI=n Fix (most of) x64-64 kernel build for CONFIG_PCI=n. Fixes these 2 errors: 1. arch/x86_64/kernel/built-in.o(.text+0x8186): In function `quirk_intel_irqbalance': : undefined reference to `raw_pci_ops' Kconfig change: 2. arch/x86_64/kernel/pci-gart.c:194: error: `pci_bus_type' undeclared (first use in this function) Still does not fix this one: drivers/built-in.o(.text+0x3dcd8): In function `pnpacpi_allocated_resource': : undefined reference to `pcibios_penalize_isa_irq' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman ChangeSet@1.2119.1.47, 2004-12-09 08:19:26-08:00, pisa@cmp.felk.cvut.cz [PATCH] VM86 interrupt emulation fix Fixes faulty IRQ_NONE value returning by VM86 irq_handler(). The IRQ source is blocked as well until userspace confirms processing. This should enable to use VM86 code even for level triggered interrupt sources. Signed-off-by: Pavel Pisa Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.46, 2004-12-08 23:22:06-08:00, eradicator@gentoo.org [SPARC]: Make some asm headers more userland friendly. Signed-off-by: David S. Miller ChangeSet@1.2119.1.45, 2004-12-08 23:02:03-08:00, davem@nuts.davemloft.net [SPARC]: Adjust 32-bit ELF_ET_DYN_BASE. We were using 0x08000000 instead of TASK_UNMAPPED_BASE so that running something like "/lib/ld-linux.so.2 emacs" would work. The issue there was that wherever /lib/ld-linux.so.2 gets mapped (controlled by ELF_ET_DYN_BASE), that is where the BSS start for the process ends up. Now, emacs allocates dynamic memory for LISP objects from the BSS, and needs the top 4 bits of the virtual address to be clear so that it can encode LISP type and GC marking information there. But making this obscure emacs case work breaks lots of other stuff. For example, programs with a reasonably large data section fail to load via direct ld.so interpreter execution because the data section is large enough to begin overlapping with the ELF_ET_DYN_BASE area. The /lib/ld-linux.so.2 emacs case does not work on a lot of platforms due to this issue, including i386, so it is not worth making work on sparc either. It is indeed useful sometimes when debugging a new experimental build of glibc for example, but people doing that can hack the value of ELF_ET_DYN_BASE in their kernels. Perhaps at some point we will make a sysctl controllable value. Signed-off-by: David S. Miller ChangeSet@1.2119.7.9, 2004-12-08 22:55:27-08:00, wensong@linux-vs.org [IPVS] add a sysctl variable to expire quiescent template The patch is from Horms Signed-off-by: Horms Signed-off-by: David S. Miller ChangeSet@1.2119.7.7, 2004-12-08 22:00:32-08:00, davem@nuts.davemloft.net [IPV6]: Do not use udp_poll for RAW sockets. Signed-off-by: David S. Miller ChangeSet@1.2119.7.6, 2004-12-08 21:37:13-08:00, solar@openwall.com [TCP]: Missing KERN_INFO in remotely triggerable printk. Signed-off-by: David S. Miller ChangeSet@1.2119.1.44, 2004-12-08 21:32:16-08:00, jurij@woodyd.org [SUNSAB]: Fix serial break handling. We forget to check the BRK condition in the interrupt status register when deciding to call receive_chars() or not, which is where BRK handling occurs. Signed-off-by: David S. Miller ChangeSet@1.2119.1.43, 2004-12-08 21:15:08-08:00, davem@nuts.davemloft.net [SPARC64]: Update defconfig. Signed-off-by: David S. Miller ChangeSet@1.2119.7.5, 2004-12-08 20:35:33-08:00, shemminger@osdl.org [PKT_SCHED]: netem forgets to restart device after inserting packets The version of netem in 2.6.10 moves packets from the delayed queue to the qdisc in a timer interrupt. But it forgot to force the device to pick them up. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller ChangeSet@1.2119.7.4, 2004-12-08 20:33:03-08:00, kaber@trash.net [PKT_SCHED]: Fix oops in ipt action error path. This patch fixes an oops when the ipt action is used with a non-existant iptables target. It tries to log t->u.kernel.target->name, u.kernel.target is part of a union and as long as the target wasn't successfully loaded contains the name of the target, using it as a pointer results in a crash. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.2119.7.3, 2004-12-08 20:31:35-08:00, jt@hpl.hp.com [IRDA]: Use kill_urb() in irda-usb * change comment about Sigmatel now that there is a driver * convert to new module_param * places where urb is unlinked synchronously, use usb_kill_urb because that is now a runtime warning. Original patch from Stephen Hemminger Signed-off-by: Stephen Hemminger Signed-off-by: Jean Tourrilhes Signed-off-by: David S. Miller ChangeSet@1.2119.7.2, 2004-12-08 20:29:41-08:00, jt@hpl.hp.com [IRDA]: Use kill_urb() in stir4200 USB changed behaviour of unlink_urb so that it gives warning and backtrace when being used synchronously. The correct current behaviour is to us kill_urb in that case. Original patch from Stephen Hemminger Signed-off-by: Stephen Hemminger Signed-off-by: Jean Tourrilhes Signed-off-by: David S. Miller ChangeSet@1.2119.7.1, 2004-12-08 20:28:20-08:00, jt@hpl.hp.com [IRDA]: Try to fix the worst abuse of the pci init code in via_ircc Bugfix suggested by Arkadiusz Miskiewicz. Signed-off-by: Jean Tourrilhes Signed-off-by: David S. Miller ChangeSet@1.2119.1.42, 2004-12-08 20:22:28-08:00, davem@nuts.davemloft.net [SPARC]: asm/mostek.h needs asm/io.h Noticed by Bob Breuer. Signed-off-by: David S. Miller ChangeSet@1.2119.1.41, 2004-12-08 13:37:53-08:00, kaber@trash.net [NETFILTER]: Fix memory leak in ip_conntrack_ftp Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.2119.1.40, 2004-12-08 13:03:03-08:00, davem@nuts.davemloft.net [NET]: CMSG compat code needs signedness fixes too. Signed-off-by: David S. Miller ChangeSet@1.2119.1.39, 2004-12-08 12:49:21-08:00, herbert@gondor.apana.org.au [NET]: Fix CMSG validation checks wrt. signedness. Noticed by Georgi Guninski. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller ChangeSet@1.2119.1.38, 2004-12-08 12:39:15-08:00, davem@nuts.davemloft.net [IPV4]: Do not leak IP options. If the user makes ip_cmsg_send call ip_options_get multiple times, we leak kmalloced IP options data. Noticed by Georgi Guninski. Signed-off-by: David S. Miller ChangeSet@1.2119.1.37, 2004-12-08 12:30:12-08:00, yoshfuji@linux-ipv6.org [IPV6]: Fix check if we're a router. Signed-off-by: Hideaki YOSHIFUJI Signed-off-by: David S. Miller ChangeSet@1.2119.1.36, 2004-12-08 07:41:46-08:00, piggin@cyberone.com.au [PATCH] Fix broken domain debugging (aka "isolcpus option broken") Fix an oops in sched_domain_debug when using the isolcpus= option. Also move a debug check for validating groups into the "for-each-group" loop, where it should be. Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.35, 2004-12-08 07:38:59-08:00, torvalds@ppc970.osdl.org Revert isolcpus option fix, pending better fix from Nick. The real bug was in the debugging code, not the actual domain data structure setup. Cset exclude: sivanich@sgi.com[torvalds]|ChangeSet|20041207160443|30564 ChangeSet@1.2119.6.2, 2004-12-07 21:05:37-08:00, kaber@trash.net [PKT_SCHED]: Fix hard freeze with QoS in 2.6.10-rc3 The problem is in tcf_action_copy_stats, it assumes a->priv has the same layout as struct tcf_act_hdr, which is not true for struct tcf_police. This patch rearranges struct tcf_police to match tcf_act_hdr. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller ChangeSet@1.2119.6.1, 2004-12-07 21:03:48-08:00, mitch@sfgoth.com [IPV4]: Do not use udp_poll for RAW sockets. Signed-off-by: Mitchell Blank Jr Signed-off-by: David S. Miller ChangeSet@1.2119.5.13, 2004-12-07 18:35:14-08:00, torvalds@ppc970.osdl.org Revert recent ext3_dx_readdir changes They turn out to be buggy, and result in the same filename being reported twice when htree directory indexing is enabled. Thanks for Kris Karas for helping chase it down. Also reported by Holger Kiehl. Cset exclude: akpm@osdl.org[torvalds]|ChangeSet|20041108040801|49372 ChangeSet@1.2119.1.31, 2004-12-07 19:23:59-05:00, dougg@torque.net [PATCH] off-by-1 libata-scsi INQUIRY VPD pages 0x80 and 0x83 I have some code (in sginfo) that requests the first 4 bytes of SCSI INQUIRY VPD pages to get their length then asks for that exact length in a follow up request to fetch the payload. Just like I saw with 36 byte standard INQUIRYs (no fixed) I get a buffer full or zeroes. BTW SCSI standards dictate that in situations where the allocation length (in the cdb) is less than what is needed that what can be sent shall be sent (i.e. truncated and without any error indication or modification to the part of the response returned). In other words it is up the the application client to take remedial action. Changelog: - fix off-by-1 allocation length issue with SCSI INQUIRY VPD pages 0x80 and 0x83 Signed-off-by: Jeff Garzik ChangeSet@1.2119.5.12, 2004-12-07 16:23:27-08:00, kraxel@bytesex.org [PATCH] msp3400 quick fix The new "simpler" opmode added by the recent merge from ivtv breaks msp3400 support for other tv cards. Not figured yet why. This patch disables the "simpler" mode by default (can still be enabled by insmod option) as quick fix for 2.6.10. Signed-off-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.11, 2004-12-07 16:23:12-08:00, hunold@linuxtv.org [PATCH] dvb: follow changes in dvb-ttpci and budget drivers - [DVB] dvb-ttpci, budget: updated to fix problems with some CAMs on KNC1 cards - [DVB] dvb-ttpci, budget: make needlessly global code static, whitespace and newline cleanups, thanks to Adrian Bunk - [DVB] dvb-ttpci, budget: follow frontend changes in driver - [DVB] dvb-ttpci, budget: fix drivers to use new wait_for_debi_done(...,nobusywait) routine. Signed-off-by: Michael Hunold Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.10, 2004-12-07 16:22:59-08:00, hunold@linuxtv.org [PATCH] dvb: remove dead files - [DVB] remove obsolete grundig_29504-401, grundig_29504-491, alps_tdlb7 and alps_tdmb7 frontend drivers - [DVB] remove sp887x firmware file, it's unused thanks to firmware_class Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.9, 2004-12-07 16:22:44-08:00, hunold@linuxtv.org [PATCH] dvb: core changes - [DVB] dvb-core: follow Linux coding style, kill dvb_ksyms.c and move the EXPORT_SYMBOLs to the files where the functions are, thanks to Adrian Bunk - [DVB] dvb-core: #if 0'ing unused code, make needlessly global code static, whitespace and newline cleanups, thanks to Adrian Bunk - [DVB] dvb_ca_en50221.c: support for KNC1/Cinergy CI modules, fix segfaults, enhanced poll_slot_status to support non-IRQ interfaces, Fix module usage count problem - [DVB] dvb-frontend.c: core changes to support the refactorized frontend drivers Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.8, 2004-12-07 16:22:31-08:00, hunold@linuxtv.org [PATCH] dvb: dibusb driver update - [DVB] dibusb: added remote control event handling, thanks to David Matthews. - [DVB] dibusb: added support for special Artec devices (with AN2235 usb controller) - [DVB] dibusb: enable several new devices (even the broken Artec T1) - [DVB] dibusb: #if 0'ing unused code - [DVB] dibusb: follow frontend changes Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.7, 2004-12-07 16:22:17-08:00, hunold@linuxtv.org [PATCH] dvb: Cinergy T2 update - [DVB] cinergyT2: update driver to exploit hardware capabilities Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.6, 2004-12-07 16:22:05-08:00, hunold@linuxtv.org [PATCH] dvb: follow frontend changes in drivers - [DVB] dvb-ttusb-dec, dvb-ttusb-budget, skystar2, bt878 + dvb-bt8xx: follow frontend changes in driver - [DVB] DST isn't a real frontend, it's an interface to a frontend microcontroller, so move the hardware dependend stuff to the right place Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.5, 2004-12-07 16:20:46-08:00, hunold@linuxtv.org [PATCH] dvb: saa7146 changes - [DVB] saa7146_core.c, saa7146_video.c: MODULE_PARM -> module_param, added non-busy waiting option for saa7146_wait_for_debi_done(), make needlessly global code static and remove unused code (thanks to Adrian Bunk ) Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.4, 2004-12-07 16:20:33-08:00, hunold@linuxtv.org [PATCH] dvb: frontend driver refactoring - [DVB] reafactor or add the following frontend drivers: at76c651, cx22700, ves1x93, ves1820, tda80xx, tda8083, cx22702, tda1004x, tda10021, cx24110, dvb_dummy_fe, l64781, mt312, mt352, stv0299, sp887x, stv0297, nxt6000, sp8870 - [DVB] remove dib3000mb from frontends, it's handled by the hw dependent driver now Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.3, 2004-12-07 16:19:51-08:00, hunold@linuxtv.org [PATCH] dvb: collateral frontend changes - [DVB] get_dvb_firmware: rework to reflect new frontend design, added additional firmware location - [DVB] Kconfig and Makefile changes all over the place, remove Makefile.lib Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.2, 2004-12-07 16:19:34-08:00, hunold@linuxtv.org [PATCH] dvb: documentation update Start of a big DVB update. The reasons for revamping the DVB frontend architecture: Just as analog TV cards, DVB cards need some sort of tuner to tune to the desired frequency of the digital transponder. Tuning alone doesn't give you a digital DVB datastream, however, you need a demodulator as well. The combination of tuner and demodulator is called frontend in the DVB world. Tuner and demodulator are both accessed via the serial i2c bus on all DVB cards out there. So, technically a frontend consists of two i2c helper chipsets. In former times when there was only a handful of different DVB cards, the frontend was encapsulated in one tin box. Some people had the idea that there should be one "frontend driver" instead of dedicated tuner and demodulator drivers. A bad idea. As time went on, different manufacturers used the same tuner and demodulator combination, but used a different wiring for the tuner or did other technical changes. The only possibility to support different cards with one combined frontend driver was to add hardware dependent tuner code inside the generic i2c frontend drivers. Yuck. So there was a need for communication between the i2c frontend driver and the hardware depenedent driver, for example to exchange initialization code for the tuner. Unfortunately, the i2c infrastructure is one way, from the i2c client to the i2c adapter using a non-typesafe ioctl() like interface, which is ugly by itself. Greg K-H and others refused the idea to add an iotctl() like interface from the i2c adapter to the i2c client and instead proposed to use a typesafe interface instead. We all agreed with that. The existing i2c infrastructure heavily depends on the probing facility, ie. clients probe for their existence on i2c busses. This is dumb for most i2c busses out there that sit on dedicated hardware. A DVB card is uniquely identified with pci or usb subvendor and subsystem ids, so on that particular bus we exactly *know* which kinds of i2c helper chipsets sit on there. Up to now this wasn't a problem, because we could fix all conflicts manually until half a year ago. By that date, we found two different DVB designs which used different demodulators that unfortunately use the same i2c address and which cannot be distinguished by hardware tricks (ie. different number of registers, some fixed hw dependent register,...) Getting a usable DVB card depended on the load order of the modules, because the i2c core probed the demodulator drivers one after another and the first one won the race. Compiling all drivers statically into the kernel resulted in non-working cards. Our solution is as follows: we agreed to keep the basic underlying kernel i2c infrastructure, but we decided not to register our bussed and chipsets to the kernel i2c "probing" infrastructure. Instead, we killed the tuner parts of the frontend drivers and put them into the dedicated hardware drivers (this is were they technically belong, they are highly hardware dependent) and we changed the frontend drivers to pure demodulator drivers (which are hardware independend). There is now a type-safe functional dependency between the drivers and the demodulator drivers, the drivers explicitely ask the demodulator drivers to attach to their i2c bus. The only negative aspect of that approach is that for some hardware there are now more dependencies to demodulator drivers than needed, ie. a small amount of memory is wasted. This patch: - [DVB] cards.txt: added the USB devices to the card-list - [DVB] README.dibusb: follow changes in dibusb-driver Signed-off-by: Michael Hunold Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.5.1, 2004-12-07 16:08:40-08:00, torvalds@ppc970.osdl.org Revert double patch application. Heh. usually these come through Andrew, but this time it was all me. Noted by BenH. Cset exclude: paulus@samba.org[torvalds]|ChangeSet|20041207181541|44524 ChangeSet@1.2119.1.30, 2004-12-07 18:54:34-05:00, jgarzik@pobox.com [libata] only DMA map data for DMA commands (fix >=4GB bug) libata made the assumption that (for PIO commands in this case) it could modify DMA memory at the kernel-virtual address, after mapping this. This is incorrect, and fails on e.g. platforms that copy DMA memory back and forth (swiotlb on Intel EM64T and IA64). Remove this assumption by ensuring that we only call the DMA mapping routines if we really are going to use DMA for data xfer. Also: remove a bogus WARN_ON() in ata_sg_init_one() which caused bug reports (but no problems). ChangeSet@1.2126, 2004-12-07 17:37:18-06:00, sfrench@sambaltcdom.austin.ibm.com [CIFS] parse ipv6 addresses on mount (ipv6 support for cifs part 2) Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2125, 2004-12-07 17:23:42-06:00, sfrench@sambaltcdom.austin.ibm.com [CIFS] Increase size of small SMB pool (and decrease number) and do not zero the beginning of the header twice. Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2119.1.29, 2004-12-07 10:16:09-08:00, Andries.Brouwer@cwi.nl [PATCH] restore BLKRRPART semantics In 2.6.8 the code for the BLKRRPART ioctl was changed to return EIO when no partitions were found, such as on an empty disk. This breaks some partitioning programs and is also confusing: "Input/Output error" while in fact nothing was wrong with this brand new all blank disk. This restores old behaviour. ChangeSet@1.2119.1.28, 2004-12-07 10:15:54-08:00, alan@lxorguk.ukuu.org.uk [PATCH] Intel/Cyrix typo Self explanatory.. Based on a report on l/k Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.27, 2004-12-07 10:15:41-08:00, paulus@samba.org [PATCH] PPC64 Close firmware stdin We recently found a problem that was causing memory corruption during boot on IBM POWER5 machines. The problem was that the if you have a USB keyboard and it is set to the input device for the firmware, it will still be active when the kernel is started. That means that the OHCI controller has pointers to various memory areas that it polls for transfers to do. When we start using that same memory in the kernel, bad things can happen. (This isn't a problem on powermacs because the Apple OF implements a "quiesce" call which turns off all the devices it is using.) This patch fixes the problem by calling the Open Firmware "close" method for the input device. Stephen Rothwell and I have verified that doing this fixes the problem on the POWER5 machine where we observed it. I verified that this patch doesn't cause any problems on powermacs. I think this patch should go into 2.6.10 since it fixes a nasty memory corruption bug that can cause rather subtle and hard-to-diagnose problems during boot. (The symptom on the POWER5 machine with the particular kernel that we were using was that reading /proc/net/tcp would oops, due to one of the pointers in tcp_ehash being corrupted.) Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds ChangeSet@1.2055.54.15, 2004-12-07 10:45:13-06:00, matthew@wil.cx [PATCH] Blacklist devices that falsely claim an echo buffer A particular type of DVD is wrongly claiming to have an echo buffer (but only if a DVD is inserted). This confuses domain validation, so only look for an echo buffer if the device supports ppr (this is all SCSI3 and above devices plus LVD SCSI2 devices). Signed-off-by: James Bottomley ChangeSet@1.2119.1.26, 2004-12-07 08:07:09-08:00, kernel-stuff@comcast.net [PATCH] ohci1394.c - Correct kmalloc usage in interrupt alloc_dma_rcv_ctx is called in interrupt and Kernel Spinlock debugging code cribs about it via "Debug: sleeping function called in interrupt context". See sample stack traces below. The patch below corrects ohci1394.c to use GFP_ATOMIC instead of GFP_KERNEL. Tested to work fine with 2 different Camcorder devices for fairly long periods and connect/disconnects. Signed-off-by: Parag Warudkar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.25, 2004-12-07 08:06:56-08:00, tiwai@suse.de [PATCH] alsa: fix iomem mmap The patch adds the definition vm_private_data again to snd_pcm_lib_mmap_iomem(). It got lost during the rewrite of the mmap stuff. Signed-off-by: Martin Langer Signed-off-by: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.24, 2004-12-07 08:06:43-08:00, tiwai@suse.de [PATCH] alsa: add pci_disable_device() to removal and error paths pci_disable_device() is called properly in the removal and error paths. Also, the pci_set_master() is added to the resume callbacks if missing (just to be sure). Signed-off-by: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.23, 2004-12-07 08:06:26-08:00, tiwai@suse.de [PATCH] alsa: fix sleep in atomic during prepare callback Fixed the sleep in spinlock during prepare callback. This happened only on Nforce chips. Signed-off-by: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.22, 2004-12-07 08:06:13-08:00, trini@kernel.crashing.org [PATCH] ppc32: fix Motorola PReP (PowerstackII Utah) PCI IRQ map The PCI IRQ map for the old Motorola PowerStackII (Utah) boards was incorrect, but this breakage wasn't exposed until 2.5, and finally fixed until recently by Sebastian Heutling . Signed-off-by: Christian Kujau Signed-off-by: Tom Rini Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.21, 2004-12-07 08:06:01-08:00, mike.miller@hp.com [PATCH] cciss: cciss_ioctl return code fix This patches fixes the return code from cciss_ioctl. Without this some block layer (BLK*) ioctls do not work. Thanks to Jens Axboe for pointing this out. Signed-off-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.20, 2004-12-07 08:05:47-08:00, paulus@samba.org [PATCH] PPC64: close firmware stdin We recently found a problem that was causing memory corruption during boot on IBM POWER5 machines. The problem was that the if you have a USB keyboard and it is set to the input device for the firmware, it will still be active when the kernel is started. That means that the OHCI controller has pointers to various memory areas that it polls for transfers to do. When we start using that same memory in the kernel, bad things can happen. (This isn't a problem on powermacs because the Apple OF implements a "quiesce" call which turns off all the devices it is using.) This patch fixes the problem by calling the Open Firmware "close" method for the input device. Stephen Rothwell and I have verified that doing this fixes the problem on the POWER5 machine where we observed it. I verified that this patch doesn't cause any problems on powermacs. I think this patch should go into 2.6.10 since it fixes a nasty memory corruption bug that can cause rather subtle and hard-to-diagnose problems during boot. (The symptom on the POWER5 machine with the particular kernel that we were using was that reading /proc/net/tcp would oops, due to one of the pointers in tcp_ehash being corrupted.) Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.19, 2004-12-07 08:05:35-08:00, shaohua.li@intel.com [PATCH] eepro100 resume failure Fix eepro100 driver suspend/resume issue. Signed-off-by: Li Shaohua Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.18, 2004-12-07 08:05:21-08:00, axboe@suse.de [PATCH] cfq-iosched: bad accounting on non-fs requests Current cfq can cause hangs with non-fs requests, because the accounting goes bad. This fixes it. Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.17, 2004-12-07 08:05:08-08:00, geert@linux-m68k.org [PATCH] M68k: Update defconfigs for 2.6.10-rc3 M68k: Update defconfigs for 2.6.10-rc3 Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.16, 2004-12-07 08:04:56-08:00, romieu@fr.zoreil.com [PATCH] r8169: new PCI id The D-Link DGE-528T gigabit adapter is based on the 8169 chipset (reported by Andreas Tauscher , checked in the sources of a driver for this adapter). Signed-off-by: Francois Romieu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.15, 2004-12-07 08:04:43-08:00, sivanich@sgi.com [PATCH] isolcpus option fix The isolcpus option is broken in 2.6.10-rc2-bk2. The domains are no longer being properly initialized (which results in a panic at bootup). Signed-off-by: Dimitri Sivanich Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.14, 2004-12-07 08:04:30-08:00, benh@kernel.crashing.org [PATCH] remove some PowerMac cruft from USB The PowerMac specific sleep code in the OHCI USB driver used to call disable/enable irq, which is no longer necessary and actually clashes with the calls to free/request_irq that the common OHCI code now does, thus causing WARN_ON's to trigger each time a PowerBook is woken up from sleep. Signed-off-by: Benjamin Herrenschmidt Cc: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.13, 2004-12-07 08:04:18-08:00, fenghua.yu@intel.com [PATCH] Add cpu_relax in idle spin loop for no-hlt kernel option If given no-hlt kernel option, ia32 idle loop turns out to be a spin loop. Add cpu_relax() in this spin loop because IA32 SDM recommends that a PAUSE instruction be put in all spin loops. Signed-off-by: Fenghua Yu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.12, 2004-12-07 08:04:05-08:00, santil@us.ibm.com [PATCH] fix buffer starvation race in ibmveth There's a chance that the receive buffers are being consumed at the same rate as they are being replenished in ibmveth_replenish_task()... Meanwhile, the calls to schedule_replenishing() from ibmveth_poll() won't schedule another replenishing cycle (because the not_replenishing flag is zero), starving the buffers and making the adapter unable to receive packets unless the module is reloaded... Here's a small patch that will fix it by scheduling another replenishing task after toggling the not_replenishing flag. Signed-Off-By: Santiago Leon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2119.1.11, 2004-12-07 08:03:52-08:00, herbert@13thfloor.at [PATCH] normalise wall_to_monotonic for i386 and m32r Fix the non-normalized wall_to_monotonic for i386 and m32r (The other archs seem to get it right) Signed-off-by: Herbert Poetzl Signed-off-by: George Anzinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2055.54.14, 2004-12-07 09:15:15-06:00, aherrman@de.ibm.com [PATCH] zfcp: act enhancements corrections - corrects errors introduced in open_unit_handler with last patch submission for act enhancements, - changes formatting and some log-messages in act enhancments code, - removes junk lines - corrected Kconfig dependency for zfcp - do not wait for SBALs when creating ELS requests Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley ChangeSet@1.2123, 2004-12-07 00:28:46-06:00, sfrench@sambaltcdom.austin.ibm.com [CIFS] add debug message for trusted and security xattrs Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2122, 2004-12-06 23:48:54-06:00, sfrench@sambaltcdom.austin.ibm.com [CIFS] cleanup various warning/debug messages Signed-off-by: Steve French (sfrench@us.ibm.com) ChangeSet@1.2055.54.13, 2004-12-06 11:49:45-06:00, mike.miller@hp.com [PATCH] cciss: cciss_ioctl return code fix This patches fixes the return code from cciss_ioctl. Without this some block layer (BLK*) ioctls do not work. Please consider this for inclusion. Thanks to Jens Axboe for pointing this out. Signed-off-by: Mike Miller Signed-off-by: James Bottomley ChangeSet@1.2055.54.12, 2004-12-06 11:45:38-06:00, jejb@mulgrave.(none) SCSI: spi_transport set_signalling is buggy From: Matthew Wilcox Looks like you got the test backwards. It would only call set_signalling if type was SPI_SIGNAL_UNKNOWN. Signed-off-by: James Bottomley ChangeSet@1.2055.54.11, 2004-12-06 10:24:45-06:00, dougg@torque.net [PATCH] extracting resid from struct scsi_cmnd - during successful command completion place resid from SCSI LLDs into request::data_len so that block SG_IO ioctl reports resid Signed-off-by: James Bottomley ChangeSet@1.2119.3.5, 2004-12-06 15:55:27+00:00, dvrabel@com.rmk.(none) [ARM PATCH] 2298/1: Fix minor typo in ixp4xx_wdt Patch from David Vrabel Fix a minor typo in the MODULE_AUTHOR string in ixp4xx_wdt. Signed-off-by: David Vrabel Signed-off-by: Russell King ChangeSet@1.2055.54.10, 2004-12-06 09:38:48-06:00, jejb@mulgrave.(none) aic7xxx: fix compiler warning from dma mask assignement Promote all the mask quantites to being u64 so that they never cause truncation warnings. Signed-off-by: James Bottomley ChangeSet@1.2119.4.3, 2004-12-06 10:48:06+01:00, marcel@holtmann.org [Bluetooth] Use module parameter for ISOC alternate setting The module parameter for the ISOC transfers now chooses the value of the alternate setting. Signed-off-by: Marcel Holtmann ChangeSet@1.2119.4.2, 2004-12-06 10:39:53+01:00, marcel@holtmann.org [Bluetooth] Track the class of device value The class of device is only available from an inquiry response or from the connection request. In the case of an incoming connection the value can be taken from the request and stored in the hci_conn structure. For an outgoing connection the value from the inquiry cache is used or it is set to zero. Signed-off-by: Marcel Holtmann ChangeSet@1.2119.4.1, 2004-12-06 09:18:04+01:00, marcel@holtmann.org [Bluetooth] Use separate inquiry data structure The inquiry results can return different fields and so create one data structure that has place for every of these. Missing fields are filled with default values. Signed-off-by: Marcel Holtmann ChangeSet@1.2119.2.2, 2004-12-05 21:20:56-08:00, davem@nuts.davemloft.net [SPARC]: Fix syscall return value errno comparison. This was hosing all restart block handling. Noticed by Richard Mortimer. Signed-off-by: David S. Miller ChangeSet@1.2119.3.4, 2004-12-05 23:11:34+00:00, elf@com.rmk.(none) [ARM PATCH] 2297/1: SMC91x patch (#2) for LPD7a40x CardEngines Patch from Marc Singer Add support for the LPD7a40x implementation of the SMC91x ethernet controller. This patch exists to work around a mismatch between the way the LH7a40x CPUs handle chip selects and what the ethernet controller expects. This patch has been revised to eliminate masking of interrupts. The concessions are that a) the ISR must perform an IOBARRIER before the first access to the chip, just in case the interrupt occurred while the driver was writing to the chip b) other drivers that use the same chip select region as the SMC chip must perform a similar IOBARRIER at the top of their ISRs. Signed-off-by: Marc Singer Signed-off-by: Russell King ChangeSet@1.2119.3.3, 2004-12-05 16:36:40+00:00, elf@com.rmk.(none) [ARM PATCH] 2296/1: Corrections to build for LPD7a404 Patch from Marc Singer A missing exten prevented the 2.6.10-rc2 kernel from building for the LPD7A404. This patch adds it. Signed-off-by: Marc Singer Signed-off-by: Russell King ChangeSet@1.2119.1.9, 2004-12-05 08:32:07-08:00, gandalf@wlug.westbo.se [PATCH] Fix ALSA resume Some time ago, a patch was merged that removed pci_save_state() and pci_restore_state() from various ALSA drivers. That patch also added pci_restore_state() to sound/core/init.c but didn't add pci_save_state() anywhere. This is needed since the core pci handling doesn't do this for us anymore. My laptop doesn't resume (gets what I assume is an ACPI timeout and hangs solid) without this small obvious patch. Signed-off-by: Martin Josefsson Fixed-by: Takashi Iwai Signed-off-by: Linus Torvalds ChangeSet@1.2119.3.2, 2004-12-05 16:31:17+00:00, zecke@org.rmk.(none) [ARM PATCH] 2294/1: SA1100 ide.h change superseed 2282/1 Patch from Holger Hans Peter Freyther As proposed in 2282 asm-arm/arch-sa1100/ide.h is not included anymore from asm-arm/ide.h. If arch-sa1100/ide.h is included we abort with #error. If lart.c is compiled we kindly warn that ide needs fixing for this board. Signed-off-by: Holger Hans Peter Freyther Signed-off-by: Russell King ChangeSet@1.2119.3.1, 2004-12-05 16:25:39+00:00, elf@com.rmk.(none) [ARM PATCH] 2293/1: Corrections to build for LPD7a400 Patch from Marc Singer Some typos prevent the 2.6.10-rc2 kernel from building for the LPD7A400. This patch fixes them. It also removes CONFIG_FIQ which shouldn't be necessary and doesn't compile. Signed-off-by: Marc Singer Signed-off-by: Russell King ChangeSet@1.2119.2.1, 2004-12-04 19:34:20-08:00, davem@nuts.davemloft.net [SPARC64]: Fix SMP cpu bringup bug when bigkernel. We have to load the bigkernel second TLB entry on secondary processors before we move over the use the kernel trap table. Otherwise we can take a TLB miss somewhere in the post-4MB area and the TLB handler is not prepared to service that. The case that usually occurs is the prom_set_trap_table call made by trampoline.S, since p1275buf usually sits very near the end of the kernel image. It worked by luck most of the time as long as p1275buf sits within a single page since earlier code running in trampoline.S forced that TLB entry to be loaded by the OBP TLB miss handler. This was not fun to figure out. Signed-off-by: David S. Miller ChangeSet@1.2055.4.165, 2004-12-04 21:09:09+00:00, rmk@flint.arm.linux.org.uk [SERIAL] Ensure correct units for close_delay and closing_wait. Use milliseconds internally for these delays, and convert them to centiseconds at the interface boundary to the ioctl configuration controls. ChangeSet@1.2098.1.3, 2004-12-03 22:32:50+00:00, rmk@flint.arm.linux.org.uk [ARM] Add per_cpu data area to linker script. ChangeSet@1.2098.1.2, 2004-12-03 22:22:04+00:00, rmk@flint.arm.linux.org.uk [ARM] Ensure user ops pass 64-bit constants in even,odd registers. Always pass values to get_user and put_user in an even numbered register, and optionally the next odd numbered register. This ensures that we are compatible with compiler enhancements. ChangeSet@1.2119.1.5, 2004-12-03 12:57:06-08:00, torvalds@ppc970.osdl.org Linux 2.6.10-rc3 TAG: v2.6.10-rc3