commit 00e962c5408b9f2d0bebd2308673fe982cb9a5fe Author: Linus Torvalds Date: Tue Feb 19 09:08:49 2008 -0800 Revert "SLUB: Alternate fast paths using cmpxchg_local" This reverts commit 1f84260c8ce3b1ce26d4c1d6dedc2f33a3a29c0c, which is suspected to be the reason for some very occasional and hard-to-trigger crashes that usually look related to memory allocation (mostly reported in networking, but since that's generally the most common source of shortlived allocations - and allocations in interrupt contexts - that in itself is not a big clue). See for example http://bugzilla.kernel.org/show_bug.cgi?id=9973 http://lkml.org/lkml/2008/2/19/278 etc. One promising suspicion for what the root cause of bug is (which also explains why it's so hard to trigger in practice) came from Eric Dumazet: "I wonder how SLUB_FASTPATH is supposed to work, since it is affected by a classical ABA problem of lockless algo. cmpxchg_local(&c->freelist, object, object[c->offset]) can succeed, while an interrupt came (on this cpu), and several allocations were done, and one free was performed at the end of this interruption, so 'object' was recycled. c->freelist can then contain the previous value (object), but object[c->offset] was changed by IRQ. We then put back in freelist an already allocated object." but another reason for the revert is simply that everybody agrees that this code was the main suspect just by virtue of the pattern of oopses. Cc: Torsten Kaiser Cc: Christoph Lameter Cc: Mathieu Desnoyers Cc: Pekka Enberg Cc: Ingo Molnar Cc: Eric Dumazet Signed-off-by: Linus Torvalds commit aa3f98037ce3bcf850bb41f7530754d27481a792 Merge: f6c4276... e5fa443... Author: Linus Torvalds Date: Tue Feb 19 08:04:23 2008 -0800 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] qdio: FCP/SCSI write I/O stagnates on LPAR [S390] Fix futex_atomic_cmpxchg_std inline assembly. [S390] dcss: Fix Unlikely(x) != y [S390] sclp: clean up send/receive naming scheme [S390] etr: fix compile error on !SMP [S390] qdio: fix qdio_activate timeout handling. [S390] Initialize per cpu lowcores on cpu hotplug. [S390] find bit corner case. [S390] dasd: fix locking in __dasd_device_process_final_queue [S390] Make sure enabled wait psw is loaded in default_idle. [S390] Let NR_CPUS default to 32/64 on s390/s390x. [S390] cio: Do timed recovery on workqueue. [S390] cio: Remember to initialize recovery_lock. commit f6c427663a158056cd8ca71c01f30653e4b313f7 Merge: 9ef38ea... fa2fc7f... Author: Linus Torvalds Date: Tue Feb 19 08:03:02 2008 -0800 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: libata: implement drain buffers libata: eliminate the home grown dma padding in favour of block: clear drain buffer if draining for write command block: implement request_queue->dma_drain_needed block: add request->raw_data_len block: update bio according to DMA alignment padding libata: update ATAPI overflow draining elevator: make elevator_get() attempt to load the appropriate module cfq-iosched: add hlist for browsing parallel to the radix tree block: make blk_rq_map_user() clear ->bio if it unmaps it fs/block_dev.c: remove #if 0'ed code make struct def_blk_aops static make blk_settings_init() static make blk_ioc_init() static make blk-core.c:request_cachep static again commit 9ef38eaf4289a99beb3bc13d1ded220a68cc8877 Merge: cf91b82... 7f4da47... Author: Linus Torvalds Date: Tue Feb 19 08:02:04 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] HP ProLiant WatchDog driver [WATCHDOG] blackfin Watchdog driver: relocate all strings used in __init functions to __initdata [WATCHDOG] Convert mtx1 wdt to be a platform device and use generic GPIO API [WATCHDOG] Add support for SB1 hardware watchdog commit cf91b824bb2bdea8a47bf6bb94cf3a438683e5eb Merge: b694092... 89d694b... Author: Linus Torvalds Date: Tue Feb 19 07:54:02 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-genirq: genirq: do not leave interupts enabled on free_irq genirq: spurious.c: use time_* macros commit b69409279c4c960fcd1575bcf80f2a0ca414ca93 Merge: 07ce198... f6d091e... Author: Linus Torvalds Date: Tue Feb 19 07:53:28 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Add regs_return_value(). [SPARC64]: Kill pcic_present(). [SPARC]: Kill 'prom_palette'. [ATYFB]: Kill 'prom_palette' sparc code. [SPARC64]: Kill 'prom_keyboard'. [SPARC]: Kill extern decl of 'panic_setup'. [SPARC64]: Delete 'boot_flags'. [SPARC64]: Kill unused function 'kernel_enter_debugger'. [SPARC64] arch/sparc64/kernel/unaligned.c: Use time_* macros [SPARC64]: Always register a PROM based early console. [SPARC64]: Update defconfig. [SPARC64]: Add -mtune=ultrasparc3 if possible. [SPARC64]: Remove Makefile code for ancient gcc and binutils. [SPARC64]: Remove DEBUG_BOOTMEM. [SPARC64]: Use shorter "get_zeroed_page" call. [SPARC]: Use shorter form of "get_zeroed_page". [SPARC]: video/cg14.c and video/sbuslib.c build fixes commit 07ce198a1eb3431d04a6d59ea9fb7b71f21e33b1 Merge: 4bc87e6... a442585... Author: Linus Torvalds Date: Tue Feb 19 07:52:45 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (60 commits) [NIU]: Bump driver version and release date. [NIU]: Fix BMAC alternate MAC address indexing. net: fix kernel-doc warnings in header files [IPV6]: Use BUG_ON instead of if + BUG in fib6_del_route. [IPV6]: dst_entry leak in ip4ip6_err. (resend) bluetooth: do not move child device other than rfcomm bluetooth: put hci dev after del conn [NET]: Elminate spurious print_mac() calls. [BLUETOOTH] hci_sysfs.c: Kill build warning. [NET]: Remove MAC_FMT net/8021q/vlan_dev.c: Use print_mac. [XFRM]: Fix ordering issue in xfrm_dst_hash_transfer(). [BLUETOOTH] net/bluetooth/hci_core.c: Use time_* macros [IPV6]: Fix hardcoded removing of old module code [NETLABEL]: Move some initialization code into __init section. [NETLABEL]: Shrink the genl-ops registration code. [AX25] ax25_out: check skb for NULL in ax25_kick() [TCP]: Fix tcp_v4_send_synack() comment [IPV4]: fix alignment of IP-Config output Documentation: fix tcp.txt ... commit 4bc87e62775052aac0be7574d5f84ff06f61c6b4 Author: Casey Schaufler Date: Fri Feb 15 15:24:25 2008 -0800 Smack: unlabeled outgoing ambient packets Smack uses CIPSO labeling, but allows for unlabeled packets by specifying an "ambient" label that is applied to incoming unlabeled packets. Because the other end of the connection may dislike IP options, and ssh is one know application that behaves thus, it is prudent to respond in kind. This patch changes the network labeling behavior such that an outgoing packet that would be given a CIPSO label that matches the ambient label is left unlabeled. An "unlbl" domain is added and the netlabel defaulting mechanism invoked rather than assuming that everything is CIPSO. Locking has been added around changes to the ambient label as the mechanisms used to do so are more involved. Signed-off-by: Casey Schaufler Acked-by: Paul Moore Signed-off-by: Linus Torvalds commit e5fa443ea05f71b5253818890c6d32174cbab36f Author: Ursula Braun Date: Tue Feb 19 15:29:35 2008 +0100 [S390] qdio: FCP/SCSI write I/O stagnates on LPAR If running on LPAR, qdio might overlook an incoming buffer in certain scenarios. The patch makes sure that incoming buffers are detected immediately in all situations. Signed-off-by: Ursula Braun Signed-off-by: Martin Schwidefsky commit d5b02b3ff1d9a2e1074f559c84ed378cfa6fc3c0 Author: Heiko Carstens Date: Tue Feb 19 15:29:34 2008 +0100 [S390] Fix futex_atomic_cmpxchg_std inline assembly. Add missing exception table entry so that the kernel can handle proctection exceptions as well on the cs instruction. Currently only specification exceptions are handled correctly. The missing entry allows user space to crash the kernel. Cc: stable Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 39f73b2886be3a255d8f4cd669c8c7e7957afbd9 Author: Roel Kluin <12o3l@tiscali.nl> Date: Tue Feb 19 15:29:33 2008 +0100 [S390] dcss: Fix Unlikely(x) != y Fix Unlikely(x) != y Cc: Gerald Schaefer Cc: Stefan Weinhuber Cc: Carsten Otte Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit d082d3ce32705a92bd86c2b061d6b0827a40a5b1 Author: Peter Oberparleiter Date: Tue Feb 19 15:29:32 2008 +0100 [S390] sclp: clean up send/receive naming scheme Make state change events adjust the correct mask by cleaning up naming inconsistencies. Also remove chance for lockup by removing unnecessary mask related check before reading events. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 06cb92ffe418c4a9d5a70c5dff4f283e8e8df6e4 Author: Heiko Carstens Date: Tue Feb 19 15:29:31 2008 +0100 [S390] etr: fix compile error on !SMP Since a5fbb6d1064be885d2a6b82f625186753cf74848 "KVM: fix !SMP build error" smp_call_function isn't a define anymore that folds into nothing but a define that calls up_smp_call_function with all parameters. Hence we cannot #ifdef out the unused code anymore... This seems to be the preferred method, so do this for s390 as well. arch/s390/kernel/time.c: In function 'etr_sync_clock': arch/s390/kernel/time.c:825: error: 'clock_sync_cpu_start' undeclared arch/s390/kernel/time.c:862: error: 'clock_sync_cpu_end' undeclared Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b32ecdb7257821e5e42d9b9b2a427b02c89f85e7 Author: Heiko Carstens Date: Tue Feb 19 15:29:30 2008 +0100 [S390] qdio: fix qdio_activate timeout handling. Current code in qdio_activate waits for at least 5 seconds until it returns. It may return earlier if an error occurs, but not if everything is ok. This large timeout value became visible with commit dfa77f611ff295598e218aa0eb6efa73a5cf26d0 "qdio: set QDIO_ACTIVATE_TIMEOUT to 5s", which intended to fix the timeout value which was zero. In turn setting an FCP adapter online took 5 seconds. In practice waiting for 5ms before continuing is sufficient as pointed out by Utz Bacher and Cornelia Huck. Cc: Utz Bacher Cc: Jan Glauber Cc: Ursula Braun Cc: Martin Peschke Acked-by: Cornelia Huck Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 591bb4f637e48950d35e2ca01e6b962c519d96e5 Author: Heiko Carstens Date: Tue Feb 19 15:29:29 2008 +0100 [S390] Initialize per cpu lowcores on cpu hotplug. Just copy the first 512 read-only bytes of the current cpu lowcore if a new cpu gets onlined. The rest is zeroed out and must be explicitly initialized. Current code just copies the entire lowcore and initializes the needed fields. This should reveal bugs in future enhancements quite early. Also when the lowcore of the first cpu is replaced this is now done atomically (no interrupts, no machine checks). Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a22fb7ff1259e6ee87d0ba3559c9f7b7d0cb20d2 Author: Martin Schwidefsky Date: Tue Feb 19 15:29:28 2008 +0100 [S390] find bit corner case. Fix [ext2_]find_first_[zero_]bit for the corner case of an all clear or all set bit field by always handling that last word of the bit field with __ffz_word/__ffs_word. Signed-off-by: Martin Schwidefsky commit 03513bccad33667ed738cfd96dc5757e539e0bdb Author: Stefan Weinhuber Date: Tue Feb 19 15:29:27 2008 +0100 [S390] dasd: fix locking in __dasd_device_process_final_queue After setting the status of the cqr and releasing the lock for the block cqr queue, we call the cqr callback function, which will usually just trigger the dasd_block_tasklet. But when the tasklet is already running the cqr might be processed before we invoke the callback function. In rare cases the callback pointer may already be invalid by the time we want to call it, which will result in a panic. Solution: Call the callback function first and then release the lock. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 11ab244c9faead91683a12e4cb10d26b279bb4aa Author: Heiko Carstens Date: Tue Feb 19 15:29:26 2008 +0100 [S390] Make sure enabled wait psw is loaded in default_idle. If both NO_IDLE_HZ and VIRT_TIMER are disabled default_idle won't load an enabled wait psw and busy loop instead. This is because the idle_chain is empty and the return value of atomic_notifier_call_chain will be NOTIFY_DONE, which causes default_idle to return instead of loading an enabled wait psw. Fix this by calling __atomic_notifier_call_chain instead and add proper return value handling. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 057c5cb35ece6ae3a4c2cb849f3948c5ad6add32 Author: Heiko Carstens Date: Tue Feb 19 15:29:25 2008 +0100 [S390] Let NR_CPUS default to 32/64 on s390/s390x. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 4c629727cefe45abb2f7459836bfc4b41c5e55ba Author: Cornelia Huck Date: Tue Feb 19 15:29:24 2008 +0100 [S390] cio: Do timed recovery on workqueue. We can't do our recovery in softirq context, so we schedule it from our timer function. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 486d0a0079eb782cdb73f18246e26076c615a020 Author: Cornelia Huck Date: Tue Feb 19 15:29:23 2008 +0100 [S390] cio: Remember to initialize recovery_lock. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit fa2fc7f4813bfec1ae3232d49e3befbd601e8a6f Author: James Bottomley Date: Tue Feb 19 11:36:57 2008 +0100 libata: implement drain buffers This just updates the libata slave configure routine to take advantage of the block layer drain buffers. It also adjusts the size lengths in the atapi code to add the drain buffer to the DMA length so the driver knows it can rely on it. I suspect I should also be checking for AHCI as well as ATA_DEV_ATAPI, but I couldn't see how to do that easily. tj: * atapi_drain_needed() added such that draining is applied to only misc ATAPI commands. * q->bounce_gfp used when allocating drain buffer. * Now duplicate ATAPI PIO drain logic dropped. * ata_dev_printk() used instead of sdev_printk(). Signed-off-by: James Bottomley Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit dde2020754aeb14e17052d61784dcb37f252aac2 Author: James Bottomley Date: Tue Feb 19 11:36:56 2008 +0100 libata: eliminate the home grown dma padding in favour of that provided by the block layer ATA requires that all DMA transfers begin and end on word boundaries. Because of this, a large amount of machinery grew up in ide to adjust scatterlists on this basis. However, as of 2.5, the block layer has a dma_alignment variable which ensures both the beginning and length of a DMA transfer are aligned on the dma_alignment boundary. Although the block layer does adjust the beginning of the transfer to ensure this happens, it doesn't actually adjust the length, it merely makes sure that space is allocated for transfers beyond the declared length. The upshot of this is that scatterlists may be padded to any size between the actual length and the length adjusted to the dma_alignment safely knowing that memory is allocated in this region. Right at the moment, SCSI takes the default dma_aligment which is on a 512 byte boundary. Note that this aligment only applies to transfers coming in from user space. However, since all kernel allocations are automatically aligned on a minimum of 32 byte boundaries, it is safe to adjust them in this manner as well. tj: * Adjusting sg after padding is done in block layer. Make libata set queue alignment correctly for ATAPI devices and drop broken sg mangling from ata_sg_setup(). * Use request->raw_data_len for ATAPI transfer chunk size. * Killed qc->raw_nbytes. * Separated out killing qc->n_iter. Signed-off-by: James Bottomley Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit db0a2e0099be3a1cff55879225881465f16c67d3 Author: Tejun Heo Date: Tue Feb 19 11:36:55 2008 +0100 block: clear drain buffer if draining for write command Clear drain buffer before chaining if the command in question is a write. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 2fb98e8414c42cb14698833aac640b143b9ade4f Author: Tejun Heo Date: Tue Feb 19 11:36:53 2008 +0100 block: implement request_queue->dma_drain_needed Draining shouldn't be done for commands where overflow may indicate data integrity issues. Add dma_drain_needed callback to request_queue. Drain buffer is appened iff this function returns non-zero. Signed-off-by: Tejun Heo Cc: James Bottomley Signed-off-by: Jens Axboe commit 6b00769fe1502b4ad97bb327ef7ac971b208bfb5 Author: Tejun Heo Date: Tue Feb 19 11:36:35 2008 +0100 block: add request->raw_data_len With padding and draining moved into it, block layer now may extend requests as directed by queue parameters, so now a request has two sizes - the original request size and the extended size which matches the size of area pointed to by bios and later by sgs. The latter size is what lower layers are primarily interested in when allocating, filling up DMA tables and setting up the controller. Both padding and draining extend the data area to accomodate controller characteristics. As any controller which speaks SCSI can handle underflows, feeding larger data area is safe. So, this patch makes the primary data length field, request->data_len, indicate the size of full data area and add a separate length field, request->raw_data_len, for the unmodified request size. The latter is used to report to higher layer (userland) and where the original request size should be fed to the controller or device. Signed-off-by: Tejun Heo Cc: James Bottomley Signed-off-by: Jens Axboe commit 40b01b9bbdf51ae543a04744283bf2d56c4a6afa Author: Tejun Heo Date: Tue Feb 19 11:35:38 2008 +0100 block: update bio according to DMA alignment padding DMA start address and transfer size alignment for PC requests are achieved using bio_copy_user() instead of bio_map_user(). This works because bio_copy_user() always uses full pages and block DMA alignment isn't allowed to go over PAGE_SIZE. However, the implementation didn't update the last bio of the request to make this padding visible to lower layers. This patch makes blk_rq_map_user() extend the last bio such that it includes the padding area and the size of area pointed to by the request is properly aligned. Signed-off-by: Tejun Heo Cc: James Bottomley Signed-off-by: Jens Axboe commit 56c819df77f96c3fc0c2a979e12b478403728790 Author: Tejun Heo Date: Tue Feb 19 11:35:37 2008 +0100 libata: update ATAPI overflow draining For misc ATAPI commands which transfer variable length data to the host, overflow can occur due to application or hardware bug. Such overflows can be ignored safely as long as overflow data is properly drained. libata HSM implementation has this implemented in __atapi_pio_bytes() and recently updated for 2.6.24-rc but it requires further improvements. Improve drain logic such that... * Report overflow errors using ehi desc mechanism instead of printing directly. * Properly calculate the number of bytes to be drained considering actual number of consumed bytes for partial draining. Signed-off-by: Tejun Heo Acked-by: Albert Lee Signed-off-by: Jens Axboe commit 89d694b9dbe769ca1004e01db0ca43964806a611 Author: Thomas Gleixner Date: Mon Feb 18 18:25:17 2008 +0100 genirq: do not leave interupts enabled on free_irq The default_disable() function was changed in commit: 76d2160147f43f982dfe881404cfde9fd0a9da21 genirq: do not mask interrupts by default It removed the mask function in favour of the default delayed interrupt disabling. Unfortunately this also broke the shutdown in free_irq() when the last handler is removed from the interrupt for those architectures which rely on the default implementations. Now we can end up with a enabled interrupt line after the last handler was removed, which can result in spurious interrupts. Fix this by adding a default_shutdown function, which is only installed, when the irqchip implementation does provide neither a shutdown nor a disable function. [@stable: affected versions: .21 - .24 ] Pointed-out-by: Michael Hennerich Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: stable@kernel.org Tested-by: Michael Hennerich commit 188fd89d539d899bfca2bc83534e5508e0161139 Author: S.Caglar Onur Date: Thu Feb 14 17:36:51 2008 +0200 genirq: spurious.c: use time_* macros The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Signed-off-by: S.Caglar Onur Acked-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit e164094964e6e20fe7fce418e06a9dce952bb7a4 Author: Jens Axboe Date: Tue Feb 19 10:20:37 2008 +0100 elevator: make elevator_get() attempt to load the appropriate module Currently we fail if someone requests a valid io scheduler, but it's modular and not currently loaded. That can happen from a driver init asking for a different scheduler, or online switching through sysfs as requested by a user. This patch makes elevator_get() request_module() to attempt to load the appropriate module, instead of requiring that done manually. Signed-off-by: Jens Axboe commit ffc4e7595734cf768fa60cea8a4d545dfef8231a Author: Jens Axboe Date: Tue Feb 19 10:02:29 2008 +0100 cfq-iosched: add hlist for browsing parallel to the radix tree It's cumbersome to browse a radix tree from start to finish, especially since we modify keys when a process exits. So add a hlist for the single purpose of browsing over all known cfq_io_contexts, used for exit, io prio change, etc. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=9948 Signed-off-by: Jens Axboe commit 84e9e03c55c2456799ab19f1d577e72f721fdd39 Author: Jens Axboe Date: Mon Feb 18 13:51:56 2008 +0100 block: make blk_rq_map_user() clear ->bio if it unmaps it That way the interface is symmetric, and calling blk_rq_unmap_user() on the request wont oops. Signed-off-by: Jens Axboe commit 86b6c7a7f78feca58d2d8615e53aee4d59ab9dc6 Author: Adrian Bunk Date: Mon Feb 18 13:48:32 2008 +0100 fs/block_dev.c: remove #if 0'ed code Commit b2e895dbd80c420bfc0937c3729b4afe073b3848 #if 0'ed this code stating: <-- snip --> [PATCH] revert blockdev direct io back to 2.6.19 version Andrew Vasquez is reporting as-iosched oopses and a 65% throughput slowdown due to the recent special-casing of direct-io against blockdevs. We don't know why either of these things are occurring. The patch minimally reverts us back to the 2.6.19 code for a 2.6.20 release. <-- snip --> It has since been dead code, and unless someone wants to revive it now it's time to remove it. This patch also makes bio_release_pages() static again and removes the ki_bio_count member from struct kiocb, reverting changes that had been done for this dead code. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 4c54ac62dceecedd82d4a865017bba0b738e2897 Author: Adrian Bunk Date: Mon Feb 18 13:48:31 2008 +0100 make struct def_blk_aops static This patch makes the needlessly global struct def_blk_aops static. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 52ff4cae65b45dcdfa23de09619754d6f380f31e Author: Adrian Bunk Date: Mon Feb 18 13:45:55 2008 +0100 make blk_settings_init() static blk_settings_init() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 13341598263011e079386b22ea35e482f97714c0 Author: Adrian Bunk Date: Mon Feb 18 13:45:53 2008 +0100 make blk_ioc_init() static blk_ioc_init() can become static. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit 5ece6c52ea52f9e94298e950a837ccff415c7687 Author: Adrian Bunk Date: Mon Feb 18 13:45:51 2008 +0100 make blk-core.c:request_cachep static again request_cachep needlessly became global. Signed-off-by: Adrian Bunk Signed-off-by: Jens Axboe commit f6d091e05199e67ba79c3ea29faa5c3b51d5daf4 Author: David S. Miller Date: Tue Feb 19 00:31:22 2008 -0800 [SPARC64]: Add regs_return_value(). Needed for kretprobes. Noticed by Ananth N Mavinakayanahalli. Signed-off-by: David S. Miller commit a442585952f137bd4cdb1f2f3166e4157d383b82 Author: David S. Miller Date: Mon Feb 18 21:30:48 2008 -0800 [NIU]: Bump driver version and release date. Signed-off-by: David S. Miller commit 3b5bcedeeb755b6e813537fcf4c32f010b490aef Author: Matheos Worku Date: Mon Feb 18 21:30:03 2008 -0800 [NIU]: Fix BMAC alternate MAC address indexing. BMAC port alternate MAC address index needs to start at 1. Index 0 is used for the main MAC address. Signed-off-by: Matheos Worku Signed-off-by: David S. Miller commit 31729363418ea25b01aa9410838c38e36792e44c Author: Randy Dunlap Date: Mon Feb 18 20:52:13 2008 -0800 net: fix kernel-doc warnings in header files Add missing structure kernel-doc descriptions to sock.h & skbuff.h to fix kernel-doc warnings. (I think that Stephen H. sent a similar patch, but I can't find it. I just want to kill the warnings, with either patch.) Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 2df96af03d97e98cbea9f9cb71fc56ea5fc544b2 Author: Pavel Emelyanov Date: Mon Feb 18 20:50:42 2008 -0800 [IPV6]: Use BUG_ON instead of if + BUG in fib6_del_route. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller commit 9937ded8e44de8865cba1509d24eea9d350cebf0 Author: Denis V. Lunev Date: Mon Feb 18 20:49:36 2008 -0800 [IPV6]: dst_entry leak in ip4ip6_err. (resend) The result of the ip_route_output is not assigned to skb. This means that - it is leaked - possible OOPS below dereferrencing skb->dst - no ICMP message for this case Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller commit 8ac62dc773c149d7b7124b4912b425842f905d3e Author: Dave Young Date: Mon Feb 18 20:45:41 2008 -0800 bluetooth: do not move child device other than rfcomm hci conn child devices other than rfcomm tty should not be moved here. This is my lost, thanks for Barnaby's reporting and testing. Signed-off-by: Dave Young Signed-off-by: David S. Miller commit 0cd63c8089f0f6316df1393c3a93bdbc67ab314d Author: Dave Young Date: Mon Feb 18 20:44:01 2008 -0800 bluetooth: put hci dev after del conn Move hci_dev_put to del_conn to avoid hci dev going away before hci conn. Signed-off-by: Dave Young Signed-off-by: David S. Miller commit 9a4c8546f3e7c893888bccc2b3416d6214f2664a Merge: b0abcfc... 14e04c3... Author: Linus Torvalds Date: Mon Feb 18 18:46:56 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide-cd: fix missing residual count setting in DMA mode ht6560b: force prefetch for some devices ht6560b can only do up to PIO mode 4 linux/hdsmart.h: fix goofups (take 2) via82cxxx: add new PCI id for cx700 falconide: locking bugfix MAINTAINERS: update ide-cd maintainer's email address ide/libata: ST310211A has buggy HPA too ide: Add missing base addresses for falconide and macide commit b0abcfc14605b2a8c686bd8e193ab05b01a7980b Author: Eric Paris Date: Mon Feb 18 18:23:16 2008 -0500 Audit: use == not = in if statements Clearly this was supposed to be an == not an = in the if statement. This patch also causes us to stop processing execve args once we have failed rather than continuing to loop on failure over and over and over. Signed-off-by: Eric Paris Acked-by: Al Viro Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8f789c48448aed74fe1c07af76de8f04adacec7d Author: David S. Miller Date: Mon Feb 18 16:50:22 2008 -0800 [NET]: Elminate spurious print_mac() calls. Patrick McHardy notes that print_mac() can get invoked even if the result it unused (f.e. as an argument to pr_debug() when DEBUG is not defined). Mark this function as "__pure" to eliminate this problem. Signed-off-by: David S. Miller commit 14e04c3f6e64bac468f0aa38c6d47aa95b60c074 Author: Kiyoshi Ueda Date: Tue Feb 19 01:41:26 2008 +0100 ide-cd: fix missing residual count setting in DMA mode This patch fixes the missing residual count setting in DMA mode, which was introduced during the conversion to blk-end-request. The residual count could be used by the request submitter. So if it isn't set correctly, some upper layers does not work. (e.g. wodim for CD burning.) The bug is in only DMA mode. In PIO mode, we are setting the residual count correctly, so no need to fix. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Reported-by: Andreas Schwab Tested-by: Andreas Schwab Tested-by: Laura Garcia Tested-by: Borislav Petkov Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 0e7d8d480259319649f7a2c230622b98758d1c83 Author: Jan Evert van Grootheest Date: Tue Feb 19 01:41:26 2008 +0100 ht6560b: force prefetch for some devices Prefetch needs to be set for some ide devices to work when connected to a ht6560b interface. This was not always done properly, causing a system with a HD and CD on the primary interface to not work properly. Or, in effect, hang hard. This patch forces prefetch on devices before checking whether it is necessary to change the settings in the interface This patch should also be applied to 2.4. I don't currently have a 2.4 tree around. (also change my email address) Signed-off-by: Jan Evert van Grootheest Cc: Sergei Shtylyov Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 1a1990f5479b0c9055c133b7e0e7fedfcbe11512 Author: Jan Evert van Grootheest Date: Tue Feb 19 01:41:26 2008 +0100 ht6560b can only do up to PIO mode 4 According to the datasheet, ht6560b only supports up to PIO mode 4. [bart: manually ported it over 2.6.25-rc2] Signed-off-by: Jan Evert van Grootheest Signed-off-by: Bartlomiej Zolnierkiewicz commit f401fd55b5a9ef1a4572abaefaa6957af11ced61 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 19 01:41:26 2008 +0100 linux/hdsmart.h: fix goofups (take 2) Fix goofups of commit 76166952bbc81dda1c8a8c14e75a2aa06f6c052c (" is not used by kernel code"). Also update include/linux/Kbuild to reflect the fact that hdsmart.h uses __KERNEL__ ifdefs now. Reported-by: "Robert P. J. Day" Signed-off-by: Bartlomiej Zolnierkiewicz commit 84f7e451e9213d8c328752d0f39bc362519d53d2 Author: Andrew Smith Date: Tue Feb 19 01:41:26 2008 +0100 via82cxxx: add new PCI id for cx700 [bart: manually ported it over via82cxxx changes] From: Andrew Smith Signed-off-by: Bartlomiej Zolnierkiewicz commit d684b21f89b96af3adc06877f29fd9f5214b23c8 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 19 01:41:25 2008 +0100 falconide: locking bugfix commit 8ac4ce742c66100931b6f2d7a36b0df08bc721fe ("ide: fix host drivers depending on ide_generic to probe for interfaces (take 2)") moved probing to falconide but forgot to take care of Atari specific locking - fix it. Cc: Geert Uytterhoeven Cc: Michael Schmitz Signed-off-by: Bartlomiej Zolnierkiewicz commit ef709165d8de1ba9dd3cd5e05dbabf71dc32d883 Author: Borislav Petkov Date: Tue Feb 19 01:41:25 2008 +0100 MAINTAINERS: update ide-cd maintainer's email address Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit b152fcd34108d07a1e682786af583fd3e080cab3 Author: Mikko Rapeli Date: Tue Feb 19 01:41:25 2008 +0100 ide/libata: ST310211A has buggy HPA too Signed-off-by: Mikko Rapeli Tested-by: Bart Champagne Cc: Jeff Garzik Signed-off-by: Bartlomiej Zolnierkiewicz commit 899e1bc57340ad9acf5561b1eff7a684975ad800 Author: Geert Uytterhoeven Date: Tue Feb 19 01:41:24 2008 +0100 ide: Add missing base addresses for falconide and macide commit 29dd59755a849cc6475faa6a75f3b804e23a6fc2 ("ide: remove ide_setup_ports") forgot to take into account the base addresses for the CONTROL registers for falconide and macide, as pointed out by Michael Schmitz. Falconide was tested on Aranym. Signed-off-by: Geert Uytterhoeven Cc: Michael Schmitz Signed-off-by: Bartlomiej Zolnierkiewicz commit 8c5b4a3f43c060662d83574a4c85fbb362419ddd Author: David S. Miller Date: Mon Feb 18 16:40:10 2008 -0800 [SPARC64]: Kill pcic_present(). And also it's helper function pci_is_controller(). Both are unused. I can't remove the equivalent from sparc32 yet as some ancient bus probing code still uses that platform's version. Signed-off-by: David S. Miller commit f702c5815696bfca095cc1173fff6995c4d39844 Merge: 0165d7f... 51af33e... Author: Linus Torvalds Date: Mon Feb 18 15:52:40 2008 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/nes: Fix possible array overrun RDMA/nes: Fix VLAN support RDMA/nes: Fix MAC interrupt erroneously masked on ifdown IB: Fix return value in ib_device_register_sysfs() commit 0165d7f476b99eb637027c2f69c365f00260f188 Merge: 20ef0f1... f6c540c... Author: Linus Torvalds Date: Mon Feb 18 15:51:40 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: fix lguest build failure x86: reenable support for system without on node0 x86: CPA: avoid double checking of alias ranges x86: CPA no alias checking for _NX x86: zap invalid and unused pmds in early boot x86: CPA, fix alias checks commit 20ef0f1ad0035cd7acc6cbcbc018b2dcd891e274 Merge: 9960c90... 6165894... Author: Linus Torvalds Date: Mon Feb 18 15:49:47 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (59 commits) V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum V4L/DVB (7205): tuner-xc2028 depends on FW_LOADER V4L/DVB (7201): cx88-mpeg: Fix race condition in variable access V4L/DVB (7200): Fix FM firmware loading V4L/DVB (7198): V4L, include ioctl.h in videodev headers V4L/DVB (7197): bttv: Fix overlay divide error V4L/DVB (7195): xc5000: fix build error when built as module V4L/DVB (7194): cx88-mpeg: Allow concurrent access to cx88-mpeg devices V4L/DVB (7193): tveeprom: Add proper tuner mapping for hauppauge eeprom id 133 V4L/DVB (7192): Adds support for Genius TVGo A11MCE V4L/DVB (7189): autosuspend support V4L/DVB (7188): radio-si470x version 1.0.6 V4L/DVB (7186): tda10086: make the 22kHz tone for DISEQC a config option V4L/DVB (7183): radio-si470x: fix build warning V4L/DVB (7180): em28xx: add URB_NO_TRANSFER_DMA_MAP, since urb->transfer_dma is set V4L/DVB (7179): Allow more than one em28xx board V4L/DVB (7164): em28xx-alsa: Add a missing mutex V4L/DVB (7163): em28xx: makes audio settings more stable V4L/DVB (7162): em28xx: Fix endian and returns the correct values V4L/DVB (7161): em28xx: Fix printing debug values higher than 127 ... commit 9960c90c0cb9652f69ce794c7bf99bb3acf23552 Merge: 0eddf03... c58310b... Author: Linus Torvalds Date: Mon Feb 18 15:46:21 2008 -0800 Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: [XFS] Added quota targets and removed dmapi directory [XFS] Fix up xfs out-of-tree builds. (a.k.a. external modules) [XFS] Remove Makefile wrappers in XFS commit 0eddf038adc8dff78efe86b71284e3f52b7cef27 Merge: 86b7cbc... c8620c2... Author: Linus Torvalds Date: Mon Feb 18 15:46:03 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] null: Add missing Kconfig dependency on BLKCIPHER [CRYPTO] tcrypt: Add missing Kconfig dependency on BLKCIPHER [HIFN]: Fix invalid config ifdefs for RNG support commit 86b7cbc9d3f7b357dbd4f22779c5df375eb76c46 Merge: 230b548... db4315d... Author: Linus Torvalds Date: Mon Feb 18 15:45:48 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt * git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt: timer_list: print relative expiry time signed commit 230b548c15d50068f993948ef4d803f5cc033454 Merge: 1309d4e... fa2144b... Author: Linus Torvalds Date: Mon Feb 18 15:41:05 2008 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: explain why DEBUG_SECTION_MISMATCH is UNDEFINED kbuild: fix building vmlinux.o kbuild: allow -fstack-protector to take effect kconfig: fix select in combination with default commit 667bc389c716389795c6cfa145ab5ef6279fbb62 Author: David S. Miller Date: Mon Feb 18 15:28:16 2008 -0800 [SPARC]: Kill 'prom_palette'. The idea of this thing is we could save/restore the firmware's palette when breaking in and out of the firmware prompt. Only one driver implemented this (atyfb) and it's value is questionable. If you're just debugging you don't really care that the characters end up being purple or whatever. And we can provide better debugging and firmware command facilities with minimal in-kernel console I/O drivers. Signed-off-by: David S. Miller commit 30b3cfe1f67550bb6ec6868507a78060ef98269a Author: David S. Miller Date: Mon Feb 18 15:26:43 2008 -0800 [ATYFB]: Kill 'prom_palette' sparc code. Signed-off-by: David S. Miller commit 101788b0ab5464cf485c5d434ac30563e6f9e5fe Author: David S. Miller Date: Mon Feb 18 15:21:30 2008 -0800 [SPARC64]: Kill 'prom_keyboard'. Nothing ever sets it, so it just takes up space. Signed-off-by: David S. Miller commit 1d5509aa6985b256a426e67ae6952fd4b7664de7 Author: David S. Miller Date: Mon Feb 18 15:17:58 2008 -0800 [SPARC]: Kill extern decl of 'panic_setup'. This was made static in kernel/panic.c a long time ago. Signed-off-by: David S. Miller commit 9a2f258ad5910c478a5c98989b9a26268b2e5488 Author: David S. Miller Date: Mon Feb 18 15:16:20 2008 -0800 [SPARC64]: Delete 'boot_flags'. It is write-only, nothing tests it's value. Signed-off-by: David S. Miller commit a3d41704d4647abfc2796e9c81f71e0902f78e09 Author: David S. Miller Date: Mon Feb 18 15:13:48 2008 -0800 [SPARC64]: Kill unused function 'kernel_enter_debugger'. Signed-off-by: David S. Miller commit f6c540cdd65d4bc4eaf4dcbf652580f09f3b0c38 Author: Rusty Russell Date: Mon Feb 4 07:11:10 2008 +1100 x86: fix lguest build failure drivers/lguest/x86/switcher_32.S:(.text+0x3815f8): undefined reference to `LGUEST_PAGES_regs_trapnum' This problem was caused by asm-offsets.c only having the offsets when lguest *guest* support was set, not lguest host (host support used to imply guest support, so now they're separate these bugs come out). Lguest guest support and host support are separate config options: they used to be tied together. Sort out which parts of asm-offsets are needed for Guest and Host. Signed-off-by: Rusty Russell Cc: Linus Torvalds Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit b7ad149d62ffffaccb9f565dfe7e5bae739d6836 Author: Yinghai Lu Date: Sun Feb 17 02:02:21 2008 -0800 x86: reenable support for system without on node0 One system doesn't have RAM for node0 installed. SRAT: PXM 0 -> APIC 0 -> Node 0 SRAT: PXM 0 -> APIC 1 -> Node 0 SRAT: PXM 1 -> APIC 2 -> Node 1 SRAT: PXM 1 -> APIC 3 -> Node 1 SRAT: Node 1 PXM 1 0-a0000 SRAT: Node 1 PXM 1 0-dd000000 SRAT: Node 1 PXM 1 0-123000000 ACPI: SLIT: nodes = 2 10 13 13 10 mapped APIC to ffffffffff5fb000 ( fee00000) Bootmem setup node 1 0000000000000000-0000000123000000 NODE_DATA [000000000000e000 - 0000000000014fff] bootmap [0000000000015000 - 00000000000395ff] pages 25 Could not find start_pfn for node 0 Pid: 0, comm: swapper Not tainted 2.6.24-smp-g5a514e21-dirty #14 Call Trace: [] free_area_init_node+0x22/0x381 [] generic_swap+0x0/0x17 [] find_zone_movable_pfns_for_nodes+0x54/0x271 [] free_area_init_nodes+0x239/0x287 [] paging_init+0x46/0x4c [] setup_arch+0x3c3/0x44e [] start_kernel+0x6f/0x2c7 [] _sinittext+0x1cc/0x1d3 This happens because node 0 is not online, but the node state in mm/page_alloc.c has node 0 set. nodemask_t node_states[NR_NODE_STATES] __read_mostly = { [N_POSSIBLE] = NODE_MASK_ALL, [N_ONLINE] = { { [0] = 1UL } }, So we need to clear node_online_map before initializing the memory. Signed-off-by: Yinghai Lu Cc: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit f34b439f34c49d7de858234bab5e2dd03cfaf3c1 Author: Thomas Gleixner Date: Fri Feb 15 22:17:57 2008 +0100 x86: CPA: avoid double checking of alias ranges When the CPA code is called with an virtual address in the range of the direct mapping or the high alias then we do not need to run through the alias check for this range. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit af96e4438a4b34a257f5318a296e0b9e182e7ab9 Author: Thomas Gleixner Date: Fri Feb 15 21:49:46 2008 +0100 x86: CPA no alias checking for _NX NX settings are not required to be consistent across alias mappings. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 31eedd823c1bf3650c450346a0d0c39431034eb9 Author: Thomas Gleixner Date: Fri Feb 15 17:29:12 2008 +0100 x86: zap invalid and unused pmds in early boot The early boot code maps KERNEL_TEXT_SIZE (currently 40MB) starting from __START_KERNEL_map. The kernel itself only needs _text to _end mapped in the high alias. On relocatible kernels the ASM setup code adjusts the compile time created high mappings to the relocation. This creates invalid pmd entries for negative offsets: 0xffffffff80000000 -> pmd entry: ffffffffff2001e3 It points outside of the physical address space and is marked present. This starts at the virtual address __START_KERNEL_map and goes up to the point where the first valid physical address (0x0) is mapped. Zap the mappings before _text and after _end right away in early boot. This removes also the invalid entries. Furthermore it simplifies the range check for high aliases. Signed-off-by: Thomas Gleixner Acked-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit c31c7d4844ea4817692ae16bf70f9c96c05a50eb Author: Thomas Gleixner Date: Mon Feb 18 20:54:14 2008 +0100 x86: CPA, fix alias checks c_p_a() did not discover all aliases correctly. (such as when called on vmalloc()-ed areas or ioremap()-ed areas) Push the alias checks to the lower, physical level and consistently discover all aliases that might exist: the low direct mappings and the high linear kernel-text mappings (on 64-bit). Thanks to Andi Kleen for pointing out that this was buggy. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 51af33e8e45b845d8ee85446f58e31bc4c118048 Author: Roland Dreier Date: Mon Feb 18 10:33:59 2008 -0800 RDMA/nes: Fix possible array overrun In nes_create_qp(), the test if (nesqp->mmap_sq_db_index > NES_MAX_USER_WQ_REGIONS) { is used to error out if the db_index is too large; however, if the test doesn't trigger, then the index is used as nes_ucontext->mmap_nesqp[nesqp->mmap_sq_db_index] = nesqp; and mmap_nesqp is declared as struct nes_qp *mmap_nesqp[NES_MAX_USER_WQ_REGIONS]; which leads to an array overrun if the index is exactly equal to NES_MAX_USER_WQ_REGIONS. Fix this by bailing out if the index is greater than or equal to NES_MAX_USER_WQ_REGIONS. This was spotted by the Coverity checker (CID 2162). Acked-by: Glenn Streiff Signed-off-by: Roland Dreier commit 7f4da4745c34287938ce76b92b23409adeecb5b8 Author: Thomas Mingarelli Date: Tue Dec 4 17:41:54 2007 +0000 [WATCHDOG] HP ProLiant WatchDog driver Hp is providing a Hardware WatchDog Timer driver that will only work with the specific HW Timer located in the HP ProLiant iLO 2 ASIC. The iLO 2 HW Timer will generate a Non-maskable Interrupt (NMI) 9 seconds before physically resetting the server, by removing power, so that the event can be logged to the HP Integrated Management Log (IML), a Non-Volatile Random Access Memory (NVRAM). The logging of the event is performed using the HP ProLiant ROM via an Industry Standard access known as a BIOS Service Directory Entry. Signed-off-by: Thomas Mingarelli Signed-off-by: Wim Van Sebroeck commit bb59b5578a73d0e0e4e208a014fa7ea0c4f0ccb4 Author: Mike Frysinger Date: Wed Jan 30 17:38:21 2008 +0800 [WATCHDOG] blackfin Watchdog driver: relocate all strings used in __init functions to __initdata Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Wim Van Sebroeck commit 6ea8115bb6f359df4f45152f2b40e1d4d1891392 Author: Florian Fainelli Date: Mon Jan 7 19:08:49 2008 +0100 [WATCHDOG] Convert mtx1 wdt to be a platform device and use generic GPIO API This patch converts the MTX-1 to be a platform device, use the available generic GPIO API for the MTX-1 board and register the miscdev alias. Signed-off-by: Florian Fainelli Signed-off-by: Wim Van Sebroeck commit 75c752e6c3147f596c13365b200b91d754b66f59 Author: Andrew Sharp Date: Thu Dec 13 16:16:42 2007 -0800 [WATCHDOG] Add support for SB1 hardware watchdog Support watchdog timers built into SiByte MIPS SoCs. Signed-off-by: Andy Sharp Signed-off-by: Wim Van Sebroeck Cc: Ralf Baechle Signed-off-by: Andrew Morton commit 6165894fb6293072848e5699f3fcbe88b7c60815 Author: Mauro Carvalho Chehab Date: Fri Feb 15 18:41:06 2008 -0300 V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum Thanks to Martin Michlmayr for reporting this issue: The zoran driver fails to compile on the ARM Orion platform with: In file included from drivers/media/video/zoran_procfs.c:50: drivers/media/video/zoran.h:232: error: expected identifier before numeric constant The reason is that drivers/media/video/zoran.h defines an enum with GPIO_MAX in it, but Orion contains a #define GPIO_MAX 32 in include/asm-arm/arch-orion/orion.h Signed-off-by: Mauro Carvalho Chehab commit ea35e3a754b2ba5f712c3f4df55e426ae2e4d60a Author: Paul Mundt Date: Thu Feb 14 07:24:22 2008 -0300 V4L/DVB (7205): tuner-xc2028 depends on FW_LOADER Signed-off-by: Paul Mundt Signed-off-by: Mauro Carvalho Chehab commit baff6cdd3328e7b35c4e155d79105621812bceec Author: Ricardo Cerqueira Date: Wed Feb 13 22:41:15 2008 -0300 V4L/DVB (7201): cx88-mpeg: Fix race condition in variable access There was a possible race condition in the increment/decrement of the active device references counter. Thanks to Trent Piepho (xyzzy@speakeasy.org) for bringing it up. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit 40ae91a758df916d7a5640fb2de20537ef7849fd Author: Mauro Carvalho Chehab Date: Thu Feb 14 01:52:48 2008 -0300 V4L/DVB (7200): Fix FM firmware loading There's no need to load SCode table for FM. Signed-off-by: Mauro Carvalho Chehab commit 83db33a3e5c4200eaf5dec5b4883c0e73f468a3b Author: Jiri Slaby Date: Wed Feb 13 20:04:49 2008 -0300 V4L/DVB (7198): V4L, include ioctl.h in videodev headers Fix compilation of user processes which includes videodev*.h but not includes linux/ioctl.h: v4l2ext_helper.c: In function 'process_ioctl': v4l2ext_helper.c:183: warning: implicit declaration of function '_IOWR' v4l2ext_helper.c:183: error: expected expression before 'struct' v4l2ext_helper.c:183: error: case label does not reduce to an integer constant Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit 7c018804c0900e7be18507f1eb24e631aa9816ea Author: Robert Fitzsimons Date: Wed Feb 13 16:38:11 2008 -0300 V4L/DVB (7197): bttv: Fix overlay divide error The initial work to convert the bttv driver to V4L2 "Partial conversion from V4L1 to V4L2" (e84619b17440ccca4e4db7583d126c4189b987e5), missed the line which set the appropriate overlay crop structure in the newly allocated bttv_buffer. This then causes a divide error in the bttv_calc_geo function. Signed-off-by: Robert Fitzsimons Signed-off-by: Mauro Carvalho Chehab commit c9fe1d6ba603ddc5f2ef0a6b84f9df2bb4c679f1 Author: Tony Breeds Date: Tue Feb 12 02:54:33 2008 -0300 V4L/DVB (7195): xc5000: fix build error when built as module drivers/built-in.o: In function `set_type': tuner-core.c:(.text+0x8879d): undefined reference to `xc5000_attach' Signed-off-by: Tony Breeds Reviewed-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 27d0fe189437803d5ad146d508ec2fd77252c73f Author: Roland Stoll Date: Mon Feb 11 13:00:34 2008 -0300 V4L/DVB (7194): cx88-mpeg: Allow concurrent access to cx88-mpeg devices It currently isn't possible to open the frontend device of cx88-mpeg devices (DVB or Blackbird) multiple times concurrently. (for instance, to attach a signal monitoring tool while reading a stream, or to send a frequency change ioctl) This patch fixes that condition. Signed-off-by: Roland Stoll Signed-off-by: Ricardo Cerqueira Reviewed-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 968fb08912880e34a05a0cca7907392bac920aa2 Author: Ricardo Cerqueira Date: Wed Jan 16 19:56:55 2008 -0300 V4L/DVB (7193): tveeprom: Add proper tuner mapping for hauppauge eeprom id 133 Do away with the need to set tuner=63 on cx88xx with recent HVR-1300 boards Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit f0ba356c85c25c2732098885a6a089be4698da94 Author: Adrian Pardini Date: Mon Feb 11 12:40:53 2008 -0300 V4L/DVB (7192): Adds support for Genius TVGo A11MCE Signed-off-by: Adrian Pardini Signed-off-by: Mauro Carvalho Chehab commit 57566ad2d83f58c02e191aa7f4d7cddad3f92618 Author: Tobias Lorenz Date: Sat Feb 9 16:08:24 2008 -0300 V4L/DVB (7189): autosuspend support Together with Oliver Neukum from Novell, USB autosuspend support was added. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit 5caf51342c81c7cb2a8c3998e3f606ccfa79cee2 Author: Tobias Lorenz Date: Mon Feb 4 22:26:08 2008 -0300 V4L/DVB (7188): radio-si470x version 1.0.6 This patch combines all the finished discussions and its resulting patches from the mailing list. The version 1.0.6 is mainly influenced by Oliver Neukum. He found a lot of small issues, that are fixed with this patch now. For me the most interesting thing is, that it's now safer to use it on other architectures. The history for version 1.0.6 is: - fixed coverity checker warnings in *_usb_driver_disconnect - probe()/open() race by correct ordering in probe() - DMA coherency rules by separate allocation of all buffers - use of endianness macros - abuse of spinlock, replaced by mutex - racy handling of timer in disconnect, replaced by delayed_work - racy interruptible_sleep_on(), replaced with wait_event_interruptible() - handle signals in read() The driver is tested with all Debian/testing radio programs and rdsd. The patch is tested against checkpatch.pl v1.12. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit ea75baf4b0f117564bd50827a49c4b14d61d24e9 Author: Hartmut Hackmann Date: Sat Feb 9 23:54:24 2008 -0300 V4L/DVB (7186): tda10086: make the 22kHz tone for DISEQC a config option Some cards need the diseqc signal modulated, while some just need the envelope to control the LNB supply. This fixes Bug 9887 Signed-off-by: Hartmut Hackmann Acked-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 83947d307d63dc0c30ab0809714f0bcbbdf8c3e2 Author: Michael Krufky Date: Sun Feb 10 20:13:25 2008 -0300 V4L/DVB (7183): radio-si470x: fix build warning fix the following build warning: radio-si470x.c: In function 'si470x_get_rds_registers': radio-si470x.c:562: warning: format '%ld' expects type 'long int', but argument 3 has type 'unsigned int' Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 61b080d214c4dba91fb726169fb0c3f0e8de4b45 Author: Mauro Carvalho Chehab Date: Fri Feb 8 16:07:04 2008 -0300 V4L/DVB (7180): em28xx: add URB_NO_TRANSFER_DMA_MAP, since urb->transfer_dma is set Thanks to Alan Stern for pointing this issue. Signed-off-by: Mauro Carvalho Chehab commit 3687e1e67e4920a202d53cc24678fb34fcda8fc5 Author: Mauro Carvalho Chehab Date: Fri Feb 8 15:44:25 2008 -0300 V4L/DVB (7179): Allow more than one em28xx board em28xx driver is capable of handling more than one usb device. However, isoc transfers require a large amount of data to be transfered. Before this patch, just one em28xx board were enough to allocate more than 50% URBs: T: Bus=02 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#= 1 Spd=480 MxCh= 8 B: Alloc=480/800 us (60%), #Int= 0, #Iso= 2 D: Ver= 2.00 Cls=09(hub ) Sub=00 Prot=01 MxPS=64 #Cfgs= 1 So, only one board could use an USB host at the same time. After the patch, it is possible to use more than one em28xx at the same time, on the same usb host, if the image size is slower or equal to 345600, since those images will require about 30% of the URBs: T: Bus=02 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#= 1 Spd=480 MxCh= 8 B: Alloc=232/800 us (29%), #Int= 0, #Iso= 2 D: Ver= 2.00 Cls=09(hub ) Sub=00 Prot=01 MxPS=64 #Cfgs= 1 So, in thesis, after the patch, it would be possible to use up to 3 boards by each usb host, if the devices are generating small images. Signed-off-by: Mauro Carvalho Chehab commit 92ea42f442c4895e38f525a097d7d8ce2a55b9b9 Author: Mauro Carvalho Chehab Date: Wed Feb 6 18:52:15 2008 -0300 V4L/DVB (7164): em28xx-alsa: Add a missing mutex Signed-off-by: Mauro Carvalho Chehab commit 00b8730f5db19f9ea0985d7f14f869df79a0bf76 Author: Mauro Carvalho Chehab Date: Wed Feb 6 18:34:13 2008 -0300 V4L/DVB (7163): em28xx: makes audio settings more stable Improves audio configurations on em28xx: - mutes audio before changing amux; - adds a delay after setting audio src; - waits up to 50ms for ac97 busy. Signed-off-by: Mauro Carvalho Chehab commit 0df8130fe80ebde052516c1d729aa5d1c69ebc5c Author: Mauro Carvalho Chehab Date: Wed Feb 6 15:56:16 2008 -0300 V4L/DVB (7162): em28xx: Fix endian and returns the correct values Signed-off-by: Mauro Carvalho Chehab commit 0da5176f4e0d5aea3e33a11a17c1847939df4dcc Author: Mauro Carvalho Chehab Date: Wed Feb 6 15:55:19 2008 -0300 V4L/DVB (7161): em28xx: Fix printing debug values higher than 127 Signed-off-by: Mauro Carvalho Chehab commit 1e7ad56f1fef94a7d8c1050bf3548d957fe67c01 Author: Mauro Carvalho Chehab Date: Wed Feb 6 09:00:41 2008 -0300 V4L/DVB (7160): em28xx: Allow register dump/setting for debug Adds vidioc_[g|s]_register handlers. This allows getting/setting register from em28xx. Signed-off-by: Mauro Carvalho Chehab commit 7463dda2ae868d3e0a6c98f65d6331481fc73ca3 Author: Mauro Carvalho Chehab Date: Tue Feb 5 22:29:26 2008 -0300 V4L/DVB (7158): Fix em28xx audio initialization AC97 register initialization seem to always be needed. This patch fixes audio for Prolink/Pixelview USB2 board. Signed-off-by: Mauro Carvalho Chehab commit 1685a6fed210b110ac8abeff24e2ffd1713cb3fb Author: Andrew Morton Date: Tue Feb 5 07:37:21 2008 -0300 V4L/DVB (7156): em28xx/em28xx-core.c: fix use of potentially uninitialized variable drivers/media/video/em28xx/em28xx-core.c: In function 'em28xx_set_audio_source': drivers/media/video/em28xx/em28xx-core.c:276: warning: 'no_ac97' may be used uninitialized in this function This looks like a genuine bug to me. Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 384b835aed8acf341d99969b58d27434685bdd3d Author: Brandon Philips Date: Mon Feb 4 20:52:21 2008 -0300 V4L/DVB (7150): [v4l] convert videbuf_vmalloc_memory to videobuf_vmalloc_memory Signed-off-by: Brandon Philips Signed-off-by: Mauro Carvalho Chehab commit 18c0ecf16e1caa266e12319b5ab82d80e8a3ccf0 Author: Roel Kluin <12o3l@tiscali.nl> Date: Sat Feb 2 20:20:58 2008 -0300 V4L/DVB (7139): add parentheses '!' has a higher priority than '&': bitanding has no effect. Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Mauro Carvalho Chehab commit 427d20c4e6321ed2482630900891e40b4f2de6a3 Author: Luc Saillard Date: Wed Jan 30 17:23:00 2008 -0300 V4L/DVB (7132): Add USB ID for a newer variant of Hauppauge WinTV-HVR 900 Device description: WinTV-HVR-900 M/R: 65018/B3C0 ##4207 Signed-off-by: Luc Saillard Signed-off-by: Mauro Carvalho Chehab commit fb62a5953e9e6969f78adc7291c1a8845116f776 Author: Mauro Carvalho Chehab Date: Thu Jan 31 13:59:29 2008 -0300 V4L/DVB (7122): saa7134-empress: Remove back lock videobuf functions at close() method already locks videobuf. It makes no sense to keep the locking at empress close() method. There is also a lock at open() method. I'm not sure if it is safe to remove the locking there. Signed-off-by: Mauro Carvalho Chehab commit 64f9477f95bf5d4ba49dc3988d47a15bc06bb5da Author: Mauro Carvalho Chehab Date: Thu Jan 31 13:57:53 2008 -0300 V4L/DVB (7121): Renames videobuf lock to vb_lock This helps to identify where vb_lock is being used, and find missusages of the locks. Signed-off-by: Mauro Carvalho Chehab commit ce3a35d3c00918296e552af5ecc7b771af766436 Author: Mauro Carvalho Chehab Date: Thu Jan 31 13:40:04 2008 -0300 V4L/DVB (7120): videobuf lock is already initialized at videobuf-core.c Removes the duplicated mutex_init code. Signed-off-by: Mauro Carvalho Chehab commit 0ed4a6ea9dbd9f5b77ce594f7f46be022d2c49ec Author: Oliver Endriss Date: Wed Jan 30 01:07:20 2008 -0300 V4L/DVB (7118): dvb-ttpci: Improved display of still pictures Improved display of still pictures (VIDEO_STILLPICTURE ioctl). Ensure that both fields are displayed for progressive frames. Thanks to Reinhard Nissl and Klaus Schmidinger for finding out that the FREEZE command does this. Thanks-to: Reinhard Nissl Thanks-to: Klaus Schmidinger Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 251130bf266000fe6e9fdccda50fe4b5c1d6cb24 Author: Kim Sandberg Date: Wed Jan 30 00:42:01 2008 -0300 V4L/DVB (7117): budget-av: Add support for Satelco EasyWatch PCI DVB-T Add support for Satelco EasyWatch PCI DVB-T, sub-id 0x1894:0x003a. Signed-off-by: Kim Sandberg Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 03aa73c58704182298495569bbb613bf8fc770d1 Author: Oliver Endriss Date: Tue Jan 29 23:56:51 2008 -0300 V4L/DVB (7116): budget-av: Add support for KNC TV Station Plus X4 Add support for KNC TV Station Plus X4, sub-system id 0x1894:0x0015. Based on a patch submitted by Johannes Deisenhofer. Thanks-to: Johannes Deisenhofer Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 998cb0827d62f13a80e7f7b0ec993e98184cbc57 Author: Tobias Lorenz Date: Mon Jan 28 22:49:14 2008 -0300 V4L/DVB (7110): Trivial printf warning fix (radio-si470) Thanks to Darren Salt for pointing this issue. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit c3f686f152767b84893e474acd1a7758988dc369 Author: Tobias Lorenz Date: Mon Jan 28 22:43:13 2008 -0300 V4L/DVB (7108): radio-si470x.c: check-after-use Adrian used the coverity checker against radio-si470x and found this: > The Coverity checker spotted the following check-after-use in > drivers/media/radio/radio-si470x.c: > > <-- snip --> > static void si470x_usb_driver_disconnect(struct usb_interface *intf) > { > struct si470x_device *radio = usb_get_intfdata(intf); > > del_timer_sync(&radio->timer); <------------------ > flush_scheduled_work(); > > usb_set_intfdata(intf, NULL); > if (radio) { <------------------ > video_unregister_device(radio->videodev); > kfree(radio->buffer); > kfree(radio); > } > } > <-- snip --> > > Either "radio" can be NULL and this case has to be properly handled or > the NULL check is not required. These two lines should indeed better be inside the if statement. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit 532fe65205253aef1ce5c0c76d2d8d303fb3fe71 Author: Adrian Bunk Date: Mon Jan 28 22:10:48 2008 -0300 V4L/DVB (7106): em28xx/: make 2 functions static This patch makes the following needlessly global functions static: - em28xx-core.c:em28xx_write_reg_bits() - em28xx-video.c:em28xx_vdev_init() Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit fe2b8f50a336bcd51e3d209c5838c573b4b540b3 Author: Adrian Bunk Date: Mon Jan 28 22:10:58 2008 -0300 V4L/DVB (7104): stk-sensor.c: make 2 functions static This patch makes the following needlessly global functions static: - stk_sensor_outb() - stk_sensor_inb() Signed-off-by: Adrian Bunk Acked-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit beb9e780a45a2e21f3d62bd4c71d695aa195fe69 Author: Adrian Bunk Date: Mon Jan 28 22:11:01 2008 -0300 V4L/DVB (7103): make stk_camera_cleanup() static stk_camera_cleanup() can become static. Signed-off-by: Adrian Bunk Acked-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit c52c4d063eb163d2980c1884370da453662a1f31 Author: Adrian Bunk Date: Mon Jan 28 22:11:15 2008 -0300 V4L/DVB (7102): make tuner-core.c:tuner_list static tuner_list can become static - and it's anyway a way too generic name for a global variable - see commit b00ef4b8d8c29bfb5f6f92ee60bc04b604f36ef2 for a completely different global variable of the same name I just made static... Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 805d92dfa627acad3d4a78966bc5e4f8183d48b3 Author: Adrian Bunk Date: Mon Jan 28 22:12:41 2008 -0300 V4L/DVB (7100): frontends/tda18271-common.c: fix off-by-one This patch fixes an off-by-one error spotted by the Coverity checker. Signed-off-by: Adrian Bunk Reviewed-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0e8f4cc5c8bb782edbaee54a760ebc034252fab0 Author: Matthias Schwarzott Date: Mon Jan 28 12:01:11 2008 -0300 V4L/DVB (7097): saa7134-dvb: add missing dvb_attach call (for tda10046_attach) saa7134-dvb: add missing dvb_attach around tda10046_attach This patch adds a possibly missing dvb_attach for tda10046_attach. This removes the hard dependency of saa7134-dvb on tda1004x module. Signed-off-by: Matthias Schwarzott Signed-off-by: Mauro Carvalho Chehab commit e08a8c9dc7d247ec2a98ea2d7ac5ecea6af5593c Author: Mauro Carvalho Chehab Date: Sun Jan 27 14:43:20 2008 -0300 V4L/DVB (7093): radio-sf16fmi: fix request_region() isapnp_fmi_probe attaches device. However, if request_region() fails, the device isn't disattached. Reviewed-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit dd49f30ca032464839085ec3a54dd9917829c891 Author: Douglas Schilling Landgraf Date: Sun Jan 27 14:29:51 2008 -0300 V4L/DVB (7092): radio-sf16fmr2: fix request_region() validation [bugzilla 9699] This patch changed the request_region() validation to avoid invalid return. Thanks to Roland Kletzing for bug report and data collection. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 0e3301ec23000ffbbe28771eb79628856a9a2f84 Author: Tobias Lorenz Date: Sun Jan 27 14:54:07 2008 -0300 V4L/DVB (7091): radio-si470x improvements and seldom problem fixed in tuning functions I updated the radio-si470x driver another time. Here are the commented history entries: - number of seek_retries changed to tune_timeout The last versions checked for the end of frequency tuning by polling a si470x register. Therefore polling depended on the usb utilization. This was changed to have a constant timeout now. - fixed problem with incomplete tune operations by own buffers The last version used a shared buffer to assembly the USB HID reports. It sometimes happened, that multiple functions were modifing this buffer simultanuously. When sending such reports, the hardware returned USB stalls (-EPIPE). Now buffers of the correct size (smaller than before) are allocated as local variables. - optimization of variables The size of some variables has been reduced to allow the compiler to generate more optimized code. - improved error logging At some important location, error checking was improved. Especially the usb transfers to access si470x registers and the tuning functions were modified. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit 2de3a5a5c52ae1550be537829bb487131430d74b Author: Jaime Velasco Juan Date: Sun Jan 27 12:25:00 2008 -0300 V4L/DVB (7090): V4L: stkwebcam: use v4l_compat_ioctl32 Signed-off-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit 1fdd61c0228a32b9a5e10593b225851d8920595b Author: Jaime Velasco Juan Date: Sun Jan 27 12:24:59 2008 -0300 V4L/DVB (7089): V4L: stkwebcam: Power management support Signed-off-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit 1112fb68ae9c838294d38e1f209fedbc0dbf11d5 Author: Jaime Velasco Juan Date: Sun Jan 27 12:24:58 2008 -0300 V4L/DVB (7088): V4L: stkwebcam: Add support for YUYV format Signed-off-by: Jaime Velasco Juan Signed-off-by: Mauro Carvalho Chehab commit 0ed464e13e9321de9d1fff356eda58498574272e Author: Cyrill Gorcunov Date: Sat Jan 26 07:38:01 2008 -0300 V4L/DVB (7086): driver: tcm825x - fix logical typo error This patch does fix potential NULL pointer dereference due to logical typo error. The issue is pointed out by Guennadi Liakhovetski Signed-off-by: Cyrill Gorcunov CC: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit 29e4e05041842bca57ec539e51cfeae8948e7320 Author: Hermann Pitton Date: Sun Jan 20 19:49:51 2008 -0300 V4L/DVB (7085): saa7134: detect the LifeView FlyDVB-T Hybrid Mini PCI Thanks to Angelo Lisco for his initial patch we missed and to Ahmet Dogan Ugurel confirming such a device functional. Signed-off-by: Hermann Pitton Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 728b92a2301c705dc36419ab0e7163b129462696 Author: Hermann Pitton Date: Sun Jan 20 19:42:01 2008 -0300 V4L/DVB (7084): saa7134: add support for the Medion / Creatix CTX948 card This adds support for analog inputs and DVB-T. Good sensitivity for DVB-T currently needs to use analog TV first. DVB-S support is not yet completed, but is on the way. Signed-off-by: Hermann Pitton Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit ad1ef131c35bb6967acd5ce3072a32ec1d27b482 Author: Hermann Pitton Date: Sun Jan 20 19:32:39 2008 -0300 V4L/DVB (7083): saa7134: enable radio and external analog audio-in on the md2819 It also enumerates now the separate composite input at first and adds mute ability to radio and external audio-in. Many thanks to Daftcho Tabakov for reporting the flaws and testing. Signed-off-by: Hermann Pitton Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 4ba243734a0363649c514353334ed3d6ca39a5fb Author: Hermann Pitton Date: Sun Jan 20 19:27:51 2008 -0300 V4L/DVB (7082): support for Twinhan Hybrid DTV-DVB 3056 PCI S-Video is unconfirmed, but likely correct. The remote is not yet investigated. Thanks go to Sioux for providing code and asking to fix the auto detection. Signed-off-by: sioux Signed-off-by: Hermann Pitton Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit c0e0aff9779303c7e3ef7e6db4001dbc2bfdcbdd Author: Antoine Jacquet Date: Fri Jan 25 22:03:10 2008 -0300 V4L/DVB (7081): zr364xx: add support for Creative DiVi CAM 516 Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit 71c044752cdae89136862495f244d37073e2cf66 Author: Antoine Jacquet Date: Fri Jan 25 22:01:53 2008 -0300 V4L/DVB (7080): zr364xx: add support for Pentax Optio 50 Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit e8e672c57736872ef0bd05640503ee04ff443890 Author: Antoine Jacquet Date: Fri Jan 25 22:00:19 2008 -0300 V4L/DVB (7079): zr364xx: fix typo in documentation Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit 46c9fc861f2a47ce806671933f96f03ab3bdda7a Author: Akinobu Mita Date: Sat Jan 19 05:38:59 2008 -0300 V4L/DVB (7076): bt878: include KERN_ facility level printk should use KERN_* levels. CC: Manu Abraham Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit a348d2005d4a76c8c84150329f926c255c994ead Author: Mauro Carvalho Chehab Date: Fri Jan 18 08:53:26 2008 -0300 V4L/DVB (7049): Remove sound/driver.h sound/driver.h is already included by sound/core. Signed-off-by: Mauro Carvalho Chehab commit 057596eea8402aa8f7a670bf3195665aa8267204 Author: Mauro Carvalho Chehab Date: Sat Feb 2 11:25:31 2008 -0300 V4L/DVB (7133): Fix Kconfig dependencies As pointed by Adrian Bunk, with I2C=m and VIDEO_DEV=y, videodev brokes. This patch moves the functions that videodev needs from v4l2-common. It also fixes some Kconfig changes. After this patch, I2C=m / VIDEO_DEV=y will make v4l2 core statically linked into kernel. v4l2-common will be m, and all V4L drivers will also be m. This approach is very conservative, since it is possible to have V4L drivers that don't need I2C or v4l2-common. The better is to map what drivers really need v4l2-common, making them to select v4l2-common, and allowing the others to be 'y', 'm' and 'n'. Signed-off-by: Mauro Carvalho Chehab commit 1a4e30c3eaffb83218977477bb83d54316844acb Author: Mauro Carvalho Chehab Date: Thu Jan 31 13:15:52 2008 -0300 V4L/DVB (7119): Remove obsolete code from v4l2-common Signed-off-by: Mauro Carvalho Chehab commit a9254475bbfbed5f0596d952c6a3c9806e19dd0b Author: Mauro Carvalho Chehab Date: Tue Jan 29 18:32:35 2008 -0300 V4L/DVB (7115): Fix bug #9833: regression when compiling V4L without I2C Adrian Bunk reported: > > Commit 8ffbc6559493c64d6194c92d856196fdaeb8a5fb causes the following > > compile error with CONFIG_VIDEO_DEV=y/m, CONFIG_I2C=n: > > > > <-- snip --> > > > > ... > > MODPOST 26 modules > > ERROR: "i2c_attach_client" [drivers/media/video/v4l2-common.ko] undefined! > > make[2]: *** [__modpost] Error 1 > > > > <-- snip --> ... And what should happen if CONFIG_VIDEO_DEV=y, CONFIG_I2C=m? CC: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 988d0093f9cb2bf27c299e373f9cbaac47dab2c1 Author: David S. Miller Date: Mon Feb 18 00:20:50 2008 -0800 [BLUETOOTH] hci_sysfs.c: Kill build warning. net/bluetooth/hci_sysfs.c: In function ‘del_conn’: net/bluetooth/hci_sysfs.c:339: warning: suggest parentheses around assignment used as truth value Signed-off-by: David S. Miller commit fea5fa875eb235dc186b1f5184eb36abc63e26cc Author: Joe Perches Date: Sun Feb 17 23:35:28 2008 -0800 [NET]: Remove MAC_FMT MAC_FMT is no longer used Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 235365f3aaaa10b7056293877c0ead50425f25c7 Author: Joe Perches Date: Sun Feb 17 23:34:54 2008 -0800 net/8021q/vlan_dev.c: Use print_mac. Remove direct use of MAC_FMT Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b791160b5af4ea95c72fb59d13079664beca1963 Author: YOSHIFUJI Hideaki Date: Sun Feb 17 23:29:30 2008 -0800 [XFRM]: Fix ordering issue in xfrm_dst_hash_transfer(). Keep ordering of policy entries with same selector in xfrm_dst_hash_transfer(). Issue should not appear in usual cases because multiple policy entries with same selector are basically not allowed so far. Bug was pointed out by Sebastien Decugis . We could convert bydst from hlist to list and use list_add_tail() instead. Signed-off-by: YOSHIFUJI Hideaki Acked-by: Sebastien Decugis Signed-off-by: David S. Miller commit 82453021b8be85171350c695d7ebafe7b517c812 Author: S.Çağlar Onur Date: Sun Feb 17 23:25:57 2008 -0800 [BLUETOOTH] net/bluetooth/hci_core.c: Use time_* macros The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Signed-off-by: S.Çağlar Onur Acked-by: Marcel Holtmann Signed-off-by: David S. Miller commit cbc9fc5dec60f84b62e0144165c545abd24847c0 Author: S.Çağlar Onur Date: Sun Feb 17 23:24:10 2008 -0800 [SPARC64] arch/sparc64/kernel/unaligned.c: Use time_* macros The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Signed-off-by: S.Çağlar Onur Signed-off-by: David S. Miller commit 3c62a2d3477ff7725210db57aec3d2806fa10c20 Author: David S. Miller Date: Sun Feb 17 23:22:50 2008 -0800 [SPARC64]: Always register a PROM based early console. Signed-off-by: David S. Miller commit f6095a5176e17b510235e80ecfb542eaee6e5666 Author: David S. Miller Date: Sun Feb 17 22:44:32 2008 -0800 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 966d905634de4433cea465fdcea19503c4ae260f Author: David S. Miller Date: Thu Feb 14 00:58:44 2008 -0800 [SPARC64]: Add -mtune=ultrasparc3 if possible. This gives better heuristics for the cost of a multiply (fixed 5 cycles), rather than the 'ultrasparc' setting (variable, and unpredictable if the second argument is non-constant). Example code size savings: text data bss dec hex filename 3823690 304040 448880 4576610 45d562 vmlinux 3824521 304040 448880 4577441 45d8a1 vmlinux.orig Signed-off-by: David S. Miller commit 54cd6ddec77b75e6926d73d263aec72255b24030 Author: David S. Miller Date: Thu Feb 14 00:37:21 2008 -0800 [SPARC64]: Remove Makefile code for ancient gcc and binutils. The kernel hasn't supported the compilers which need these tests for years. Signed-off-by: David S. Miller commit 5ee46e562c9c10a5e25920c4406a42061cf27839 Author: Wang Chen Date: Sun Feb 17 22:34:53 2008 -0800 [IPV6]: Fix hardcoded removing of old module code Rusty hardcoded the old module code. We can remove it now. Signed-off-by: Wang Chen Signed-off-by: David S. Miller commit 05705e4e1158ad2c1a22817f27d91ff0758fd0a9 Author: Pavel Emelyanov Date: Sun Feb 17 22:33:57 2008 -0800 [NETLABEL]: Move some initialization code into __init section. Everything that is called from netlbl_init() can be marked with __init. This moves 620 bytes from .text section to .text.init one. Signed-off-by: Pavel Emelyanov Acked-by: Paul Moore Signed-off-by: David S. Miller commit 227c43c3bca76df704231324405980851dc7f528 Author: Pavel Emelyanov Date: Sun Feb 17 22:33:16 2008 -0800 [NETLABEL]: Shrink the genl-ops registration code. Turning them to array and registration in a loop saves 80 lines of code and ~300 bytes from text section. Signed-off-by: Pavel Emelyanov Acked-by: Paul Moore Signed-off-by: David S. Miller commit f47b7257c7368698eabff6fd7b340071932af640 Author: Jarek Poplawski Date: Sun Feb 17 22:31:19 2008 -0800 [AX25] ax25_out: check skb for NULL in ax25_kick() According to some OOPS reports ax25_kick tries to clone NULL skbs sometimes. It looks like a race with ax25_clear_queues(). Probably there is no need to add more than a simple check for this yet. Another report suggested there are probably also cases where ax25 ->paclen == 0 can happen in ax25_output(); this wasn't confirmed during testing but let's leave this debugging check for some time. Reported-and-tested-by: Jann Traschewski Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit 9bf1d83e7ee653862ef740435a7f41e8fd6452a9 Author: Kris Katterjohn Date: Sun Feb 17 22:29:19 2008 -0800 [TCP]: Fix tcp_v4_send_synack() comment Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit 9c00409a2a677511506126634fbfd9f217989e57 Author: Uwe Kleine-Koenig Date: Sun Feb 17 22:28:32 2008 -0800 [IPV4]: fix alignment of IP-Config output Make the indented lines aligned in the output (not in the code). Signed-off-by: Uwe Kleine-Koenig Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 32b90fc8b11b94b719745512d7e58c0b25717260 Author: Matti Linnanvuori Date: Sun Feb 17 22:21:04 2008 -0800 Documentation: fix tcp.txt Replace BIC with CUBIC as default congestion control. Fix grammar. Signed-off-by: Matti Linnanvuori Signed-off-by: David S. Miller commit c58310bf4933986513020fa90b4190c7492995ae Merge: 269cdfa... 1309d4e... Author: Lachlan McIlroy Date: Mon Feb 18 13:51:42 2008 +1100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus commit d6584f3a08055688b2344eb26379fb2f3147ce91 Author: Julia Lawall Date: Sun Feb 17 18:42:53 2008 -0800 net/9p/trans_virtio.c: Use BUG_ON if (...) BUG(); should be replaced with BUG_ON(...) when the test has no side-effects to allow a definition of BUG_ON that drops the code completely. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @ disable unlikely @ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (unlikely(E)) { BUG(); } + BUG_ON(E); ) @@ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (E) { BUG(); } + BUG_ON(E); ) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 163e3cb7daa8c3a6dde6a13a3d09a198930c6822 Author: Julia Lawall Date: Sun Feb 17 18:42:03 2008 -0800 net/rxrpc: Use BUG_ON if (...) BUG(); should be replaced with BUG_ON(...) when the test has no side-effects to allow a definition of BUG_ON that drops the code completely. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @ disable unlikely @ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (unlikely(E)) { BUG(); } + BUG_ON(E); ) @@ expression E,f; @@ ( if (<... f(...) ...>) { BUG(); } | - if (E) { BUG(); } + BUG_ON(E); ) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 9ff566074689e3aed1488780b97714ec43ba361d Author: David S. Miller Date: Sun Feb 17 18:39:54 2008 -0800 Revert "[NDISC]: Fix race in generic address resolution" This reverts commit 69cc64d8d92bf852f933e90c888dfff083bd4fc9. It causes recursive locking in IPV6 because unlike other neighbour layer clients, it even needs neighbour cache entries to send neighbour soliciation messages :-( We'll have to find another way to fix this race. Signed-off-by: David S. Miller commit 93b2d4a208eeb19bff95e98c34503ce4b03cd0f9 Author: David S. Miller Date: Sun Feb 17 18:35:07 2008 -0800 Revert "[RTNETLINK]: Send a single notification on device state changes." This reverts commit 45b503548210fe6f23e92b856421c2a3f05fd034. It break locking around dev->link_mode as well as cause other bootup problems. Signed-off-by: David S. Miller commit 269cdfaf769f5cd831284cc831790c7c5038040f Author: Lachlan McIlroy Date: Wed Nov 28 18:28:09 2007 +1100 [XFS] Added quota targets and removed dmapi directory Fixes build failures introduced by bad merge to mainline. commit 794f744b225aaf35742aac9e7b9dda96a9943413 Author: Eric Sandeen Date: Tue Nov 27 16:59:56 2007 +1100 [XFS] Fix up xfs out-of-tree builds. (a.k.a. external modules) Change -I include directives to find headers in the out-of-tree spot. This allows a directory containing only xfs files to be built as: SGI-PV: 971186 SGI-Modid: xfs-linux-melb:xfs-kern:29878a Signed-off-by: Eric Sandeen Signed-off-by: Donald Douwsma Signed-off-by: Lachlan McIlroy commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2 Author: Andi Kleen Date: Tue Nov 27 16:53:47 2007 +1100 [XFS] Remove Makefile wrappers in XFS Makefile (and Kbuild) would include Makefile-linux-26 I doubt XFS will really still compile on 2.4; so drop that. This moves Makefile-linux-26 into Makefile and drops Kbuild. Also having wrappers as both Kbuild and Makefile seemed redundant anyways. The patch is relatively large because it renames a file, but no functional changes. SGI-PV: 971050 SGI-Modid: xfs-linux-melb:xfs-kern:29781a Signed-off-by: Andi Kleen Signed-off-by: Donald Douwsma Signed-off-by: Tim Shimmin Signed-off-by: Lachlan McIlroy commit c8620c2590f43eff864fe597fcbe5b72ab7a7b94 Author: Adrian Bunk Date: Mon Feb 18 09:00:05 2008 +0800 [CRYPTO] null: Add missing Kconfig dependency on BLKCIPHER This patch fixes the following build error caused by commit 3631c650c495d61b1dabf32eb26b46873636e918: <-- snip --> ... LD .tmp_vmlinux1 crypto/built-in.o: In function `skcipher_null_crypt': crypto_null.c:(.text+0x3d14): undefined reference to `blkcipher_walk_virt' crypto_null.c:(.text+0x3d14): relocation truncated to fit: R_MIPS_26 against `blkcipher_walk_virt' crypto/built-in.o: In function `$L32': crypto_null.c:(.text+0x3d54): undefined reference to `blkcipher_walk_done' crypto_null.c:(.text+0x3d54): relocation truncated to fit: R_MIPS_26 against `blkcipher_walk_done' crypto/built-in.o:(.data+0x2e8): undefined reference to `crypto_blkcipher_type' make[1]: *** [.tmp_vmlinux1] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Herbert Xu commit db4315d6f53edc2cc0b0b06fce1beffebb119c71 Author: Pavel Machek Date: Tue Feb 5 00:48:13 2008 +0100 timer_list: print relative expiry time signed Relative expiry time can get negative, so it should be signed. Signed-off-by: Pavel Machek Signed-off-by: Thomas Gleixner commit edd2fd643c500c812cae5b0d314ab9db9f959898 Author: Chien Tung Date: Fri Feb 15 21:00:36 2008 -0600 RDMA/nes: Fix VLAN support We need to account for the VLAN header size in nes_netdev_change_mtu() and nes_netdev_init(). Also, add spin lock/unlock during VLAN RX registration so only one process can assign VLAN group for a given interface at a time. Signed-off-by: Chien Tung Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit b57dfbc4f7f8d394c5e96677d2b66ffca1b4e8a7 Merge: 42fe95c... e8ef7f2... Author: David S. Miller Date: Fri Feb 15 15:59:19 2008 -0800 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 42fe95cae50bbea4c83b15962b853d6d3b14db37 Merge: 997b37d... 6fff1c6... Author: David S. Miller Date: Fri Feb 15 15:56:47 2008 -0800 Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 1309d4e68497184d2fd87e892ddf14076c2bda98 Merge: 101142c... 5410f72... Author: Linus Torvalds Date: Fri Feb 15 15:29:23 2008 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata: fix sparse warning in pata_acpi.c ata: fix sparse warning in pata_marvell.c ata: fix sparse warning in pata_jmicron.c ata: fix sparse warning in pata_cs5536.c ata: sparse fixes for pata_amd.c pata_scc.c: add thaw ops pata_cs5536.c bugfix pata_legacy: don't call ata_host_detach() after initialization failure ata: fix sparse warnings in sata_mv.c ata: fix sparse warning in sata_via.c ata: fix sparse warning in sata_promise.c ata: fix sparse warning in ata_piix.c ata: fix sparse warning in libata-core.c ata: make ata_scsiop_inq_89 static in libata-scsi.c commit 11e0704b7ec3abfeaee7e3a56f11c82024d1ae01 Author: Glenn Streiff Date: Fri Feb 15 11:41:27 2008 -0600 RDMA/nes: Fix MAC interrupt erroneously masked on ifdown Only mask out MAC interrupt if necessary and re-enable on ifup. There could be multiple netdevs going through the same MAC. MAC interrupts should not be masked off until the last netdev is downed. Signed-off-by: Chien Tung Signed-off-by: Glenn Streiff Signed-off-by: Roland Dreier commit c7482b81c8b524193d736488c149adbe27a7eb7f Author: Li Zefan Date: Fri Feb 15 10:24:49 2008 +0800 IB: Fix return value in ib_device_register_sysfs() If kobject_create_and_add() fails and returns NULL, the current code in ib_device_register_sysfs() does not set ret and hence returns 0. Set ret to -ENOMEM for this failure, so that the caller knows that ib_device_register_sysfs() actually failed. Signed-off-by: Li Zefan Signed-off-by: Roland Dreier commit 5410f729e331bd607d99057ece59f6d7866cd3dc Author: Harvey Harrison Date: Wed Feb 13 21:14:31 2008 -0800 ata: fix sparse warning in pata_acpi.c drivers/ata/pata_acpi.c:80:2: warning: returning void-valued expression Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 42268e26aa9d2b6d0d1f890c354447f185fc2624 Author: Harvey Harrison Date: Wed Feb 13 21:14:29 2008 -0800 ata: fix sparse warning in pata_marvell.c drivers/ata/pata_marvell.c:88:2: warning: returning void-valued expression Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit ef2f2e4911654f0bc3b432b3d27e7c4d992efb7b Author: Harvey Harrison Date: Wed Feb 13 21:14:26 2008 -0800 ata: fix sparse warning in pata_jmicron.c drivers/ata/pata_jmicron.c:118:2: warning: returning void-valued expression Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 2072fb55cf2400f2f7f4b47849b69f440bb9808f Author: Harvey Harrison Date: Wed Feb 13 21:14:23 2008 -0800 ata: fix sparse warning in pata_cs5536.c Everybody passes in a u32...why fight it. drivers/ata/pata_cs5536.c:124:26: warning: incorrect type in argument 3 (different signedness) drivers/ata/pata_cs5536.c:124:26: expected int *val drivers/ata/pata_cs5536.c:124:26: got unsigned int * Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit d98f88c222bf56cfa5839930fb0d0af22d1c36bf Author: Harvey Harrison Date: Wed Feb 13 21:14:20 2008 -0800 ata: sparse fixes for pata_amd.c drop return statement. drivers/ata/pata_amd.c:149:2: warning: returning void-valued expression Commit ce54d1616302117fa98513ae916bb3333e1c02ea pata_amd: update mode selection for NV PATAs added the initializer for nv_mode_filter but missed deleting the previously set mode_filter drivers/ata/pata_amd.c:509:3: warning: Initializer entry defined twice drivers/ata/pata_amd.c:521:3: also defined here drivers/ata/pata_amd.c:544:3: warning: Initializer entry defined twice drivers/ata/pata_amd.c:556:3: also defined here Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 1ec414ecc0fe09a610dfafcc6958103a37b7eb0f Author: Akira Iguchi Date: Wed Feb 13 11:55:07 2008 +0900 pata_scc.c: add thaw ops This patch adds default thaw ops and fixes the freeze/thaw inconsistency. Signed-off-by: Kou Ishizaki Signed-off-by: Akira Iguchi Signed-off-by: Jeff Garzik commit b6966a61a8b5df2987856c81f39a8fd014d32a80 Author: Martin K. Petersen Date: Wed Feb 13 01:41:44 2008 -0500 pata_cs5536.c bugfix Fix speed negotiation for secondary device. Signed-off-by: Martin K. Petersen Signed-off-by: Jeff Garzik commit 7a3a16fe7ddf0570e2fcf286d7e244a5e1e16f6a Author: Tejun Heo Date: Wed Feb 13 18:20:19 2008 +0900 pata_legacy: don't call ata_host_detach() after initialization failure ata_host_detach() detaches an attached port and shouldn't be called on a port which hasn't been attached yet. pata_legacy incorrectly calls ata_host_detach() on unattached port after initialization failure causing oops. Fix it. Signed-off-by: Tejun Heo Cc: Alan Cox Cc: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Jeff Garzik commit 5ab063e397d9f6fcadb37a07465efcc87f9e9345 Author: Harvey Harrison Date: Wed Feb 13 21:14:14 2008 -0800 ata: fix sparse warnings in sata_mv.c pp is never used again in this function, no need to declare a new one. drivers/ata/sata_mv.c:1545:24: warning: symbol 'pp' shadows an earlier one drivers/ata/sata_mv.c:1501:22: originally declared here drivers/ata/sata_mv.c:1553:24: warning: symbol 'pp' shadows an earlier one drivers/ata/sata_mv.c:1501:22: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 48e1f800eaa08eefe00476b83a7983b707d31848 Author: Harvey Harrison Date: Wed Feb 13 21:14:11 2008 -0800 ata: fix sparse warning in sata_via.c drivers/ata/sata_via.c:336:2: warning: returning void-valued expression Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 6903c0f7efe907ada1b9636b52c5ae11fd51ab68 Author: Harvey Harrison Date: Wed Feb 13 21:14:08 2008 -0800 ata: fix sparse warning in sata_promise.c drivers/ata/sata_promise.c:546:15: warning: symbol 'len' shadows an earlier one drivers/ata/sata_promise.c:538:6: originally declared here len is set again immediately after the loop, so this is safe. Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 018d982721209241ede1180aa795d68833c26b10 Author: Harvey Harrison Date: Wed Feb 13 21:14:05 2008 -0800 ata: fix sparse warning in ata_piix.c drivers/ata/ata_piix.c:1655:8: warning: symbol 'rc' shadows an earlier one drivers/ata/ata_piix.c:1616:6: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit eeb37ac87459f8e86d53243bd97e0c086de7eb87 Author: Harvey Harrison Date: Thu Feb 14 10:45:23 2008 -0800 ata: fix sparse warning in libata-core.c rc is used to test the return value and possibly return an error. No need to redeclare inside the loop. drivers/ata/libata-core.c:7089:7: warning: symbol 'rc' shadows an earlier one drivers/ata/libata-core.c:7030:9: originally declared here Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 08f01058fe8fcf0d4d69d96d667c51d52859b31d Author: Harvey Harrison Date: Thu Feb 14 10:45:20 2008 -0800 ata: make ata_scsiop_inq_89 static in libata-scsi.c Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 6fff1c64ffd899e0b70fbb0201c6603f078ea942 Author: Stefano Brivio Date: Sat Feb 9 07:20:43 2008 +0100 b43legacy: Add driver load messages This adds printk messages with basic information about the driver being loaded. This information includes a summary of the compiled-in features, which simplifies bug-reporting and debugging a lot. Also a firmware ID is printed. This is a unique identifier blob for a specific version of the firmware. This ID is attached to a specific version of the firmware blob in b43-fwcutter (see fwcutter git). This helps users to select the right firmware for their device. This also makes it possible to use automated scripts to fetch and extract the right firmware for the driver. (The script will grep the .ko for the "Firmware-ID: xxx" string.) While the driver might still support other versions of the firmware for backward compatibility, this will always print out the officially supported version, which people _should_ use. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit 943dbef4b84b9cee3501e45b654e38335900570b Author: Dan Williams Date: Thu Feb 14 17:49:41 2008 -0500 ipw2200: fix ucode assertion for RX queue overrun Restock the RX queue when there are a lot of unused frames so that the RX ring buffer doesn't overrun, causing a ucode assertion. Backport of patch "iwlwifi: fix ucode assertion for RX queue overrun". Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit a6477249b4a1c2da6376f47fc175882be9adb844 Author: Reinette Chatre Date: Thu Feb 14 10:40:28 2008 -0800 iwlwifi: only check for association id when associating with AP There is no association process in IBSS mode - so testing the association id is not needed. Signed-off-by: Reinette Chatre Signed-off-by: Tomas Winkler CC: Richard Scherping Signed-off-by: John W. Linville commit 58ff6d4db9b51533656173282de8d21f72080a49 Author: Tomas Winkler Date: Wed Feb 13 02:47:54 2008 +0200 iwlwifi: reverting 'misc wireless annotations' patch for iwlwifi This patch revert commit blow that wrongly suppressed sparse warning in iwlwifi eeprom reading In addtion it suppresses correctly the iwlwifi eeprom register reading anomaly. commit 45883ae47a0a4700c0f4716dc75a255cccdc3a76 misc wireless annotations Signed-off-by: Al Viro Signed-off-by: Tomas Winkler Cc: Al Viro Signed-off-by: John W. Linville commit cfbc35b62700447b6b14b744554f5dca17bdfa45 Author: Stefano Brivio Date: Tue Feb 12 03:09:10 2008 +0100 b43legacy: fix firmware load message level The firmware version information should always get printed. Not only on a debug build. The patch by Michael Buesch has been ported to b43legacy. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit 1a1c360d73e5100a4dda1010ce0f1ebd71e03811 Author: Stefano Brivio Date: Tue Feb 12 03:09:00 2008 +0100 b43legacy: add firmware information to modinfo This adds the firmware ID to modinfo. The patch by Michael Buesch has been ported to b43legacy. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit ceffefd15aac78841432230627308b8a382dbcfc Author: Michael Buesch Date: Sun Feb 10 14:16:52 2008 +0100 mac80211: Fix initial hardware configuration On the initial device-open we need to defer the hardware reconfiguration after we incremented the open_count, because the hw_config checks this flag and won't call the lowlevel driver in case it is zero. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit db433febbadaf1fa9862fb5068b119be1d312d76 Author: Ivo van Doorn Date: Sun Feb 10 11:21:57 2008 +0100 rt2x00: Add new USB ID to rt2500usb Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 588e6cdfccb847661c62a2cc0f301d689b94ee64 Author: Michael Buesch Date: Sat Feb 9 17:53:41 2008 +0100 b43: Fix firmware load message level The firmware version information should always get printed. Not only on a debug build. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 9c7d99d6fba1f26b95fb70b43f7954e9684cad3e Author: Michael Buesch Date: Sat Feb 9 10:23:49 2008 +0100 b43: Add firmware information to modinfo This adds the firmware ID to modinfo. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 26bc783f8cf7227718f8b4cbc32f0c3a898b128f Author: Michael Buesch Date: Sat Feb 9 00:18:35 2008 +0100 b43: Add driver load messages This adds printk messages with basic information about the driver being loaded. This information includes a summary of the compiled-in features, which simplifies bug-reporting and debugging a lot. Also a firmware ID is printed. This is a unique identifier blob for a specific version of the firmware. This ID is attached to a specific version of the firmware blob in b43-fwcutter (see fwcutter git). This helps users to select the right firmware for their device. This also makes it possible to use automated scripts to fetch and extract the right firmware for the driver. (the script will grep the .ko for the "Firmware-ID: xxx" string. While the driver might still support other versions of the firmware for backward compatibility, this will always print out the officially supported version, which people _should_ use. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 8e118f0ed866afab654a438b85643d4f1472f28b Author: Stefano Brivio Date: Fri Feb 8 06:31:53 2008 +0100 b43legacy: fix DMA for 30/32-bit DMA engines This checks if the DMA address is bigger than what the controller can manage. It will reallocate the buffers in the GFP_DMA zone in that case. The patch by Michael Buesch has been ported to b43legacy. Thanks to Matti Viljanen for reporting this. Cc: Matti Viljanen Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit d68ab68066805fdfee1f5f29ec2ec0179fd92fe1 Author: Mohamed Abbas Date: Thu Feb 7 13:16:33 2008 -0800 iwlwifi: earlier rx allocation Value of count is used to decide when to replenish rx buffers. If it is equal or above 8 we replenish the buffers. Ensure there is no starvation by initializing count to 8 - thus forcing replenish at first iteration. This is helpful when rx receives batches of buffers smaller than 8. Signed-off-by: Mohamed Abbas Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit c342a1b91f6ccd317c68defd3b4c7bb75397d967 Author: Gregory Greenman Date: Wed Feb 6 11:20:40 2008 -0800 iwlwifi: Don't send host commands on rfkill This patch prevents sending host commands when rfkill is on Signed-off-by: Gregory Greenman Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit 9788864e2169ed3611e61c097efe4944c23fe7e9 Author: Reinette Chatre Date: Wed Feb 6 11:20:38 2008 -0800 iwlwifi: do not clear GEO_CONFIGURED bit when calling _down The geos information is set up during probe and should only be removed during pci_remove, not during _down. This is a temporary fix until the setting of the status bits have been cleaned up (to explicitly match all setting with clearing of status bits). Signed-off-by: Reinette Chatre Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville commit a97b1f3d203d0fe5503578c6ee8bfdb89ed72679 Author: Jussi Kivilinna Date: Wed Feb 6 15:36:10 2008 +0200 rndis_wlan: enable stall workaround by link quality instead of link speed Enable workaround for poor link stalls by link quality instead of link speed. Using link speed caused workaround be active always on 802.11b networks which reduced performance and not even catch all stalls. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 281c56dd276e587a7b4a65764ac68ae250e73235 Author: Bruno Randolf Date: Tue Feb 5 18:44:55 2008 +0900 ath5k: correct padding in tx descriptors when setting up the tx descriptors for the hardware we must account for any padding between the header and the data we might have added previously. frame len is the length of the frame in the air (including FCS but no padding) and buffer len is the length of the buffer (including padding, but without FCS). changing the way ah_setup_tx_desc is called: now excluding the FCS, since it's easier to add that in the function where we need it. before this fix we sent trailing zero bytes after the packet (because frame len included the padding) which was not a big problem without WEP, but with WEP this resultes in a wrong WEP checksum and the packet is discarded - which is how i noticed at all ;) an easy way to run into header padding problems, btw, is to connect to a QoS (WME) enabled access point (eg. madwifi) - QoS data frames are 2 byte longer and will require padding. this patch applies on top of luis latest patch series from 04.02.2008. drivers/net/wireless/ath5k/base.c: Changes-licensed-under: 3-Clause-BSD drivers/net/wireless/ath5k/hw.c: Changes-licensed-under: ISC Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit bd196ec7f03fff6935f66a9a3cf27accd34a75b9 Author: John W. Linville Date: Thu Feb 7 15:46:01 2008 -0500 wavelan: mark hardware interfacing structures as packed With assists from Russell King and Andrew Morton ... Signed-off-by: John W. Linville commit e8ef7f295b9f02c1522da405ac545318174239d5 Author: David Graham Date: Thu Feb 14 10:17:20 2008 -0800 e1000e: PCIe devices do not need to unset MANC_ARP_ENA Users reported that ARP's were lost with e1000e. The problem is fixed by not enabling this manageability configuration bit. None of the release_manageability code is actually needed as the normal device reset during a shutdown returns everthing to the right condition automatically. Signed-off-by: David Graham Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit aa20c6c6d22efcca76c6225eb46f5903ce14c7c8 Author: David Graham Date: Thu Feb 14 10:17:12 2008 -0800 igb: PCIe devices do not need to unset MANC_ARP_ENA Users reported that ARP's were lost with igb. The problem is fixed by not enabling this manageability configuration bit. None of the release_manageability code is actually needed as the normal device reset during a shutdown returns everthing to the right condition automatically. Signed-off-by: David Graham Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 41825d7158d4ca6488d562d73279392a886b9e7c Author: Auke Kok Date: Tue Feb 12 15:20:33 2008 -0800 ixgbe: Correctly obtain protocol information on transmit In reply to "RE: [Fwd: [PATCH 2.6.25] ixgbe/igb: correctly obtain protocol information on transmit]" from Andy Gospodarek: The driver was incorrectly looking at socket headers for protocol information, needed for checksumming offload. Fix this by not looking at the socket but frame headers instead. This disregards extension headers but it's unclear that linux generates those anyway. Tested by Andy Gospodarek. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 5918bd88effd0233a048983570ec5803f5f753dc Author: Auke Kok Date: Tue Feb 12 15:20:24 2008 -0800 e1000e: Fix CRC stripping in hardware context bug CRC stripping was only correctly enabled for packet split recieves which is used when receiving jumbo frames. Correctly enable SECRC also for normal buffer packet receives. Tested by Andy Gospodarek and Johan Andersson, see bugzilla #9940. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit fdb26629f31b898c2c4a4127c7d5c2401fb5ac60 Author: Al Viro Date: Wed Feb 13 03:58:36 2008 +0000 gianfar iomem misannotations Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 9f30c768c00fd0f0a2ab37ef29d8c8c5a7abdf2e Author: Jarek Poplawski Date: Wed Feb 13 11:17:58 2008 +0000 mkiss: ax_bump() locking fix According to one of OOPSes reported by Jann softirq can break while skb is prepared for netif_rx. The report isn't complete, so the real reason of the later bug could be different, but IMHO this locking break in ax_bump is unsafe and unnecessary. Reported-and-tested-by: Jann Traschewski Signed-off-by: Jarek Poplawski Signed-off-by: Jeff Garzik commit a1a98b72dbd17e53cd92b8e78f404525ebcfd981 Author: Chuck Ebbert Date: Wed Feb 13 19:47:11 2008 -0500 Fix station address detection in smc Megahertz EM1144 PCMCIA ethernet adapter needs special handling because it has two VERS_1 tuples and the station address is in the second one. Conversion to generic handling of these fields broke it. Reverting that fixes the device. https://bugzilla.redhat.com/show_bug.cgi?id=233255 Thanks go to Jon Stanley for not giving up on this one until the problem was found. Signed-off-by: Chuck Ebbert Signed-off-by: Jeff Garzik commit fa2144ba9a31d1d0dc9607508576c3850e0d95b1 Author: Sam Ravnborg Date: Fri Feb 15 13:53:11 2008 +0100 kbuild: explain why DEBUG_SECTION_MISMATCH is UNDEFINED We started to see patches enabling this - so explain why it is disabled and the condition to enable it again. Signed-off-by: Sam Ravnborg commit 242f1a343776a621ad5c3446d6f2718d37863cb5 Author: Frederik Deweerdt Date: Fri Feb 15 19:19:33 2008 +0800 [CRYPTO] tcrypt: Add missing Kconfig dependency on BLKCIPHER Building latest git fails with the following error: ERROR: "crypto_alloc_ablkcipher" [crypto/tcrypt.ko] undefined! This appears to happen because CONFIG_CRYPTO_TEST is set while CONFIG_CRYPTO_BLKCIPHER is not. The following patch fixes the problem for me. Signed-off-by: Frederik Deweerdt Signed-off-by: Herbert Xu commit f881d8290c59beb472062142aab54af2554d0d9c Author: Patrick McHardy Date: Fri Feb 15 19:15:05 2008 +0800 [HIFN]: Fix invalid config ifdefs for RNG support The CRYPTO_DEV_HIFN_795X_RNG ifdefs are missing the CONFIG_ prefix. Signed-off-by: Patrick McHardy Signed-off-by: Herbert Xu commit cf87dcd14064e7660f2b11b35b9e4949e9812fd2 Author: Sam Ravnborg Date: Wed Feb 13 22:50:24 2008 +0100 kbuild: fix building vmlinux.o Ingo Molnar wrote: > > i've got a build log from a weird build error below: > > LD init/built-in.o > distcc[12023] ERROR: compile (null) on localhost failed > make: *** [vmlinux.o] Error 1 > make: *** Waiting for unfinished jobs.... > LD .tmp_vmlinux1 > Building vmlinux.o were moved up in the dependency chain so we started to build it before the kallsym stuff. This was done to let modpost report section mismatch bugs even when the final link failed. Originally I had expected the dependency of $(kallsyms.o) to cover this but it turns out that we need to be even more explicit. Fix this by adding a conditional dependency on firat target used in the kallsyms serie of builds. Signed-off-by: Sam Ravnborg Cc: Ingo Molnar Cc: Roland McGrath commit e06b8b98da071f7dd78fb7822991694288047df0 Author: Sam Ravnborg Date: Wed Feb 13 22:43:28 2008 +0100 kbuild: allow -fstack-protector to take effect Arjan van de Ven wrote: === I just read the excellent LWN writeup of the vmsplice security thing, and that got me wondering why this attack wasn't stopped by the CONFIG_CC_STACKPROTECTOR option... because it plain should have been... Some analysis later.. it turns out that the following line in the top level Makefile, added by you in October 2007, entirely disables CONFIG_CC_STACKPROTECTOR ;( With this line removed the exploit will be nicely stopped. CFLAGS += $(call cc-option, -fno-stack-protector) Now I realize that certain distros have patched gcc to compensate for their lack of distro wide CFLAGS, and it's great to work around that... but would there be a way to NOT disable this for CONFIG_CC_STACKPROTECTOR please? It would have made this exploit not possible for those kernels that enable this feature (and that includes distros like Fedora) === Move the assignment to KBUILD_CFLAGS up before including the arch specific Makefile so arch makefiles may override the setting. Signed-off-by: Sam Ravnborg Cc: Arjan van de Ven Cc: stable@kernel.org commit 587c90616a5b44e6ccfac38e64d4fecee51d588c Author: Roman Zippel Date: Mon Feb 11 21:13:47 2008 +0100 kconfig: fix select in combination with default > The attached .config (with current -git) results in a compile > error since it contains: > > CONFIG_X86=y > # CONFIG_EMBEDDED is not set > CONFIG_SERIO=m > CONFIG_SERIO_I8042=y > > Looking at drivers/input/serio/Kconfig I simply don't get how this > can happen. You've hit the rather subtle rules of select vs default. What happened is that SERIO is selected to m, but SERIO_I8042 isn't selected so the default of y is used instead. We already had the problem in the past that select and default don't work well together, so this patch cleans this up and makes the rule hopefully more straightforward. Basically now the value is calculated like this: (value && dependency) || select where the value is the user choice (if available and the symbol is visible) or default. In this case it means SERIO and SERIO_I8042 are both set to y due to their default and if SERIO didn't had the default, then the SERIO_I8042 value would be limited to m due to the dependency. I tested this patch with more 10000 random configs and above case is the only the difference that showed up, so I hope there is nothing that depended on the old more complex and subtle rules. Signed-off-by: Roman Zippel Tested-by: Adrian Bunk Signed-off-by: Sam Ravnborg commit 0f78e7542e94e8f64ed393289d7bfac032634620 Author: David S. Miller Date: Wed Feb 13 01:00:26 2008 -0800 [SPARC64]: Remove DEBUG_BOOTMEM. We'll replace it in the future with better logging facilities that can be enabled at run time. Signed-off-by: David S. Miller commit b83ebf566b64d3702c6b50dbee2052623cd55ce5 Author: Robert P. J. Day Date: Tue Feb 12 22:09:29 2008 -0800 [SPARC64]: Use shorter "get_zeroed_page" call. Signed-off-by: Robert P. J. Day Signed-off-by: David S. Miller commit b3dd5b82560eef53a537e409f50261d0b33c75ce Author: Robert P. J. Day Date: Tue Feb 12 22:08:55 2008 -0800 [SPARC]: Use shorter form of "get_zeroed_page". Signed-off-by: Robert P. J. Day Signed-off-by: David S. Miller commit 631a9dca60ddd7d84a08171a14828e9cfb667d48 Author: Robert Reif Date: Tue Feb 12 18:23:31 2008 -0800 [SPARC]: video/cg14.c and video/sbuslib.c build fixes Apparently these drivers now need uaccess.h Signed-off-by: Robert Reif Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 4a75834644ae32ded9bed14db39834d6d3bc4793 Author: Auke Kok Date: Mon Feb 11 09:26:06 2008 -0800 ixgbe: remove accidentally added #ifdef Let's not add these #ifdef NETIF_F_TSO's back. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 4bebfaa56b72c94fe4997240ee73ad1c1fcf96c9 Author: Auke Kok Date: Mon Feb 11 09:26:01 2008 -0800 ixgbe: Disallow device reset during ethtool test Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 0c254d863338ceff630814bf17cf8e4b61cb8aa3 Author: Auke Kok Date: Mon Feb 11 09:25:56 2008 -0800 ixgbe: warn when device is in a x4 or lower width slot It's easy to oversee this issue when working with this card as evrything will work OK but performance is severely limited (something like 1.5gbit on a x1 link) if the pci-express slot does not offer more bandwidth. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 23b66e2bc2bcebacab7292d7731b7372065b3f98 Author: Auke Kok Date: Mon Feb 11 09:25:51 2008 -0800 e1000e: Fix logic reversal keeping link active A logic mishap caused the adapter to keep link while we can disable it due to WoL not being active, and vice versa. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 14782ca8262818921a460c80a761a93740b838a2 Author: Auke Kok Date: Mon Feb 11 09:25:46 2008 -0800 e1000: warn if this driver is used for e1000e devices We're already starting to see reports from users still using e1000 where they should be using e1000e now that this is actually possible. Just to prevent some of this thrash, add a big warning on load on these devices that people should switch to e1000e. Signed-off-by: Auke Kok Acked-by: Jesse Brandeburg Signed-off-by: Jeff Garzik commit 030ed68bf063e99cea6371d1fb771a870cab1c1d Author: Julia Lawall Date: Mon Feb 11 09:25:40 2008 -0800 replace code with FIELD_SIZEOF Signed-off-by: Julia Lawall Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 9dde447a09ec8fc0ba8375a16fe6bed2470f0d14 Author: Alex Bounine Date: Mon Feb 11 14:36:37 2008 -0500 Tsi108_eth: Add ethtool support Add ethtool support to tsi108_eth network driver. Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik commit b1aefe58c21de4265223b563ae923b50f4c4be08 Author: Alex Bounine Date: Mon Feb 11 14:36:12 2008 -0500 Tsi108_eth: fix link recovery after disconnect Bug fix for tsi108_eth network driver. This patch fixes a problem with link recovery after connection was lost. Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik commit 85bbe2158340dafb060fc7fe55a8208fe08cae26 Author: Alex Bounine Date: Mon Feb 11 14:35:49 2008 -0500 Tsi108_eth: remove not needed code Code clean-up for tsi108_eth network driver. This patch removes not needed dummy read and the corresponding comment. The PHY logic requires two reads from the status register to get current link status. This is done correctly inside mii_check_media(). Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik commit 6a87155a39f538f9d13cebf2c9b7c19bd41d7da9 Author: Alex Bounine Date: Mon Feb 11 14:35:26 2008 -0500 Tsi108_eth: fix detection of 1000Mb mode Bug fix for tsi108_eth network driver. This patch fixes a problem with detection of 1000Mb speed. Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik commit a235ef2c632a096cdb2b02379c89b49e97faaaa4 Author: Alex Bounine Date: Mon Feb 11 14:33:40 2008 -0500 Tsi108_eth: add missing linking to driver data Bug fix for tsi108_eth network driver. This patch adds missing linking to driver data. Signed-off-by: Alexandre Bounine Signed-off-by: Jeff Garzik