commit 6246b6128bbe34d0752f119cf7c5111c85fe481d Author: Linus Torvalds Date: Sun Apr 2 20:22:10 2006 -0700 Linux v2.6.17-rc1 Close of the merge window.. commit 6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6 Author: Linus Torvalds Date: Sun Apr 2 14:37:36 2006 -0700 Update dummy snd_power_wait() function for new calling convention Apparently nobody had tried to compile the ALSA CVS tree without power management enabled. Signed-off-by: Linus Torvalds commit 3e7ee3e7b36fa4e2d88d8fb0a2577be95fc4636d Author: Jens Axboe Date: Sun Apr 2 23:11:04 2006 +0200 [PATCH] splice: fix page stealing LRU handling. Originally from Nick Piggin, just adapted to the newer branch. You can't check PageLRU without holding zone->lru_lock. The page release code can get away with it only because the page refcount is 0 at that point. Also, you can't reliably remove pages from the LRU unless the refcount is 0. Ever. Signed-off-by: Nick Piggin Signed-off-by: Jens Axboe commit ad8d6f0a783ffa2ff9b0cf09910b889715772201 Author: Jens Axboe Date: Sun Apr 2 23:10:32 2006 +0200 [PATCH] splice: page stealing needs to wait_on_page_writeback() Thanks to Andrew for the good explanation of why this is so. akpm writes: If a page is under writeback and we remove it from pagecache, it's still going to get written to disk. But the VFS no longer knows about that page, nor that this page is about to modify disk blocks. So there might be scenarios in which those blocks-which-are-about-to-be-written-to get reused for something else. When writeback completes, it'll scribble on those blocks. This won't happen in ext2/ext3-style filesystems in normal mode because the page has buffers and try_to_release_page() will fail. But ext2 in nobh mode doesn't attach buffers at all - it just sticks the page in a BIO, finds some new blocks, points the BIO at those blocks and lets it rip. While that write IO's in flight, someone could truncate the file. Truncate won't block on the writeout because the page isn't in pagecache any more. So truncate will the free the blocks from the file under the page's feet. Then something else can reallocate those blocks. Then write data to them. Now, the original write completes, corrupting the filesystem. Signed-off-by: Jens Axboe commit 059a8f3734a66cb2c41731083b0cbf836721485b Author: Jens Axboe Date: Sun Apr 2 23:06:05 2006 +0200 [PATCH] splice: export generic_splice_sendpage Forgot that one, thanks Jeff. Also move the other EXPORT_SYMBOL to right below the functions. Signed-off-by: Jens Axboe commit b2b39fa478db6db89b7ccafb0649973845b0eb75 Author: Jens Axboe Date: Sun Apr 2 23:05:41 2006 +0200 [PATCH] splice: add a SPLICE_F_MORE flag This lets userspace indicate whether more data will be coming in a subsequent splice call. Signed-off-by: Jens Axboe commit 83f9135bddffded9f1716519b6c147bcf046c87e Author: Jens Axboe Date: Sun Apr 2 23:05:09 2006 +0200 [PATCH] splice: add comments documenting more of the code Hopefully this will make Andrew a little more happy. Signed-off-by: Jens Axboe commit 4f6f0bd2ffa4e31c3524f5e65c84a29b6ab73307 Author: Jens Axboe Date: Sun Apr 2 23:04:46 2006 +0200 [PATCH] splice: improve writeback and clean up page stealing By cleaning up the writeback logic (killing write_one_page() and the manual set_page_dirty()), we can get rid of ->stolen inside the pipe_buffer and just keep it local in pipe_to_file(). This also adds dirty page balancing logic and O_SYNC handling. Signed-off-by: Jens Axboe commit 53cd9ae886273d6c2b8ba4aa63d6cd6b1217b57f Author: Jens Axboe Date: Sun Apr 2 23:04:21 2006 +0200 [PATCH] splice: fix shadow[] filling logic Clear the entire range, and don't increment pidx or we keep filling the same position again and again. Thanks to KAMEZAWA Hiroyuki. Signed-off-by: Jens Axboe commit 6e0dd741a89be35defa05bd79f4211c5a2762825 Author: Greg Kroah-Hartman Date: Fri Mar 31 15:37:06 2006 -0800 [PATCH] sysfs: zero terminate sysfs write buffers No one should be writing a PAGE_SIZE worth of data to a normal sysfs file, so properly terminate the buffer. Thanks to Al Viro for pointing out my supidity here. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 597a7679dd83691be2f3a53e1f3f915b4a7f6eba Author: Arjan van de Ven Date: Sun Apr 2 19:24:57 2006 +0200 [PATCH] revert incorrect mutex conversion in hdaps driver This reverts the mutex conversion that was recently done to the hdaps driver; this coversion was buggy because the hdaps driver started using this semaphore in IRQ context, which mutexes do not allow. Easiest solution for now is to just revert the patch (the patch was part of a bigger GIT commit, 9a61bf6300533d3b64d7ff29adfec00e596de67d but this only reverts this one file) Signed-off-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 24c7cd0630f76f0eb081d539c53893d9f15787e8 Author: Stefan Richter Date: Sat Apr 1 21:11:41 2006 +0200 [PATCH] sbp2: fix spinlock recursion sbp2util_mark_command_completed takes a lock which was already taken by sbp2scsi_complete_all_commands. This is a regression in Linux 2.6.15. Reported by Kristian Harms at https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=187394 [ More complete commentary, as response to questions by Andrew: ] > This changes the call environment for all implementations of > ->Current_done(). Are they all safe to call under this lock? Short answer: Yes, trust me. ;-) Long answer: The done() callbacks are passed on to sbp2 from the SCSI stack along with each SCSI command via the queuecommand hook. The done() callback is safe to call in atomic context. So does Documentation/scsi/scsi_mid_low_api.txt say, and many if not all SCSI low-level handlers rely on this fact. So whatever this callback does, it is "self-contained" and it won't conflict with sbp2's internal ORB list handling. In particular, it won't race with the sbp2_command_orb_lock. Moreover, sbp2 already calls the done() handler with sbp2_command_orb_lock taken in sbp2scsi_complete_all_commands(). I admit this is ultimately no proof of correctness, especially since this portion of code introduced the spinlock recursion in the first place and we didn't realize it since this code's submission before 2.6.15 until now. (I have learned a lesson from this.) I stress-tested my patch on x86 uniprocessor with a preemptible SMP kernel (alas I have no SMP machine yet) and made sure that all code paths which involve the sbp2_command_orb_lock were gone through multiple times. Signed-off-by: Stefan Richter Signed-off-by: Linus Torvalds commit 29e350944fdc2dfca102500790d8ad6d6ff4f69d Author: Linus Torvalds Date: Sun Apr 2 12:46:35 2006 -0700 splice: add SPLICE_F_NONBLOCK flag It doesn't make the splice itself necessarily nonblocking (because the actual file descriptors that are spliced from/to may block unless they have the O_NONBLOCK flag set), but it makes the splice pipe operations nonblocking. Signed-off-by: Linus Torvalds commit 56ca904053ab14ba4067a72b69a5edf246771209 Author: Pavel Pisa Date: Sun Apr 2 19:27:07 2006 +0100 [ARM] 3457/1: i.MX: SD/MMC support for i.MX/MX1 Patch from Pavel Pisa This patch adds support of i.MX/MX1 SD/MMC controller. It has been significantly redesigned from the original Sascha Hauer's version to support scatter-gather DMA, to conform to latest Pierre Ossman's and Russell King's MMC-SD Linux 2.6.x infrastructure. The handling of all events has been moved to the softirq context and is designed with no busy-looping in mind. Unfortunately some controller bugs has to be overcome by limited looping about 2-20 usec but these are observed only for initial card recognition phase. There are still some missing/missed IRQs problems under heavy load. Help of somebody with access to the full SDHC design information is probably necessary. Regenerated against 2.6.16-git-060402 to solve clash with other patches. Signed-off-by: Pavel Pisa Acked-by: Sascha Hauer Signed-off-by: Russell King commit 65dbf34393f7b3d20e993d9651a825df0fa5376b Author: Andrew Victor Date: Sun Apr 2 19:18:51 2006 +0100 [ARM] 3456/1: AT91RM9200 support for 2.6 (MMC/SD driver) Patch from Andrew Victor This patch adds support for the MMC/SD card interface on the Atmel AT91RM9200 processor. Original driver was by Nick Randell, but a number of people have subsequently worked on it. It's currently maintained by Malcolm Noyes. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit b45e516f701e0fc81fb3dbd1ba9db35f991a4465 Author: Linus Torvalds Date: Sun Apr 2 10:44:36 2006 -0700 ppc64: actually add sys_splice() to the system call table (We'd only added the number, which meant that actually trying to use splice just went off into la-la-land) Signed-off-by: Linus Torvalds commit 853807fb500a9442d88646b7be92bfa51334f8e8 Author: Andrew Victor Date: Tue Mar 14 11:11:04 2006 +0200 [WATCHDOG] at91_wdt.c - Atmel AT91RM9200 watchdog driver Watchdog driver for the Atmel AT91RM9200 processor. Signed-off-by: Andrew Victor Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit c9d1a0b8d52e7539e22f3c3190f8b6e0c80b6cfe Author: Adrian Bunk Date: Fri Mar 10 19:04:38 2006 +0100 [WATCHDOG] pcwd_usb.c: fix a NULL pointer dereference The Coverity checker noted that this resulted in a NULL pointer reference if we were coming from if (usb_pcwd == NULL) { printk(KERN_ERR PFX "Out of memory\n"); goto error; } Signed-off-by: Adrian Bunk Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 6bbc20bc0b5d9c5a351fb3a027e60e396c1329a6 Author: Wim Van Sebroeck Date: Thu Mar 2 20:05:16 2006 +0100 [WATCHDOG] pcwd.c sprintf/strcpy fix change sprintf(pcwd_private.fw_ver_str, "ERROR"); to strcpy... as pointed out by Andrew Morton. Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 369fa25294b8225cb3a7fefabf047a2676bf6abd Author: Wim Van Sebroeck Date: Sun Feb 12 17:44:57 2006 +0100 [WATCHDOG] pcwd.c general clean-up after patches removal of includes (since we don't use kmalloc and TASK_INTERRUPTABLE anymore). Addition of missing commands. Printk that lets the user know when the module was unloaded. Signed-off-by: Wim Van Sebroeck commit c324ab4281d6b7a3130e9291d74b5c2361a16d56 Author: Wim Van Sebroeck Date: Sun Feb 12 17:12:55 2006 +0100 [WATCHDOG] pcwd.c add debug info Add debugging info for the pcwd.c module. Signed-off-by: Wim Van Sebroeck commit 69f83d5216e4bfffd51bb5729be2df38df0aeaf2 Author: Wim Van Sebroeck Date: Sun Feb 12 16:51:34 2006 +0100 [WATCHDOG] pcwd.c pcwd_cleanup_module patch static void pcwd_cleanup_module doesn't need a return; Signed-off-by: Wim Van Sebroeck commit 9b6553cd01ce3ea7a6a532f7b7e62e3535d6b102 Author: Tony Lindgren Date: Sun Apr 2 17:46:30 2006 +0100 [ARM] 3433/1: ARM: OMAP: 8/8 Update board files Patch from Tony Lindgren This patch syncs OMAP board support with linux-omap tree. The highlights of the patch are: - Add support for Nokia 770 by Juha Yrjola - Add support for Samsung Apollon by Kyungmin Park - Add support for Amstrad E3 videophone by Jonathan McDowell - Remove board-netstar.c board support as requested by Ladislav Michl - Do platform_device registration in board files by Komal Shah et al. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 120db2cba8e40c562e5a4aea44ede2f360a5de75 Author: Tony Lindgren Date: Sun Apr 2 17:46:27 2006 +0100 [ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2 Patch from Tony Lindgren Update misc OMAP core code from linux-omap tree: - McBSP updates by Samuel Ortiz, Andrzej Zaborowski - Whitespace cleanups by Ladislav Michl - Other fixes by various linux-omap developers Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 0dc5e77c46c6b02e8286f17544d93d614c0cb892 Author: Tony Lindgren Date: Sun Apr 2 17:46:26 2006 +0100 [ARM] 3454/1: ARM: OMAP: 6/8 Update framebuffer low-level init code, take 2 Patch from Tony Lindgren Update OMAP framebuffer low-level init code from linux-omap tree by Imre Deak. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 670c104ae8e7bcc28be0289a16dac2ddfb88b285 Author: Tony Lindgren Date: Sun Apr 2 17:46:25 2006 +0100 [ARM] 3430/1: ARM: OMAP: 5/8 Update PM Patch from Tony Lindgren Update OMAP PM code from linux-omap tree: - Move PM code from plat-omap to mach-omap1 and mach-omap2 by Tony Lindgren - Add minimal PM support for omap24xx by Tony Lindgren and Richard Woodruff - Misc updates to omap1 PM code by Tuukka Tikkanen et al - Updates to the SRAM code needed for PM and FB by Imre Deak Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 6e60e79a1d46eaa3369febc2f6c31e0acfaaae3f Author: Tony Lindgren Date: Sun Apr 2 17:46:23 2006 +0100 [ARM] 3429/1: ARM: OMAP: 4/8 Update GPIO Patch from Tony Lindgren Update OMAP GPIO code from linux-omap tree: - Fix omap16xx edge control by Juha Yrjola - Support for additional omap16xx trigger modes by Dirk Behme - Fix edge detection by Tony Lindgren et al. - Better support for omap15xx and omap310 by Andrej Zaborowski - Fix omap15xx interrupt bug by Petukhov Nikolay Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 8d7f9f5037a09b8570d0c9e60a924ad2ba6fa7dd Author: Tony Lindgren Date: Sun Apr 2 17:46:22 2006 +0100 [ARM] 3428/1: ARM: OMAP: 3/8 Update pin multiplexing Patch from Tony Lindgren Update OMAP pin multiplexing code from linux-omap tree. This patch adds new pin configurations by various OMAP developers, and suport for omap730 by Brian Swetland. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit a569c6ec37e78eef4299d0a60ae4028459b27117 Author: Tony Lindgren Date: Sun Apr 2 17:46:21 2006 +0100 [ARM] 3427/1: ARM: OMAP: 2/8 Update timers Patch from Tony Lindgren Update OMAP timers from linux-omap tree. The highlights of the patch are: - Move timer32k code from mach-omap1 to plat-omap and make it work also on omap24xx by Tony Lindgren - Add support for dmtimer idle check for PM by Tuukka Tikkanen Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit b824efae120b656fef562b2e81e1ed6aa88f8d24 Author: Tony Lindgren Date: Sun Apr 2 17:46:20 2006 +0100 [ARM] 3426/1: ARM: OMAP: 1/8 Update clock framework Patch from Tony Lindgren Update OMAP clock framework from linux-omap tree. The highlights of the patch are: - Add support for omap730 clocks by Andrzej Zaborowski - Fix compile warnings by Dirk Behme - Add support for using dev id by Tony Lindgren and Komal Shah - Move memory timings and PRCM into separate files by Tony Lindgren Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 2891b6ad188f8cd1407f17e52befb26b7e1f4de1 Author: Wim Van Sebroeck Date: Sun Feb 12 16:47:34 2006 +0100 [WATCHDOG] pcwd.c firmware-info patch Get the firmware version into the private data struct of the ISA-PC watchdog card. Signed-off-by: Wim Van Sebroeck commit 4206f0c4de9f9683676a8507ef56941535761579 Author: Wim Van Sebroeck Date: Sun Feb 12 16:37:36 2006 +0100 [WATCHDOG] pcwd.c control status patch Clean-up the control status code (insert tabs where relevant), Add new Control Status defines, Make sure that the R2DS bit stays the same. Signed-off-by: Wim Van Sebroeck commit 3267c077e589bc146a0b45e220fcefafbf83fb80 Author: Andrew Victor Date: Sun Apr 2 17:15:51 2006 +0100 [ARM] 3396/2: AT91RM9200 Platform devices update Patch from Andrew Victor This patch updates the platform device resources for the Ethernet and MMC peripherals. It also adds platform device information for the NAND (SmartMedia), I2C and the RTC. (This version of the patch can be applied before Patch 3392/1) Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 486bcc59f3083c54df7b67d1d69db81585632a8b Author: Andrew Victor Date: Sun Apr 2 17:15:49 2006 +0100 [ARM] 3395/2: AT91RM9200 Dataflash Card vs MMC selection Patch from Andrew Victor On the Atmel AT91RM9200-DK and -EK boards, a pin is used to control whether the card socket is used for a DataFlash Card or an MMC/SD card. We now default to MMC/SD in the configuration files. (This version of the patch can be applied before Patch 3392/1) Signed-off-by: Andrew Victor Signed-off-by: Russell King commit cc2832a1313340ff1de55f15fac5b7fe48fa2a72 Author: Andrew Victor Date: Sun Apr 2 17:15:48 2006 +0100 [ARM] 3393/2: AT91RM9200 LED support Patch from Andrew Victor This patch adds support for the LED(s) on the AT91RM9200-based boards. (This version of the patch can be applied before Patch 3392/1) Signed-off-by: Andrew Victor Signed-off-by: Russell King commit b2e6f75597af8fc765707111d3a71077167bdeb1 Author: Richard Purdie Date: Sun Apr 2 17:11:00 2006 +0100 [ARM] 3453/1: Poodle: Correctly set the memory size Patch from Richard Purdie Force the Sharp Zaurus Poodle memory size to 32MB. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit d66e35fab8789b5dd6f1b8e6f3871ea4f44d32a3 Author: Pavel Pisa Date: Sun Apr 2 16:58:38 2006 +0100 [ARM] 3446/1: i.MX: MMC/SD SDHC controller registration for i.MX/MX1 MX1ADS board Patch from Pavel Pisa From: Stefano Fedrigo This adds to the MX1ADS platform the needed code to detect insertion/removal of an MMC/SD card. Tested on a v1.1 board. Signed-off-by: Stefano Fedrigo Signed-off-by: Pavel Pisa Acked-by: Sascha Hauer Signed-off-by: Russell King commit 999331af456bf6fc1520ea7b68b6a3dbb4af8ff6 Author: Pavel Pisa Date: Sun Apr 2 16:58:37 2006 +0100 [ARM] 3444/1: i.MX: Scatter-gather DMA emulation for i.MX/MX1 Patch from Pavel Pisa This patch contains simplified set of changes to add scatter-gather emulation capability into MX1 DMA support. The result should be still usable for next combination of DMA transfers Statter-Gather/linear/2D/FIFO to linear/2D/FIFO and linear/2D/FIFO to Statter-Gather/2D/FIFO The patch corrects channel priority allocation to be compatible with MX1 hardware implementation. Previous code has not been adapted from its PXA original. Signed-off-by: Pavel Pisa Acked-by: Sascha Hauer Signed-off-by: Russell King commit 7ba01f9728a9f1cd1a3e1e2d5206f76061182675 Author: Lennert Buytenhek Date: Sun Apr 2 16:17:40 2006 +0100 [ARM] 3451/1: ep93xx: use the m48t86 rtc driver on the ts72xx platform Patch from Lennert Buytenhek Instantiate the recently merged m48t86 rtc driver in the ts72xx code. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 41658132e650c01529dd5cc5cea8b0055def1165 Author: Lennert Buytenhek Date: Sun Apr 2 16:17:34 2006 +0100 [ARM] 3450/1: ep93xx: use the ep93xx rtc driver Patch from Lennert Buytenhek Instantiate the recently merged ep93xx rtc driver in the ep93xx code. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 272eb575eb3d5348fe0f0a97a22b5e603bd51d11 Author: Ben Dooks Date: Sun Apr 2 16:16:15 2006 +0100 [ARM] 3452/1: [S3C2410] RX3715 - add nand information Patch from Ben Dooks NAND definitions for the HP iPAQ RX3715's internal NAND flash Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a580290c3e64bb695158a090d02d1232d9609311 Author: Martin Waitz Date: Sun Apr 2 13:59:55 2006 +0200 Documentation: fix minor kernel-doc warnings This patch updates the comments to match the actual code. Signed-off-by: Martin Waitz Signed-off-by: Adrian Bunk commit 5d9428de1a9785f10a4339f80b717be665ba51c7 Author: Eric Sesterhenn Date: Sun Apr 2 13:52:48 2006 +0200 BUG_ON() Conversion in drivers/net/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 7e99e9b66336565f0088ea59d848ab187f9689c3 Author: Eric Sesterhenn Date: Sun Apr 2 13:50:14 2006 +0200 BUG_ON() Conversion in drivers/s390/net/lcs.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 40094fa65238291d51839326320aba997092ab1f Author: Eric Sesterhenn Date: Sun Apr 2 13:49:25 2006 +0200 BUG_ON() Conversion in mm/slab.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 75babcacede876608f14ef1a20e795ce17ae637f Author: Eric Sesterhenn Date: Sun Apr 2 13:47:35 2006 +0200 BUG_ON() Conversion in mm/highmem.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 9f31252cb61d5bc641cdef8a069a2ca5a77855f2 Author: Eric Sesterhenn Date: Sun Apr 2 13:45:55 2006 +0200 BUG_ON() Conversion in kernel/signal.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit fda8bd78a15950b9b01a1c1477a9095cb08c27c1 Author: Eric Sesterhenn Date: Sun Apr 2 13:44:47 2006 +0200 BUG_ON() Conversion in kernel/signal.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 524223ca8142d593124bde66f3ffa1deb6f56c06 Author: Eric Sesterhenn Date: Sun Apr 2 13:43:40 2006 +0200 BUG_ON() Conversion in kernel/ptrace.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 9ba025f10885758975fbbc2292a5b9e7cb8026a8 Author: Eric Sesterhenn Date: Sun Apr 2 13:42:42 2006 +0200 BUG_ON() Conversion in ipc/shm.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 7ec70738097af9dfd25d5f83e9b27a532f462912 Author: Eric Sesterhenn Date: Sun Apr 2 13:41:02 2006 +0200 BUG_ON() Conversion in fs/freevxfs/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 2c2111c2bd821d3e7cf5a6a37a112a620fd947a3 Author: Eric Sesterhenn Date: Sun Apr 2 13:40:13 2006 +0200 BUG_ON() Conversion in fs/udf/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit d6735bfcc998863dab89dacca2aed20932b6bc21 Author: Eric Sesterhenn Date: Sun Apr 2 13:39:21 2006 +0200 BUG_ON() Conversion in fs/sysv/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit b7542f8c7eb40efb967a558c5be90fe5f939c3ef Author: Eric Sesterhenn Date: Sun Apr 2 13:38:18 2006 +0200 BUG_ON() Conversion in fs/inode.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit f6298aab2ebaa61de39931595f125bc1968905cc Author: Eric Sesterhenn Date: Sun Apr 2 13:37:19 2006 +0200 BUG_ON() Conversion in fs/fcntl.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 8abf6a4707cfb95ca552b882959c6f8ff9924270 Author: Eric Sesterhenn Date: Sun Apr 2 13:36:13 2006 +0200 BUG_ON() Conversion in fs/dquot.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit b6385483840e903d99cb753593faea215ae8d324 Author: Eric Sesterhenn Date: Sun Apr 2 13:34:29 2006 +0200 BUG_ON() Conversion in md/raid10.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 43dab9bbe9fda735589f2749004f639349966b20 Author: Eric Sesterhenn Date: Sun Apr 2 13:33:30 2006 +0200 BUG_ON() Conversion in md/raid6main.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 78bafebd461049a419df2f4b1f25efbee73c2439 Author: Eric Sesterhenn Date: Sun Apr 2 13:31:42 2006 +0200 BUG_ON() Conversion in md/raid5.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 661e6acf7b882e5a886845dca5d1559e987464b4 Author: Ben Dooks Date: Sun Apr 2 10:32:46 2006 +0100 [ARM] 3449/1: [S3C2410] Anubis - fix NAND timings Patch from Ben Dooks The NAND timings on the Anubis are too large to be selected when running at 133MHz memory clock. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 2b2ee1585a98be250f86c61e6ec70159b30e48e5 Author: Ben Dooks Date: Sun Apr 2 10:00:10 2006 +0100 [ARM] 3448/1: [S3C2410] Settle delay when _enabling_ USB PLL Patch from Ben Dooks Fix the bug in the UPLL enable code which should have put a 200uS delay in if enabling the USB PLL from the state where it is off. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit dee9b2e932ef7c8f19540ad67e425fae30f33421 Author: Ben Dooks Date: Sun Apr 2 10:00:09 2006 +0100 [ARM] 3442/1: [S3C2410] SMDK: NAND device setup Patch from Ben Dooks Add SMDK2410/SMDK2440 NAND device information and default partition table. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 66ce229fe057e35275a5f5176b29ed70795506a1 Author: Ben Dooks Date: Sun Apr 2 10:00:08 2006 +0100 [ARM] 3447/1: [S3C2410] SMDK - default LEDs to off Patch from Ben Dooks Set default state of LEDs to off Fixes context of Patch #3442/1 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit fb9c280d4c6d4586670e3dfd041d8258db36b330 Author: Randy Dunlap Date: Wed Mar 29 16:15:23 2006 -0300 V4L/DVB (3667b): cpia2: fix function prototype Fix address space warning (from sparse): drivers/media/video/cpia2/cpia2_core.c:2355:6: error: symbol 'cpia2_read' redeclared with different type (originally declared at drivers/media/video/cpia2/cpia2.h:458) - incompatible argument 2 (different address spaces) Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 07151724a35e8e70f1aa64ce30a5a3f5c1ad49a3 Author: Hans Verkuil Date: Sat Apr 1 18:03:23 2006 -0300 V4L/DVB (3702): Make msp3400 routing defines more consistent Renamed various msp3400 routing defines to be more consistent and less confusing. Esp. the MSP_DSP_OUT defines were confusing since it is really a DSP input. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ab4cecf9c4e4a69cf2161f8a2424be14984430f8 Author: Hans Verkuil Date: Sat Apr 1 16:40:21 2006 -0300 V4L/DVB (3700): Remove obsolete commands from tvp5150.c - Remove old DECODER_ commands from tvp5150.c, replacing them with newer ones if appropriate. - Small VIDIOC_G_TUNER fixes in msp3400 and tuner. - Fix VIDIOC_S_TUNER support in em28xx. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3bbe5a83996c0a669250d91421eef054f3a30595 Author: Hans Verkuil Date: Sat Apr 1 15:27:52 2006 -0300 V4L/DVB (3697): More msp3400 and bttv fixes - remove obsolete VIDIOC_S_INPUT i2c call in bttv - translate VIDIOCSFREQ to VIDIOC_S_FREQUENCY in i2c call - improve muting during carrier scan in msp3400 - don't start scan unless really needed. - no longer reset chip for msp3400c/d. - remove v4l2 check in tuner-core (radio stops after using the TV) - add missing VIDIOC_INT_ strings in v4l2-common.c Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c097b04520a3ab69a94f63f3f1d6716864c07300 Author: Hans Verkuil Date: Thu Mar 30 19:57:28 2006 -0300 V4L/DVB (3696): Previous change for cx2341X boards broke the remote support Partially revert previous change to fix IR support. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0020d3ef915fc01a0184bc96eeb3c240bded5d8e Author: Hans Verkuil Date: Thu Mar 30 19:50:34 2006 -0300 V4L/DVB (3693): Fix msp3400c and bttv stereo/mono/bilingual detection/handling - msp3400c did not detect the second carrier, thus being always mono. - properly mute the msp3400c while detecting the carrier. - fix checks on the presence of scart2/3 inputs and scart 2 output. - implement proper audio mode fallbacks for msp3400c/d, identical to the way msp3400g works. - MODE_STEREO no longer produces dual languages when set for a bilingual transmission, instead it falls back to LANG1. Use LANG1_LANG2 to hear both languages of a bilingual transmission. This is much more intuitive for the user and is in accordance with the preferred usage in the v4l2 specification. - bttv tried to implement v4l2 calls with v4l1 calls to the i2c devices, completely mangling the audmode/rxsubchans handling. v4l2 calls now do v4l2 calls to the i2c devices. - fixed broken i2c_vidiocschan in bttv. - add start/end lines to LOG_STATUS. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 9bc7400a9d01b1fe05c7f0200e7384e17794f6e4 Author: Hans Verkuil Date: Wed Mar 29 18:02:51 2006 -0300 V4L/DVB (3692): Keep experimental SLICED_VBI defines under an #if 0 The sliced VBI defines added in videodev2.h are removed since requires more discussion. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2868c41fc45399b0f0855eb760e1a81881ff0c3d Author: Michael Krufky Date: Sat Apr 1 18:00:41 2006 -0300 V4L/DVB (3689): Kconfig: fix VP-3054 Secondary I2C Bus build configuration menu dependencies This patch fixes a dependency problem that affected the indentation order within the individual frontend selection support menus for cx88-dvb. - created a boolean dependency link for VIDEO_CX88_VP3054, so that it's tristate value will be the same as that of VIDEO_CX88_DVB. - VIDEO_CX88_VP3054 is automatically selected by VIDEO_CX88_DVB_ALL_FRONTENDS, but is otherwise selected by VIDEO_CX88_DVB_VP3054, offered as an option under VIDEO_CX88_DVB_MT352 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 86f40cc3c994822ffeb226753526d87be21bd79a Author: Andrew de Quincey Date: Thu Mar 30 15:53:35 2006 -0300 V4L/DVB (3673): Fix budget-av CAM reset Unfortunately on the budget-av board, the CAM reset line is tied to the frontend reset line, so resetting the CAM also zaps the frontend. This breaks the tda1004x at least, and causes it to fail to tune until the budget-av module is reloaded. This patch adds an exported function to dvb_frontend that allows a card to forcibly reinitialise a frontend. The budget-av now does this on CAM reset, which corrects this problem. since they do not tie the CAM reset line to the frontend reset line. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 5e85bd057f0cb29881e3d55d29f48bb55bd2f450 Author: Trent Piepho Date: Thu Mar 30 15:53:32 2006 -0300 V4L/DVB (3672): Fix memory leak in dvr open The dvr device could be opened multiple times simultaneously in O_RDONLY mode. Each open after the first would allocate a new dvr buffer (1880 KB) and leak the old buffer. The first close would de-allocate the dvr buffer and cause all other open dvrs to stop working. This patch allows only a single O_RDONLY open of the drv device, as per the API specification. Multiple O_WRONLY opens are still allowed and don't appear to cause any problems. Signed-off-by: Trent Piepho Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 2f03ee8e6bd7c6f40a1a0583662308e002d357da Author: C.Y.M Date: Thu Mar 30 04:31:48 2006 -0300 V4L/DVB (3671): New module parameter 'tv_standard' (dvb-ttpci driver) This attached patch was originally proposed by Anssi Hannula to the dvb-kernel user to choose the default broadcast mode when using the ttpci driver. NTSC users need to only add the following line to modprobe.d: options dvb-ttpci tv_standard=1 PAL users will not need to change anything, for this will be the default. Signed-off-by: C.Y.M Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit f3688fc8d391f50dee45bd3bf04bdeab1c16c3c0 Author: Adrian Bunk Date: Wed Mar 29 22:46:12 2006 -0300 V4L/DVB (3670): Fix typo in comment This patch fixes a typo in a comment. Signed-off-by: Adrian Bunk Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit afa47abf09f148332b0e6e480972494bc2e5c8af Author: Ingo Schneider Date: Wed Mar 29 22:05:16 2006 -0300 V4L/DVB (3669): Configurable dma buffer size for saa7146-based budget dvb cards - Issue a warning when more than 80% of the DMA buffer is being used (probably due to bad IRQ latency). Warnings are rate-limited. - Introduce a new parameter 'bufsize' (in KByte) which increases the default DMA buffer of 188 KByte up to 1410 KByte (Activy: 564 KByte). Signed-off-by: Ingo Schneider Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 1864cfb1537e108c2fe7a8e178b28bffde5a5439 Author: Michael Krufky Date: Sun Apr 2 03:14:11 2006 -0300 V4L/DVB (3653h): Move usb v4l docs into Documentation/video4linux - Move documentation for usb v4l devices from Documentation/usb to Documentation/video4linux. - Removed trailing whitespace. - Update Kconfig help text links to reflect the new file locations. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit cc33668b1eed1eac43f00cec639066047323b01d Author: Mauro Carvalho Chehab Date: Wed Mar 29 16:29:00 2006 -0300 V4L/DVB (3667a): Fix SAP + stereo mode at msp3400 It should be V4L2_TUNER_MODE_LANG1_LANG2. What the code does is check if we are NTSC and a SAP channel is available. If so, then the msp3400 should switch to standard 0x21 if the user wants to hear the SAP channel, which is for audio modes LANG2 (aka SAP) and LANG1_LANG2 (bilingual). In the msp3400 driver STEREO is abused for bilingual in PAL. Bilingual never worked with NTSC in the past and I decided that I'd better not use the bad PAL example. Signed-off-by: Mauro Carvalho Chehab commit 021e0b768b2c7931d9ba699e135c3eec42d5d3eb Author: Hans Verkuil Date: Wed Mar 29 15:16:08 2006 -0300 V4L/DVB (3666): Remove trailing newlines Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit add953cecba870f4ad7730bd0a6d5eaaabeac3bc Author: Hans Verkuil Date: Wed Mar 29 14:56:17 2006 -0300 V4L/DVB (3665): Add new NEC uPD64031A and uPD64083 i2c drivers - Add support for the uPD64031A NEC Electronics Ghost Reduction i2c device - Add support for the uPD6408x NEC Electronics 3-Dimensional Y/C separation i2c device. Signed-off-by: Takahiro Adachi Signed-off-by: Takeru Komoriya Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7061561e640c2947ab93c4e2a437327657c4482e Author: Hans Verkuil Date: Wed Mar 29 14:31:44 2006 -0300 V4L/DVB (3663): Fix msp3400c wait time and better audio mode fallbacks - The wait time until the first time the audio mode was detected was 1+5=6 seconds instead of just 1 second (wrong statement order). msp3400c specific bug. - Implemented audio mode fallback for msp3400c/d just like the msp3400g does automatically. E.g. fallback to stereo if no second language exists, etc. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dc555aa63c798af097f5c303bcf72a8390b03da5 Author: Hans Verkuil Date: Tue Mar 28 18:32:52 2006 -0300 V4L/DVB (3662): Don't set msp3400c-non-existent register The driver tried to set a register that is not present on msp3400c devices. Add the missing test. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 75c4570ca4849b089c4edfc14bf02b4720087aba Author: Hans Verkuil Date: Tue Mar 28 18:23:48 2006 -0300 V4L/DVB (3661): Add wm8739 stereo audio ADC i2c driver Add support for the Wolfson Microelectronics WM8739 stereo A/D converter from the ivtv driver. Many thanks to Takahiro Adachi for writing the original driver. Signed-off-by: Takahiro Adachi Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 953a676c83bfd22cac3648fc5f566ca4a2fe1297 Author: Trent Piepho Date: Wed Mar 29 13:53:49 2006 -0300 V4L/DVB (3658): Kconfig: Fix PCI ID typo in VIDEO_CX88_ALSA help text - Fixed PCI ID typo in VIDEO_CX88_ALSA help text Signed-off-by: Trent Piepho Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2b3835b78274af104a9da1b8a999ce908e0459db Author: Trent Piepho Date: Wed Mar 29 13:53:15 2006 -0300 V4L/DVB (3657): Kconfig: Add firmware download comments for or51211 and or51132 - Added firmware download comments to or51211 and or51132 Kconfig help text. Signed-off-by: Trent Piepho Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d46e6451956df4bee829dfebd5b521d0ee4868d1 Author: Patrick Boettcher Date: Tue Mar 28 16:15:05 2006 -0300 V4L/DVB (3655): Support for a new revision of the WT220U-stick There seems to be a new version of the USB DVB-T stick from WideView with a new demod-revision inside and thus a new firwmare. This patch enables support for that. Thanks to Mikel Martin for early testing. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit f896260566b08250cdb12802af1ab418dcc6d720 Author: Michael Krufky Date: Wed Mar 29 15:15:21 2006 -0300 V4L/DVB (3653g): put v4l encoder/decoder configuration into a separate menu Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 26ffb95c0012201c9ea9e8d315af1d499e1e66d3 Author: Michael Krufky Date: Wed Mar 29 15:15:21 2006 -0300 V4L/DVB (3653f): usbvideo: fixed Kconfig menu and Makefile build configuration Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 43381eaf07212e072b926fa8b8f695e88db7775c Author: Michael Krufky Date: Wed Mar 29 15:15:17 2006 -0300 V4L/DVB (3653e): pwc: fixed Kconfig menu and Makefile build configuration Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fcc99659adb0bbcd6d16489ccac04e36d86a760c Author: Michael Krufky Date: Wed Mar 29 15:10:02 2006 -0300 V4L/DVB (3653d): sn9c102: fixed Kconfig menu and Makefile build configuration Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 11bbb51cd0f95a303855d26b8f0e1c1c1ccdf83b Author: Michael Krufky Date: Wed Mar 29 15:09:53 2006 -0300 V4L/DVB (3653c): zc0301: fixed Kconfig menu and Makefile build configuration Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e4a25edb5ecdf14aa14b909acc6f354e4c8f080c Author: Michael Krufky Date: Wed Mar 29 15:09:42 2006 -0300 V4L/DVB (3653b): et61x251: fixed Kconfig menu and Makefile build configuration Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 328caac78a69fa60be67002e4e7dfab3da87dc64 Author: Michael Krufky Date: Wed Mar 29 15:09:27 2006 -0300 V4L/DVB (3653a): Kconfig: clean up media/usb menus - removed redundant Video For Linux API help text - fixed dependency / selection for USB_W9968CF Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d95b8942eed310759bc866a2a4c0f110578aaa69 Author: Hartmut Hackmann Date: Mon Mar 27 19:39:30 2006 -0300 V4L/DVB (3646): Added support for the new Lifeview hybrid cardbus modules There seem to be many variants of this cards with different feature sets. This entry supports analog TV, CVBS and s-video input, FM radio and DVB-T if they are supported by the hardware. Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 2174eb9cc876e840bcfa6d44f22c7f816289bf21 Author: Hartmut Hackmann Date: Mon Mar 27 19:15:47 2006 -0300 V4L/DVB (3645): Corrected CVBS input for the AVERMEDIA 777 DVB-T The .vmux entry needs to be 1 instead of 0 Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 42e6b3b476f89b08232d1c1efd2327665b9050c8 Author: Hartmut Hackmann Date: Mon Mar 27 19:04:48 2006 -0300 V4L/DVB (3644): Added PCI IDs of 2 LifeView Cards Added ID entries for the Genius VideoWonder DVB-T and the LifeView FlyTV Platinum Gold Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 75bc8019e5f539b991ea5d68c3bddf797a825081 Author: Mauro Carvalho Chehab Date: Tue Mar 28 10:02:28 2006 -0300 V4L/DVB (3643): Fix default values for tvp5150 controls Default values were wrong. Fixing it. Signed-off-by: Mauro Carvalho Chehab commit 4263fa8ca6d9f387ce0d005e861f7e945c741e6e Author: Mike Isely Date: Sat Mar 25 20:43:14 2006 -0300 V4L/DVB (3639): Reduce FWSEND due to certain I2C bus adapter limits The FWSEND parameter controls the size of the firmware chunks sent down the I2C bus to the chip. Previously this had been set to 1024 but unfortunately some I2C implementations can't transfer data in such big gulps. Specifically, the pvrusb2 driver has a hard limit of around 60 bytes, due to the encapsulation there of I2C traffic into USB messages. So we have to significantly reduce this parameter. Acked-by: Hans Verkuil Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit dbcb86ed945e42e99884e7afaab2f326a2aff2ec Author: Michael Krufky Date: Sun Mar 26 18:59:45 2006 -0300 V4L/DVB (3621): Fix camera key on FusionHDTV portable remote control Thanks to: Andrew Cohen Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 731f902edaf3ed16f8ed9e92d79e3d0d17af608f Author: Ricardo Cerqueira Date: Mon Mar 27 09:16:31 2006 -0300 V4L/DVB (3620): Fix video-buf PCI wrappers After the recent video-buf "generic" adaptation, the PCI wrappers got completely broken, and all of the DMA sound modules stopped working (and failed with an oops) Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit 8dbc5ece9a6a424eb03f1eeee2774c42d8db1ce4 Author: Mauro Carvalho Chehab Date: Sun Mar 26 08:54:09 2006 -0300 V4L/DVB (3619): Whitespace cleanup Signed-off-by: Mauro Carvalho Chehab commit c150178bff4ae76635ccb06abd5258933379ecc6 Author: Michael Krufky Date: Sun Mar 26 05:43:36 2006 -0300 V4L/DVB (3617): Cxusb: add support for FusionHDTV USB portable remote control - Added keycodes for the DViCO FusionHDTV portable remote control. - Enabled the remote control for both versions of FusionHDTV DVB-T USB and the FusionHDTV 5 USB Gold (ATSC) Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 87c1fae6d4207ecd4de34ce251d41d5dc4a1219c Author: maximilian attems Date: Sat Mar 25 15:56:07 2006 -0300 V4L/DVB (3616): Bt8xx: select FW_LOADER The bt8xx drivers uses request_firmware() and thus needs to select FW_LOADER. Signed-off-by: maximilian attems Signed-off-by: Mauro Carvalho Chehab commit 9419045f842e7b763928636f9c61dfa134b2052d Author: Randy Dunlap Date: Mon Mar 27 16:18:25 2006 -0300 V4L/DVB (3616a): cpia cleanups one printk needs a newline at end; better MODULE_PARM_DESC text formatting; don't need to init static data to 0; Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 26abe0234d443f1089ea7e514c8fc66493c0d307 Author: maximilian attems Date: Sat Mar 25 15:55:55 2006 -0300 V4L/DVB (3615): Saa7134: select FW_LOADER The saa7134 drivers uses request_firmware() and thus needs to select FW_LOADER. Signed-off-by: maximilian attems Signed-off-by: Mauro Carvalho Chehab commit 4ae5c2e5e627ff22815fb9900161bf188ea2cc67 Author: Mauro Carvalho Chehab Date: Sat Mar 25 15:53:38 2006 -0300 V4L/DVB (3614): Fix compilation warning at powerpc platform Signed-off-by: Mauro Carvalho Chehab commit 31bc09b579f31331545e694d0a49ec4e6b380989 Author: Hans Verkuil Date: Sat Mar 25 10:26:09 2006 -0300 V4L/DVB (3610): Added the new routing commands to cx25840. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 11cda1075d8c40e536b77fce6dbf4cdbf8f77736 Author: Hans Verkuil Date: Sat Mar 25 09:55:23 2006 -0300 V4L/DVB (3609): Remove VIDIOC_S_AUDIO from tvaudio: no longer used. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 39b6f687d31d662461e25dbfe70be990b4c4855b Author: Hans Verkuil Date: Sat Mar 25 09:50:20 2006 -0300 V4L/DVB (3608): Implement new routing commands in saa7127.c Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1f8f5fa9b78ce344a03aeb1e6e12fffeb6a4c0c4 Author: Hans Verkuil Date: Sat Mar 25 09:20:28 2006 -0300 V4L/DVB (3607): Implement routing command for saa7115.c Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 013423588af1950e8eb7a44d80a684fd50174827 Author: Hans Verkuil Date: Sat Mar 25 08:19:47 2006 -0300 V4L/DVB (3606): Minor layout changes to make it consistent Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 51dab14e66a876ca124ef115fda08121ad9533fc Author: Hans Verkuil Date: Sat Mar 25 08:10:12 2006 -0300 V4L/DVB (3605): Add support for I2C_HW_B_CX2341X board adapter - Add missing class check to tveeprom_attach_adapter. - Add CX2341X specific IR probe address list. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b9ec4e109d7a342e83e1210e05797222e36555c3 Author: Samuel Thibault Date: Sun Apr 2 00:10:28 2006 -0500 Input: add support for Braille devices - Add KEY_BRL_* input keys and K_BRL_* keycodes; - Add emulation of how braille keyboards usually combine braille dots to the console keyboard driver; - Add handling of unicode U+28xy diacritics. Signed-off-by: Samuel Thibault Signed-off-by: Dmitry Torokhov commit 53a2670cd9611cf7c3b3bf9875b0b4041160fa60 Author: Richard Thrippleton Date: Sun Apr 2 00:10:18 2006 -0500 Input: synaptics - limit rate to 40pps on Toshiba Protege M300 Toshiba Protege M300 also requires the same workaround as Satellites and Dynabooks - Synaptics report rate should be lowered to 40pps (from 80), otherwise KBC starts losing keypresses. Signed-off-by: Richard Thrippleton Signed-off-by: Dmitry Torokhov commit b157d55eef38f014015b8058a9f733d1c1c49cb4 Author: Raphael Assenat Date: Sun Apr 2 00:10:05 2006 -0500 Input: gamecon - add SNES mouse support SNES gamepads and mice share the same type of interface so they both can be connected to the parallel port using a simple interface. Adding mouse support to a gamepad driver may sound funny at first, but doing so in this case makes it possible to connect and SNES gamepads and mice at the same time, on the same port. Signed-off-by: Raphael Assenat Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit ac648a6a704f73cc2a0f128d9deeb57aa6d76f6d Author: Dmitry Torokhov Date: Sun Apr 2 00:09:51 2006 -0500 Input: make modalias code respect allowed buffer size Signed-off-by: Dmitry Torokhov commit 969b21cdeee3d1561bd2b56504fa8388c5b437ff Author: Dmitry Torokhov Date: Sun Apr 2 00:09:34 2006 -0500 Input: convert /proc handling to seq_file Signed-off-by: Dmitry Torokhov commit 2db66876334d6bf44414cb6225d134b751b1d7ff Author: Dmitry Torokhov Date: Sun Apr 2 00:09:26 2006 -0500 Input: limit attributes' output to PAGE_SIZE sysfs can't handle more than PAGE_SIZE data coming from attributes' show() methods; make sure we respect this limit. Signed-off-by: Dmitry Torokhov commit 856d08ec46c5ecf3df13827c492fb6998fdc8322 Author: Stephen Rothwell Date: Sun Apr 2 02:45:04 2006 +1000 [PATCH] powerpc: iSeries needs slb_initialize to be called Since the powerpc 64k pages patch went in, systems that have SLBs (like Power4 iSeries) needed to have slb_initialize called to set up some variables for the SLB miss handler. This was not being called on the boot processor on iSeries, so on single cpu iSeries machines, we would get apparent memory curruption as soon as we entered user mode. This patch fixes that by calling slb_initialize on the boot cpu if the processor has an SLB. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 26f91fd54dba57a9bfe2373242ad71792d7af610 Author: Ben Dooks Date: Sun Apr 2 00:09:26 2006 +0100 [ARM] 3443/1: [S3C2410] Improve IRQ entry code Patch from Ben Dooks Remove the old debug from the IRQ entry code, update the comments on the handling of the IRQ registers. The message "bad interrupt offset" is removed as it is only helpful for debugging, and can cause printk() flooding when under load. Make the code to deal with GPIO interrupts faster, and use the same path to deal with unexplained results from the IRQ registers. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 23759dc6430428897a36c4d493f611eca55c9481 Author: Lennert Buytenhek Date: Sun Apr 2 00:07:39 2006 +0100 [ARM] 3439/2: xsc3: add I/O coherency support Patch from Lennert Buytenhek This patch adds support for the I/O coherent cache available on the xsc3. The approach is to provide a simple API to determine whether the chipset supports coherency by calling arch_is_coherent() and then setting the appropriate system memory PTE and PMD bits. In addition, we call this API on dma_alloc_coherent() and dma_map_single() calls. A generic version exists that will compile out all the coherency-related code that is not needed on the majority of ARM systems. Note that we do not check for coherency in the dma_alloc_writecombine() function as that still requires a special PTE setting. We also don't touch dma_mmap_coherent() as that is a special ARM-only API that is by definition only used on non-coherent system. Signed-off-by: Deepak Saxena Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 9a1875e60e61b563737d8d1fc3876b279710fe93 Author: David S. Miller Date: Sat Apr 1 12:48:36 2006 -0800 [NET]: Fully fix the memory leaks in sys_accept(). Andi Kleen was right, fput() on sock->file will end up calling sock_release() if necessary. So here is the rest of his version of the fix for these leaks. Signed-off-by: David S. Miller commit d3f4c571b6e596f9d39c596426269006a309d3b8 Author: Ben Dooks Date: Sat Apr 1 18:33:42 2006 +0100 [ARM] 3440/1: [S3C2410] make SMDK2410 and SMDK2440 similarities common Patch from Ben Dooks The SMDK2410 and SMDK2440 boards have a number of items in common, including the LEDs, Ethernet, PCMCIA. Make a common SMDK support file. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 532bda5d9cd2f94a9e374765c23858c7d8641f66 Author: Lennert Buytenhek Date: Sat Apr 1 18:33:35 2006 +0100 [ARM] 3438/1: ixp23xx: add pci slave support Patch from Lennert Buytenhek On the Double Espresso board, the IXP2350s are PCI slave devices and we skip calling pci_common_init() as that enumerates the bus. But even though we are a PCI slave device, there is still some PCI-related setup that has to be done. Create ixp23xx_pci_common_init(), move the common initialisation bits there, and have this function called from both the PCI master and the PCI slave init path. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 2c6967750a6f1e206a44ab5cf43c36aacb91372b Author: Paul Mackerras Date: Sat Apr 1 23:27:23 2006 +1100 powerpc: hook up the splice syscall Signed-off-by: Paul Mackerras commit cfff5b23bad2b7a4754f7c126a174a5867dfcca5 Author: Dave Jones Date: Fri Mar 31 23:53:09 2006 -0500 [PATCH] powerpc/cell: compile fixes Missing include for __NR_syscalls, and missing sys_splice() that causes build-time failure due to compile-time bounds check on spu_syscall_table. Signed-off-by: Dave Jones Signed-off-by: Paul Mackerras commit fc5266ea52e6cbc648387f1a2c773773fba8d782 Author: Anton Blanchard Date: Sat Apr 1 11:33:12 2006 +1100 [PATCH] powerpc: trivial spelling fixes in fault.c This comment exceeded my bad spelling threshold :) Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 794e085e56a67921eea80bcaeeac38d1517369be Author: Nathan Fontenot Date: Fri Mar 31 12:04:52 2006 -0600 [PATCH] powerpc/pseries: EEH Cleanup This patch removes unnecessary exports, marks functions as static when possible, and simplifies some list-related code. Signed-off-by: Nathan Fontenot Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 34422fed65bb1cf609892d73f1cf5e9626445f9e Author: Will Schmidt Date: Fri Mar 31 09:07:48 2006 -0600 [PATCH] powerpc/pseries: misc lparcfg fixes This fixes several problems with the lparcfg code. In case someone gets a sense of deja-vu, part of this was submitted last Sep, I thought the changes went in, but either got backed out, or just got lost. First, change the local_buffer declaration to be unsigned char *. We had a bad-math problem in a 2.4 tree which was built with a "-fsigned-char" parm. I dont believe we ever build with that parm now-a-days, but to be safe, I'd prefer the declaration be explicit. Second, fix a bad math calculation for splpar_strlen. Third, on the rtas_call for get-system-parameter, pass in RTAS_DATA_BUF_SIZE for the rtas_data_buf size, instead of letting random data determine the size. Until recently, we've had a sufficiently large 'random data' value get passed in, so the function just happens to have worked OK. Now it's getting passed a '0', which causes the rtas_call to return success, but no data shows up in the buffer. (oops!). This was found by the LTC test org. This is in a branch of code that only gets run on SPLPAR systems. Tested on power5 Lpar. Signed-off-by: Will Schmidt Signed-off-by: Paul Mackerras commit a219be2cf48fc77e73936d07187a5f8d1bca2511 Author: Linas Vepstas Date: Thu Mar 30 15:27:33 2006 -0600 [PATCH] powerpc/pseries: fix device name printing, again. The recent patch to print device names in EEH reset messages was lacking ... this patch works better. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit b13a96cfb055fd4b9c61463f87534a6f406b174b Author: Heiko J Schick Date: Thu Mar 30 22:47:14 2006 +0200 [PATCH] powerpc: Extends HCALL interface for InfiniBand usage This extends the HCALL interface for InfiniBand usage. I've made the patch against the linux-2.6 git tree and Segher's patch: [PATCH] Change H_StudlyCaps to H_SHOUTING_CAPS We moved this into the common powerpc code based on comments we got after posting the first eHCA InfiniBand device driver patch. Signed-off-by: Heiko j Schick Signed-off-by: Paul Mackerras commit 706c8c93ba4865a19e981b9770151a7a63c15794 Author: Segher Boessenkool Date: Thu Mar 30 14:49:40 2006 +0200 [PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS Also cleans up some nearby whitespace problems. Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 8df83028cf52e3bf68dfd35a4b1a044b326a4a99 Author: Linas Vepstas Date: Wed Mar 29 15:31:04 2006 -0600 [PATCH] powerpc/pseries: print message if EEH recovery fails The current code prints an ambiguous message if the recovery of a failed PCI device fails. Give this special case its own unique message. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 8c33fd11e3a21a15af35b5831f1516faf53094f1 Author: Linas Vepstas Date: Wed Mar 29 15:29:18 2006 -0600 [PATCH] powerpc/pseries: mutex lock to serialize EEH event processing This forces the processing of EEH PCI events to be serialized, using a very simple mutex lock. This serialization is required to avoid races involving additional PCI device failures that may occur during the recovery phase of a previous failure. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 50c37e216132d2185a15d5cf6b966adf6ecea535 Author: Pavel Machek Date: Sat Apr 1 12:13:31 2006 +0100 [ARM] 3436/1: 2.6.16-git18: collie_defconfig broken Patch from Pavel Machek > The kautobuild found the following error while trying to build 2.6.16-git18 > using collie_defconfig: > > arch/arm/mach-sa1100/collie.c:92: error: 'collie_uart_set_mctrl' undeclared here (not in a function) > arch/arm/mach-sa1100/collie.c:93: error: 'collie_uart_get_mctrl' undeclared here (not in a function) > make[1]: *** [arch/arm/mach-sa1100/collie.o] Error 1 > make: *** [arch/arm/mach-sa1100] Error 2 > make: Leaving directory `/var/tmp/kernel-orig' This fixes above compile error by adding missing pieces of uart support, and fixes compilation. Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 344b215b0db62b551c46e1feab1ddb10f99004ca Author: Komal Shah Date: Sat Apr 1 12:13:30 2006 +0100 [ARM] 3437/1: Kill duplicate exports of string library functions Patch from Komal Shah This patch fixes the duplicate exports of string library functions. Signed-off-by: Komal Shah Signed-off-by: Russell King commit 2722971cbe831117686039d5c334f2c0f560be13 Author: Dmitry Mishin Date: Sat Apr 1 02:25:19 2006 -0800 [NETFILTER]: iptables 32bit compat layer This patch extends current iptables compatibility layer in order to get 32bit iptables to work on 64bit kernel. Current layer is insufficient due to alignment checks both in kernel and user space tools. Patch is for current net-2.6.17 with addition of move of ipt_entry_{match| target} definitions to xt_entry_{match|target}. Signed-off-by: Dmitry Mishin Acked-off-by: Kirill Korotaev Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e64a70be5175ac2c209fa742123a6ce845852e0e Author: Martin Josefsson Date: Sat Apr 1 02:24:48 2006 -0800 [NETFILTER]: {ip,nf}_conntrack_netlink: fix expectation notifier unregistration This patch fixes expectation notifier unregistration on module unload to use ip_conntrack_expect_unregister_notifier(). This bug causes a soft lockup at the first expectation created after a rmmod ; insmod of this module. Should go into -stable as well. Signed-off-by: Martin Josefsson Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bcd1e830a5ac37d708647d492a1436a8a9babb07 Author: Martin Josefsson Date: Sat Apr 1 02:23:21 2006 -0800 [NETFILTER]: fix ifdef for connmark support in nf_conntrack_netlink When ctnetlink was ported from ip_conntrack to nf_conntrack two #ifdef's for connmark support were left unchanged and this code was never compiled. Problem noticed by Daniel De Graaf. Signed-off-by: Martin Josefsson Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a89ecb6a2ef732d04058d87801e2b6bd7e5c7089 Author: Yasuyuki Kozakai Date: Sat Apr 1 02:22:54 2006 -0800 [NETFILTER]: x_tables: unify IPv4/IPv6 multiport match This unifies ipt_multiport and ip6t_multiport to xt_multiport. As a result, this addes support for inversion and port range match to IPv6 packets. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit dc5ab2faece3b7473931357db7f63f596678481d Author: Yasuyuki Kozakai Date: Sat Apr 1 02:22:30 2006 -0800 [NETFILTER]: x_tables: unify IPv4/IPv6 esp match This unifies ipt_esp and ip6t_esp to xt_esp. Please note that now a user program needs to specify IPPROTO_ESP as protocol to use esp match with IPv6. This means that ip6tables requires '-p esp' like iptables. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9606a21635cec077e1928273751b44ecc824a49d Author: David S. Miller Date: Sat Apr 1 01:00:14 2006 -0800 [NET]: Fix dentry leak in sys_accept(). This regression was added by commit: 39d8c1b6fbaeb8d6adec4a8c08365cc9eaca6ae4 ("Do not lose accepted socket when -ENFILE/-EMFILE.") This is based upon a patch from Andi Kleen. Thanks to Adrian Bridgett for narrowing down a good test case, and to Andi Kleen and Andrew Morton for eyeballing this code. Signed-off-by: David S. Miller commit dbe5b4aaafc715b12dbbea309d3d17958d01fd65 Author: Herbert Xu Date: Sat Apr 1 00:54:16 2006 -0800 [IPSEC]: Kill unused decap state structure This patch removes the *_decap_state structures which were previously used to share state between input/post_input. This is no longer needed. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e695633e21ffb6a443a8c2f8b3f095c7f1a48eb0 Author: Herbert Xu Date: Sat Apr 1 00:52:46 2006 -0800 [IPSEC]: Kill unused decap state argument This patch removes the decap_state argument from the xfrm input hook. Previously this function allowed the input hook to share state with the post_input hook. The latter has since been removed. The only purpose for it now is to check the encap type. However, it is easier and better to move the encap type check to the generic xfrm_rcv function. This allows us to get rid of the decap state argument altogether. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 15901dc93fa4253bfb3661644ecad67c2e83213c Author: Andrew Morton Date: Sat Apr 1 00:49:35 2006 -0800 [NET]: com90xx kmalloc fix WARNING: "__you_cannot_kzalloc_that_much" [drivers/net/arcnet/com90xx.ko] undefined! We're trying to allocate negative amounts of memory.. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5c516c10198a8258c0c40f200a5a01a3fa0a0de4 Author: David S. Miller Date: Sat Apr 1 00:33:31 2006 -0800 [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller commit 758a613936223699f99081fc75eff7cf67b208f6 Author: David S. Miller Date: Sat Apr 1 00:32:56 2006 -0800 [TG3]: Revert "Speed up SRAM access" Undo commit 100c4673307f5806788791b9b886877c806afd96 MMIOs timeout more quickly that PCI config cycles and some of these SRAM accesses can take a very long time, triggering the MMIO limits on some sparc64 PCI controllers and thus resulting in bus timeouts and bus errors. Signed-off-by: David S. Miller commit 289eee6fa78e999208120c856ef3ae5a817fd59c Author: David S. Miller Date: Fri Mar 31 23:49:34 2006 -0800 [SPARC]: Wire up sys_sync_file_range() into syscall tables. Signed-off-by: David S. Miller commit 1339713a327d4538ca9173ab70afef9a1d57fd07 Author: David S. Miller Date: Fri Mar 31 02:04:15 2006 -0800 [SPARC]: Wire up sys_splice() into the syscall tables. Signed-off-by: David S. Miller commit 3cc1cc444f4c058deae9d5113ebb80e798c3076e Author: David S. Miller Date: Fri Mar 31 01:41:17 2006 -0800 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 9df1dab1df58ef20ef7df9b8f39d86cf5d2d1949 Author: David S. Miller Date: Fri Mar 31 00:36:25 2006 -0800 [SPARC64]: Align address in huge_pte_alloc(). We are about to fill in all HPAGE_SIZE's worth of PAGE_SIZE ptes, so we have to give the first pte in that set else we scribble over random memory when we fill in the ptes. Signed-off-by: David S. Miller commit 73c50a27a453a5ed0d21ff23bd67c1dd6d864cb8 Author: David S. Miller Date: Tue Mar 28 13:32:24 2006 -0800 [SPARC64]: Document the instruction checks we do in do_sparc64_fault(). Signed-off-by: David S. Miller commit 6f25f3986af0353b0bdc220f79b89c997d0ceda4 Author: David S. Miller Date: Tue Mar 28 13:29:26 2006 -0800 [SPARC64]: Make tsb_sync() mm comparison more precise. switch_mm() changes the mm state and does a tsb_context_switch() first, then we do the cpu register state switch which changes current_thread_info() and current(). So it's safer to check the PGD physical address stored in the trap block (which will be updated by the tsb_context_switch() in switch_mm()) than current->active_mm. Technically we should never run here in between those two updates, because interrupts are disabled during the entire context switch operation. But some day we might like to leave interrupts enabled during the context switch and this change allows that to happen without any surprises. Signed-off-by: David S. Miller commit 409ca8c8ae3173026e7dfbdcdab669766e43fb60 Author: Michael Hayes Date: Sat Apr 1 01:49:22 2006 +0200 Fix minor documentation typo This patch fixes a minor typo in Documentation/acpi-hotkey.txt. Signed-off-by: Adrian Bunk commit 3d79c33bbd1dd12d420fd84facfd0ba96261e595 Author: Cal Peake Date: Sat Apr 1 01:46:12 2006 +0200 BFP->BPF in Documentation/networking/tuntap.txt BFP should be BPF (BSD Packet Filter) Signed-off-by: Cal Peake Signed-off-by: Adrian Bunk commit 6585fa8aa58c7cd9f90f1c795a9dfc8db5f13906 Author: Stefan Richter Date: Sat Apr 1 01:44:30 2006 +0200 Doc/kernel-parameters.txt: slightly reword sentence about restrictions The previous patch somewhat diverted the train of thought. Here I am trying to bring the valued reader back on track. Signed-off-by: Stefan Richter Signed-off-by: Adrian Bunk commit a901ebb907e6aca38dc43417d6ce30f23651ea64 Author: Stefan Richter Date: Sat Apr 1 01:43:18 2006 +0200 Doc/kernel-parameters.txt: mention modinfo and sysfs Doc/kernel-parameters.txt: mention modinfo and sysfs Signed-off-by: Stefan Richter Signed-off-by: Adrian Bunk commit 0ee9d71f02b19f87368ee99b73019bf9522c7bf8 Author: Stefan Richter Date: Sat Apr 1 01:42:29 2006 +0200 Doc/kernel-parameters.txt: delete false version information and history Doc/kernel-parameters.txt: delete false version information and history Signed-off-by: Stefan Richter Signed-off-by: Adrian Bunk commit 8ba8e95ed14a2771bbcb43300feda094f298853e Author: Kalin KOZHUHAROV Date: Sat Apr 1 01:41:22 2006 +0200 Fix comments: s/granuality/granularity/ I was grepping through the code and some `grep ganularity -R .` didn't catch what I thought. Then looking closer I saw the term "granuality" used in only four places (in comments) and granularity in many more places describing the same idea. Some other facts: dictionary.com does not know such a word define:granuality on google is not found (and pages for granuality are mostly related to patches to the kernel) it has not been discussed as a term on LKML, AFAICS (=Can Search) To be consistent, I think granularity should be used everywhere. Signed-off-by: Kalin KOZHUHAROV Signed-off-by: Adrian Bunk commit 36a891b67f95fd5e1442fc0f7f953809b94b3fbc Author: Horms Date: Sat Apr 1 01:39:17 2006 +0200 kexec: grammar fix for crash_save_this_cpu() kexec: grammar fix for crash_save_this_cpu() Signed-Off-By: Horms Signed-off-by: Adrian Bunk commit 08039264d55b1e4c481309d841b245b0bb5e9c68 Author: Horms Date: Sat Apr 1 01:38:15 2006 +0200 Documentation: Make fujitsu/frv/kernel-ABI.txt 80 columns wide Documentation: Make kernel-ABI.txt 80 columns wide Note that this only has line-wrapping and white-space changes. No text was changed at all. Signed-Off-By: Horms Signed-off-by: Adrian Bunk commit abe37e5a13c4055bdf8ea1d2e781d757285e1908 Author: Horms Date: Sat Apr 1 01:36:09 2006 +0200 Documentation: Reorder documentation of nomca and nomce My patch to add brief documentation of the nomca boot parameter added it out of alphabetical order. Signed-Off-By: Horms Signed-off-by: Adrian Bunk commit 2e150f6e1a0401ff6af7b3f6518139fb092f3dd3 Author: Uwe Zeisberger Date: Sat Apr 1 01:29:43 2006 +0200 fix typo "Suposse" -> "Suppose" Signed-off-by: Uwe Zeisberger Signed-off-by: Adrian Bunk commit 3a8dc8930eab1209fd5063f6646a98e58a796eeb Author: Eric Sesterhenn Date: Sat Apr 1 01:28:11 2006 +0200 BUG_ON() Conversion in drivers/s390/char/tape_block.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit e048a8a688f07b17dbde9a96cab3759b900eae14 Author: Eric Sesterhenn Date: Sat Apr 1 01:27:08 2006 +0200 BUG_ON() Conversion in drivers/s390/block/dasd_erp.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 5aae277ed67b0271235d3a50908bb48b0e59be26 Author: Eric Sesterhenn Date: Sat Apr 1 01:26:09 2006 +0200 BUG_ON() Conversion in mm/vmalloc.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit e74ca2b49b8a38e9ba0bc039a00498c21140f1d6 Author: Eric Sesterhenn Date: Sat Apr 1 01:25:12 2006 +0200 BUG_ON() Conversion in mm/swap_state.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 46a350ef9803a2526a128c55cdb27dd73b2ad966 Author: Eric Sesterhenn Date: Sat Apr 1 01:23:29 2006 +0200 BUG_ON() Conversion in mm/mmap.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 8abd8e298eb15e2c1b993df0634daf29e43e0aab Author: Eric Sesterhenn Date: Sat Apr 1 01:21:17 2006 +0200 BUG_ON() Conversion in kernel/printk.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 9bc98fc6fd3d07f37b597601489df200e0024222 Author: Eric Sesterhenn Date: Sat Apr 1 01:20:23 2006 +0200 BUG_ON() Conversion in ipc/util.c this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 99cee0cd7560fc4e7f3646ee18d90e328bd1cb32 Author: Eric Sesterhenn Date: Sat Apr 1 01:18:38 2006 +0200 BUG_ON() Conversion in fs/sysfs/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 5df0d312413d920628f149421d7b0a3994684620 Author: Eric Sesterhenn Date: Sat Apr 1 01:16:26 2006 +0200 BUG_ON() Conversion in fs/smbfs/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 4b4d1cc7336b29f766d4e59d1ed2c627443a694a Author: Eric Sesterhenn Date: Sat Apr 1 01:15:35 2006 +0200 BUG_ON() Conversion in fs/jffs2/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 0bf3ba538a150f8430104a50e88c1449e8fa1fe6 Author: Eric Sesterhenn Date: Sat Apr 1 01:14:43 2006 +0200 BUG_ON() Conversion in fs/hfsplus/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 7dddb12c63553db850365cfd066a00416aa8c6cb Author: Eric Sesterhenn Date: Sat Apr 1 01:13:38 2006 +0200 BUG_ON() Conversion in fs/exec.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit d4569d2e6949a63851032b40c811913d4a6f85f5 Author: Eric Sesterhenn Date: Sat Apr 1 01:10:13 2006 +0200 BUG_ON() Conversion in fs/direct-io.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 9e77c485f7037e4817bb53c78d15d5403981ae8b Author: Eric Sesterhenn Date: Sat Apr 1 01:08:49 2006 +0200 BUG_ON() Conversion in md/raid1.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 543cb2a451918002238a052d5c280e6afdee1cea Author: Eric Sesterhenn Date: Sat Apr 1 01:08:12 2006 +0200 BUG_ON() Conversion in md/dm-target.c this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn Signed-off-by: Adrian Bunk commit 58ef2c4ce3c98fe46ae159bd560b63421798ea90 Author: Adrian Bunk Date: Sat Apr 1 01:04:59 2006 +0200 typos: s/ducument/document/ s/ducument/document/ Signed-off-by: Adrian Bunk commit 2a08b4e90408d15dc22a29b45b645ad7a6f09137 Author: Adrian Bunk Date: Sat Apr 1 01:04:20 2006 +0200 fix the email address of Wendy Xiong Replace a bouncing version of the email address of Wendy Xiong with a working one. Signed-off-by: Adrian Bunk commit 5637a2ee5db022e741e41d15e6badb0727bc55f3 Author: Adrian Bunk Date: Sat Apr 1 01:03:38 2006 +0200 fix a typo in the AIC7XXX_DEBUG_MASK help text This patch fixes a typo in the AIC7XXX_DEBUG_MASK help text. Signed-off-by: Adrian Bunk commit 3e6e952d1d17e5cd2e25a438662d906c44ffcfaa Author: Adrian Bunk Date: Sat Apr 1 01:03:08 2006 +0200 help text: SOFTWARE_SUSPEND doesn't need ACPI The note that SOFTWARE_SUSPEND doesn't need APM is helpful, but nowadays the information that it doesn't need ACPI, too, is even more helpful. Signed-off-by: Adrian Bunk commit 3a3f8a126d97cb5bdde92a26136402e88220b30f Author: Anders Larsen Date: Sat Apr 1 01:02:42 2006 +0200 MTD: remove obsolete Kconfig options Remove the obsolete Kconfig options MTD_CFI_AMDSTD_RETRY and MTD_CFI_AMDSTD_RETRY_MAX The code that depended on these was removed in early 2004, but Kconfig was not updated accordingly. Signed-off-by: Anders Larsen Signed-off-by: David Woodhouse Signed-off-by: Adrian Bunk commit 06bcfedd05448e63cae8924074bfacdf82bb17d4 Author: Steve French Date: Fri Mar 31 22:43:50 2006 +0000 [CIFS] Fix typo in earlier cifs_unlink change and protect one extra path. Since cifs_unlink can also be called from rename path and there was one report of oops am making the extra check for null inode. Signed-off-by: Steve French commit e9917a000fcc370408c8b7b83f2e85dba5fffbd4 Author: Steve French Date: Fri Mar 31 21:22:00 2006 +0000 [CIFS] Incorrect signature sent on SMB Read Fixes Samba bug 3621 and kernel.org bug 6147 For servers which require SMB/CIFS packet signing, we were sending the wrong signature (all zeros) on SMB Read request. The new cifs routine to do signatures across an iovec was not complete - and SMB Read, unlike the new SMBWrite2, did not fall back to the older routine (ie use SendReceive vs. the more efficient SendReceive2 ie used the older cifs_sign_smb vs. the disabled cifs_sign_smb2) for calculating signatures. This finishes up cifs_sign_smb2/cifs_calc_signature2 so that the callers of SendReceive2 can get SMB/CIFS packet signatures. Now that cifs_sign_smb2 is supported, we could start using it in the write path but this smaller fix does not include the change to use SMBWrite2 when signatures are required (which when enabled will make more Writes more efficient and alloc less memory). Currently Write2 is only used when signatures are not required at the moment but after more testing we will enable that as well). Thanks to James Slepicka and Sam Flory for initial investigation. Signed-off-by: Steve French commit 77d8798b554c856e21400bc8e761bc1b2ded8967 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:39 2006 -0800 IB/ipath: kbuild infrastructure Integrate the ipath core and OpenIB drivers into the kernel build infrastructure. Add entry to MAINTAINERS. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 6522108f19a998a5ded4d0c4d0f9eb9736398e31 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:38 2006 -0800 IB/ipath: infiniband verbs support The ipath_verbs.c file implements the driver-specific components of the kernel's Infiniband verbs layer. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit e28c00ad67164dba688c1d19c208c5fb554465f2 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:37 2006 -0800 IB/ipath: misc infiniband code, part 2 Management datagram support, queue pairs, and reliable and unreliable connections. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit cef1cce5c87d84f76e44f0e7b4de72ab3818ac3a Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:36 2006 -0800 IB/ipath: misc infiniband code, part 1 Completion queues, local and remote memory keys, and memory region support. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 97f9efbc47f0b1bc88abac8724b505f0794a48d0 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:35 2006 -0800 IB/ipath: infiniband RC protocol support This is an implementation of the Infiniband RC ("reliable connection") protocol. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 74ed6b5eb133b4acae7c47bc23457e5f8e7c1125 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:34 2006 -0800 IB/ipath: infiniband UC and UD protocol support These files implement the Infiniband UC ("unreliable connection") and UD ("unreliable datagram") protocols. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit aa735edf5dffbe43463c3d1218912fa54a8ec724 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:33 2006 -0800 IB/ipath: infiniband header files These header files are used by the layered Infiniband driver. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 889ab795a34247c8085e65648051e34f9fec952c Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:32 2006 -0800 IB/ipath: layering interfaces used by higher-level driver code The layering interfaces are used to implement the Infiniband protocols and the ethernet emulation driver. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 7f510b46e4771cfb89af134b3aa827d46125a2ce Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:31 2006 -0800 IB/ipath: support for userspace apps using core driver These files introduce a char device that userspace apps use to gain direct memory-mapped access to the InfiniPath hardware, and routines for pinning and unpinning user memory in cases where the hardware needs to DMA into the user address space. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 3e9b4a5eb4ae4936feeea256c0105e078c7702cd Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:30 2006 -0800 IB/ipath: sysfs and ipathfs support for core driver The ipathfs filesystem contains files that are not appropriate for sysfs, because they contain binary data. The hierarchy is simple; the top-level directory contains driver-wide attribute files, while numbered subdirectories contain per-device attribute files. Our userspace code currently expects this filesystem to be mounted on /ipathfs, but a final location has not yet been chosen. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 108ecf0d90655055d5a7db8d3a7239133b4d52b7 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:29 2006 -0800 IB/ipath: misc driver support code EEPROM support, interrupt handling, statistics gathering, and write combining management for x86_64. A note regarding i2c: The Atmel EEPROM hardware we use looks like an i2c device electrically, but is not i2c compliant at all from a functional perspective. We tried using the kernel's i2c support to talk to it, but failed. Normal i2c devices have a single 7-bit or 10-bit i2c address that they respond to. Valid 7-bit addresses range from 0x03 to 0x77. Addresses 0x00 to 0x02 and 0x78 to 0x7F are special reserved addresses (e.g. 0x00 is the "general call" address.) The Atmel device, on the other hand, responds to ALL addresses. It's designed to be the only device on a given i2c bus. A given i2c device address corresponds to the memory address within the i2c device itself. At least one reason why the linux core i2c stuff won't work for this is that it prohibits access to reserved addresses like 0x00, which are really valid addresses on the Atmel devices. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 097709fea03140b567bde8369f3ffafe33dfc1c6 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:28 2006 -0800 IB/ipath: chip initialisation code, and diag support ipath_init_chip.c sets up an InfiniPath device for use. ipath_diag.c permits userspace diagnostic tools to read and write a chip's registers. It is different in purpose from the mmap interfaces to the /sys/bus/pci resource files. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit dc741bbd4f47080c623d243546dd4cb5ff6c9564 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:27 2006 -0800 IB/ipath: support for PCI Express devices This file contains routines and definitions specific to InfiniPath devices that have PCI Express interfaces. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit cc533a5721b79d231c127fd56d55e6df23c19770 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:26 2006 -0800 IB/ipath: support for HyperTransport devices The ipath_ht400.c file contains routines and definitions specific to HyperTransport-based InfiniPath devices. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit d41d3aeb76135a70bfda9cd6666290fee0700b70 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:25 2006 -0800 IB/ipath: core driver header files ipath_common.h and ips_common.h contain definitions shared between userspace and the kernel. ipath_kernel.h is the core driver header file. ipath_debug.h contains mask values used for controlling driver debugging. ipath_registers.h contains bitmask definitions used in chip registers. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 7bb206e3b20477c8bcbbdf20834d456b0b6d82c4 Author: Bryan O'Sullivan Date: Wed Mar 29 15:23:24 2006 -0800 IB/ipath: core device driver The ipath driver is a low-level driver for PathScale InfiniPath host channel adapters (HCAs) based on the HT-400 and PE-800 chips, including the InfiniPath HT-460, the small form factor InfiniPath HT-460, the InfiniPath HT-470 and the Linux Networx LS/X. The ipath_driver.c file contains much of the low-level device handling code. Signed-off-by: Bryan O'Sullivan Signed-off-by: Roland Dreier commit 30c14e40ed85469f166b5effdab6705c73c5cd5e Author: Jes Sorensen Date: Fri Mar 31 11:18:57 2006 -0500 [PATCH] avoid unaligned access when accessing poll stack Commit 70674f95c0a2ea694d5c39f4e514f538a09be36f: [PATCH] Optimize select/poll by putting small data sets on the stack resulted in the poll stack being 4-byte aligned on 64-bit architectures, causing misaligned accesses to elements in the array. This patch fixes it by declaring the stack in terms of 'long' instead of 'char'. Force alignment of poll and select stacks to long to avoid unaligned access on 64 bit architectures. Signed-off-by: Jes Sorensen Signed-off-by: Linus Torvalds commit 108b42b4b966462444265806e3d7260a632ad630 Author: David Howells Date: Fri Mar 31 16:00:29 2006 +0100 [PATCH] Document Linux's memory barriers [try #7] The attached patch documents the Linux kernel's memory barriers. I've updated it from the comments I've been given. The per-arch notes sections are gone because it's clear that there are so many exceptions, that it's not worth having them. I've added a list of references to other documents. I've tried to get rid of the concept of memory accesses appearing on the bus; what matters is apparent behaviour with respect to other observers in the system. Interrupts barrier effects are now considered to be non-existent. They may be there, but you may not rely on them. I've added a couple of definition sections at the top of the document: one to specify the minimum execution model that may be assumed, the other to specify what this document refers to by the term "memory". I've made greater mention of the use of mmiowb(). I've adjusted the way in which caches are described, and described the fun that can be had with cache coherence maintenance being unordered and data dependency not being necessarily implicit. I've described (smp_)read_barrier_depends(). I've rearranged the order of the sections, so that memory barriers are discussed in abstract first, and then described the memory barrier facilities available on Linux, before going on to more real-world discussions and examples. I've added information about the lack of memory barriering effects with atomic ops and bitops. I've added information about control dependencies. I've added more diagrams to illustrate caching interactions between CPUs. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 428622986858aebddc32d022af65e88b9d2ea8bb Author: Kirill Korotaev Date: Fri Mar 31 17:58:46 2006 +0400 [PATCH] wrong error path in dup_fd() leading to oopses in RCU Wrong error path in dup_fd() - it should return NULL on error, not an address of already freed memory :/ Triggered by OpenVZ stress test suite. What is interesting is that it was causing different oopses in RCU like below: Call Trace: [] rcu_do_batch+0x2c/0x80 [] rcu_process_callbacks+0x3d/0x70 [] tasklet_action+0x73/0xe0 [] __do_softirq+0x10a/0x130 [] do_softirq+0x4f/0x60 ======================= [] smp_apic_timer_interrupt+0x77/0x110 [] apic_timer_interrupt+0x1c/0x24 Code: Bad EIP value. <0>Kernel panic - not syncing: Fatal exception in interrupt Signed-Off-By: Pavel Emelianov Signed-Off-By: Dmitry Mishin Signed-Off-By: Kirill Korotaev Signed-Off-By: Linus Torvalds commit e358c1a2c45f7ec32d77cc09a2bb42d6823a4193 Author: Nicolas Pitre Date: Fri Mar 31 02:32:13 2006 -0800 [PATCH] mutex: some cleanups Turn some macros into inline functions and add proper type checking as well as being more readable. Also a minor comment adjustment. Signed-off-by: Nicolas Pitre Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a58e00e7da5f93c096527f5e20ceb2cf6d130cf0 Author: Jesper Juhl Date: Fri Mar 31 02:32:12 2006 -0800 [PATCH] Decrease number of pointer derefs in jsm_tty.c Decrease the number of pointer derefs in drivers/serial/jsm/jsm_tty.c Benefits of the patch: - Fewer pointer dereferences should make the code slightly faster. - Size of generated code is smaller - Improved readability Signed-off-by: Jesper Juhl Acked-by: "V. ANANDA KRISHNAN" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a244e1698ae3609cdfe24088e1293593cb7a5278 Author: Adrian Bunk Date: Fri Mar 31 02:32:11 2006 -0800 [PATCH] fs/namei.c: make lookup_hash() static As announced, lookup_hash() can now become static. Signed-off-by: Adrian Bunk Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cb3463f04e771869f481e2dd44f66419e850586 Author: Adrian Bunk Date: Fri Mar 31 02:32:07 2006 -0800 [PATCH] unexport get_wchan The only user of get_wchan is the proc fs - and proc can't be built modular. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec350a7fc16af45e143085594a6c9a18d7a0cba3 Author: NeilBrown Date: Fri Mar 31 02:32:06 2006 -0800 [PATCH] md: Raid-6 did not create sysfs entries for stripe cache Signed-off-by: Brad Campbell Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 926ce2d8a7d446c720faec9d8c5105eeb04bcf7a Author: NeilBrown Date: Fri Mar 31 02:32:02 2006 -0800 [PATCH] md: Remove some code that can sleep from under a spinlock And remove the comments that were put in inplace of a fix too.... Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b1117d50543e2484bee037ec2589fe52492a7e7 Author: NeilBrown Date: Fri Mar 31 02:31:57 2006 -0800 [PATCH] md: Don't clear bits in bitmap when writing to one device fails during recovery Currently a device failure during recovery leaves bits set in the bitmap. This normally isn't a problem as the offending device will be rejected because of errors. However if device re-adding is being used with non-persistent bitmaps, this can be a problem. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39451a73a2d190763ba8a98f486cf23d63d22582 Author: Michael Hanselmann Date: Fri Mar 31 02:31:55 2006 -0800 [PATCH] fbdev: Remove old radeon driver This patch removes the old radeon driver which has been replaced by a newer one. Signed-off-by: Michael Hanselmann Acked-by: Benjamin Herrenschmidt Signed-off-by: Adrian Bunk Acked-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a536093a2f07007aa572e922752b7491b9ea8ff2 Author: Antonino A. Daplas Date: Fri Mar 31 02:31:54 2006 -0800 [PATCH] fbcon: Fix big-endian bogosity in slow_imageblit() The monochrome->color expansion routine that handles bitmaps which have (widths % 8) != 0 (slow_imageblit) produces corrupt characters in big-endian. This is caused by a bogus bit test in slow_imageblit(). Fix. This patch may deserve to go to the stable tree. The code has already been well tested in little-endian machines. It's only in big-endian where there is uncertainty and Herbert confirmed that this is the correct way to go. It should not introduce regressions. Signed-off-by: Antonino Daplas Acked-by: Herbert Poetzl Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cbbb3b59c3ccdc55ad0c924fb49e09a962bb517 Author: Richard Purdie Date: Fri Mar 31 02:31:53 2006 -0800 [PATCH] pxafb: Minor driver fixes Fixes for the pxafb driver: * Return -EINVAL for resolutions that are too large as per framebuffer driver policy. * Increase the error timeout for disabling the LCD controller. The current timeout is sometimes too short on the Sharp Zaurus Cxx00 hardware and an extra delay in an error path shouldn't pose any problems. * Fix a dev reference which causes a compile error when DEBUG is defined. Signed-off-by: Richard Purdie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c0f5fb08e8ad59f396b1bda41ccd93cbb00a09f Author: Richard Purdie Date: Fri Mar 31 02:31:51 2006 -0800 [PATCH] backlight: corgi_bl: Generalise to support other Sharp SL hardware Generalise the Corgi backlight driver by moving the default intensity and limit mask settings into the platform specific data structure. This enables the driver to support other Zaurus hardware, specifically the SL-6000x (Tosa) model. Also change the spinlock to a mutex (the spinlock is overkill). Signed-off-by: Richard Purdie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f27a27bd77fcfd4b90ed33668940bc3cf72768b Author: Richard Purdie Date: Fri Mar 31 02:31:50 2006 -0800 [PATCH] backlight: HP Jornada 680 Backlight driver updates/fixes Updates to the HP Jornada 680 Backlight driver: - Correct the suspend/resume functions so the driver compiles (SUSPEND_POWER_DOWN/RESUME_POWER_ON no longer exist). - Convert the driver to match the recent platform device changes. - Replace the unsafe static struct platform_device with dynamic allocation. - Convert the driver to the new backlight code. This has not been tested on a device due to lack of hardware but wouldn't compile beforehand. Signed-off-by: Richard Purdie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ca017658b1f902c9bba2cc1017e301581f7728d Author: Richard Purdie Date: Fri Mar 31 02:31:49 2006 -0800 [PATCH] backlight: Backlight Class Improvements Backlight class attributes are currently easy to implement incorrectly. Moving certain handling into the backlight core prevents this whilst at the same time makes the drivers simpler and consistent. The following changes are included: The brightness attribute only sets and reads the brightness variable in the backlight_properties structure. The power attribute only sets and reads the power variable in the backlight_properties structure. Any framebuffer blanking events change a variable fb_blank in the backlight_properties structure. The backlight driver has only two functions to implement. One function is called when any of the above properties change (to update the backlight brightness), the second is called to return the current backlight brightness value. A new attribute "actual_brightness" is added to return this brightness as determined by the driver having combined all the above factors (and any driver/device specific factors). Additionally, the backlight core takes care of checking the maximum brightness is not exceeded and of turning off the backlight before device removal. The corgi backlight driver is updated to reflect these changes. Signed-off-by: Richard Purdie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b0e1c5dd2941aec566047e10a5cc929ca7f7d4f Author: Alberto Mardegan Date: Fri Mar 31 02:31:46 2006 -0800 [PATCH] w100fb: Add acceleration support to ATI Imageon Add acceleration support in w100fb.c (i.e. ATI Imageons) for the copyarea and fillrect operations. Signed-off-by: Alberto Mardegan Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a37d5f51020b9967d4b4094f6d627d0873a6469 Author: Antonino A. Daplas Date: Fri Mar 31 02:31:45 2006 -0800 [PATCH] fbcon: Save current display during initialization The current display was not saved during initialization. This leads to hard to track console corruption, such as a misplaced cursor, which is correctible by switching consoles. Fix this minor bug. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e7e241f8c5c87cc3685364feface081c9fa3648 Author: Eric W. Biederman Date: Fri Mar 31 02:31:43 2006 -0800 [PATCH] dcache: Add helper d_hash_and_lookup It is very common to hash a dentry and then to call lookup. If we take fs specific hash functions into account the full hash logic can get ugly. Further full_name_hash as an inline function is almost 100 bytes on x86 so having a non-inline choice in some cases can measurably decrease code size. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92476d7fc0326a409ab1d3864a04093a6be9aca7 Author: Eric W. Biederman Date: Fri Mar 31 02:31:42 2006 -0800 [PATCH] pidhash: Refactor the pid hash table Simplifies the code, reduces the need for 4 pid hash tables, and makes the code more capable. In the discussions I had with Oleg it was felt that to a large extent the cleanup itself justified the work. With struct pid being dynamically allocated meant we could create the hash table entry when the pid was allocated and free the hash table entry when the pid was freed. Instead of playing with the hash lists when ever a process would attach or detach to a process. For myself the fact that it gave what my previous task_ref patch gave for free with simpler code was a big win. The problem is that if you hold a reference to struct task_struct you lock in 10K of low memory. If you do that in a user controllable way like /proc does, with an unprivileged but hostile user space application with typical resource limits of 1000 fds and 100 processes I can trigger the OOM killer by consuming all of low memory with task structs, on a machine wight 1GB of low memory. If I instead hold a reference to struct pid which holds a pointer to my task_struct, I don't suffer from that problem because struct pid is 2 orders of magnitude smaller. In fact struct pid is small enough that most other kernel data structures dwarf it, so simply limiting the number of referring data structures is enough to prevent exhaustion of low memory. This splits the current struct pid into two structures, struct pid and struct pid_link, and reduces our number of hash tables from PIDTYPE_MAX to just one. struct pid_link is the per process linkage into the hash tables and lives in struct task_struct. struct pid is given an indepedent lifetime, and holds pointers to each of the pid types. The independent life of struct pid simplifies attach_pid, and detach_pid, because we are always manipulating the list of pids and not the hash table. In addition in giving struct pid an indpendent life it makes the concept much more powerful. Kernel data structures can now embed a struct pid * instead of a pid_t and not suffer from pid wrap around problems or from keeping unnecessarily large amounts of memory allocated. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c7904a00b06d2ee51149794b619e07369fcf9d4 Author: Eric W. Biederman Date: Fri Mar 31 02:31:37 2006 -0800 [PATCH] task: RCU protect task->usage A big problem with rcu protected data structures that are also reference counted is that you must jump through several hoops to increase the reference count. I think someone finally implemented atomic_inc_not_zero(&count) to automate the common case. Unfortunately this means you must special case the rcu access case. When data structures are only visible via rcu in a manner that is not determined by the reference count on the object (i.e. tasks are visible until their zombies are reaped) there is a much simpler technique we can employ. Simply delaying the decrement of the reference count until the rcu interval is over. What that means is that the proc code that looks up a task and later wants to sleep can now do: rcu_read_lock(); task = find_task_by_pid(some_pid); if (task) { get_task_struct(task); } rcu_read_unlock(); The effect on the rest of the kernel is that put_task_struct becomes cheaper and immediate, and in the case where the task has been reaped it frees the task immediate instead of unnecessarily waiting an until the rcu interval is over. Cleanup of task_struct does not happen when its reference count drops to zero, instead cleanup happens when release_task is called. Tasks can only be looked up via rcu before release_task is called. All rcu protected members of task_struct are freed by release_task. Therefore we can move call_rcu from put_task_struct into release_task. And we can modify release_task to not immediately release the reference count but instead have it call put_task_struct from the function it gives to call_rcu. The end result: - get_task_struct is safe in an rcu context where we have just looked up the task. - put_task_struct() simplifies into its old pre rcu self. This reorganization also makes put_task_struct uncallable from modules as it is not exported but it does not appear to be called from any modules so this should not be an issue, and is trivially fixed. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4e5d3fc80d26ed26ebe42907b224f08d7eccfbf Author: Herbert Poetzl Date: Fri Mar 31 02:31:35 2006 -0800 [PATCH] cleanup in proc_check_chroot() proc_check_chroot() does the check in a very unintuitive way (keeping a copy of the argument, then modifying the argument), and has uncommented sideeffects. Signed-off-by: Herbert Poetzl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 158d9ebd19280582da172626ad3edda1a626dace Author: Andrew Morton Date: Fri Mar 31 02:31:34 2006 -0800 [PATCH] resurrect __put_task_struct This just got nuked in mainline. Bring it back because Eric's patches use it. Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 390e2ff07712468ce6600a43aa91e897b056ce12 Author: Eric W. Biederman Date: Fri Mar 31 02:31:33 2006 -0800 [PATCH] Make setsid() more robust The core problem: setsid fails if it is called by init. The effect in 2.6.16 and the earlier kernels that have this problem is that if you do a "ps -j 1 or ps -ej 1" you will see that init and several of it's children have process group and session == 0. Instead of process group == session == 1. Despite init calling setsid. The reason it fails is that daemonize calls set_special_pids(1,1) on kernel threads that are launched before /sbin/init is called. The only remaining effect in that current->signal->leader == 0 for init instead of 1. And the setsid call fails. No one has noticed because /sbin/init does not check the return value of setsid. In 2.4 where we don't have the pidhash table, and daemonize doesn't exist setsid actually works for init. I care a lot about pid == 1 not being a special case that we leave broken, because of the container/jail work that I am doing. - Carefully allow init (pid == 1) to call setsid despite the kernel using its session. - Use find_task_by_pid instead of find_pid because find_pid taking a pidtype is going away. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9741ef964dc8bfeb6520825df9fed8f538c3336e Author: Thomas Gleixner Date: Fri Mar 31 02:31:32 2006 -0800 [PATCH] futex: check and validate timevals The futex timeval is not checked for correctness. The change does not break existing applications as the timeval is supplied by glibc (and glibc always passes a correct value), but the glibc-internal tests for this functionality fail. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d425b274ba83ba4e7746a40446ec0ba3267de51f Author: Con Kolivas Date: Fri Mar 31 02:31:29 2006 -0800 [PATCH] sched: activate SCHED BATCH expired To increase the strength of SCHED_BATCH as a scheduling hint we can activate batch tasks on the expired array since by definition they are latency insensitive tasks. Signed-off-by: Con Kolivas Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c4bb1f9b3788309e1159961c606ba0bdf7ed382 Author: Con Kolivas Date: Fri Mar 31 02:31:29 2006 -0800 [PATCH] sched: remove on runqueue requeueing On runqueue time is used to elevate priority in schedule(). In the code it currently requeues tasks even if their priority is not elevated, which would end up placing them at the end of their runqueue array effectively delaying them instead of improving their priority. Bug spotted by Mike Galbraith This patch removes this requeueing. Signed-off-by: Con Kolivas Acked-by: Ingo Molnar Cc: Mike Galbraith Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5138930e6a69f1c7851a82d7cedaa01fad029fcf Author: Con Kolivas Date: Fri Mar 31 02:31:27 2006 -0800 [PATCH] sched: include noninteractive sleep in idle detect Tasks waiting in SLEEP_NONINTERACTIVE state can now get to best priority so they need to be included in the idle detection code. Signed-off-by: Con Kolivas Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e72ff0bb2c163eb13014ba113701bd42dab382fe Author: Con Kolivas Date: Fri Mar 31 02:31:26 2006 -0800 [PATCH] sched: dont decrease idle sleep avg We watch for tasks that sleep extended periods and don't allow one single prolonged sleep period from elevating priority to maximum bonus to prevent cpu bound tasks from getting high priority with single long sleeps. There is a bug in the current code that also penalises tasks that already have high priority. Correct that bug. Signed-off-by: Con Kolivas Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7c38cb49c6cc05bc11f70d9e9889da1c4a0d37f Author: Con Kolivas Date: Fri Mar 31 02:31:25 2006 -0800 [PATCH] sched: make task_noninteractive use sleep_type Alterations to the pipe code in the kernel made it possible for relative starvation to occur with tasks that slept waiting on a pipe getting unfair priority bonuses even if they were otherwise fully cpu bound so the TASK_NONINTERACTIVE flag was introduced which prevented any change to sleep_avg while sleeping waiting on a pipe. This change also leads to the converse though, preventing any priority boost from occurring in truly interactive tasks that wait on pipes. Convert the TASK_NONINTERACTIVE flag to set sleep_type to SLEEP_NONINTERACTIVE which will allow a linear bonus to priority based on sleep time thus allowing interactive tasks to get high priority if they sleep enough. Signed-off-by: Con Kolivas Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dee386e14045484a6c41c8f03a263f9d79de740 Author: Con Kolivas Date: Fri Mar 31 02:31:23 2006 -0800 [PATCH] sched: cleanup task_activated() The activated flag in task_struct is used to track different sleep types and its usage is somewhat obfuscated. Convert the variable to an enum with more descriptive names without altering the function. Signed-off-by: Con Kolivas Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db1b1fefc2cecbff2e4214062fa8c680cb6e7b7d Author: Jack Steiner Date: Fri Mar 31 02:31:21 2006 -0800 [PATCH] sched: reduce overhead of calc_load Currently, count_active_tasks() calls both nr_running() & nr_interruptible(). Each of these functions does a "for_each_cpu" & reads values from the runqueue of each cpu. Although this is not a lot of instructions, each runqueue may be located on different node. Depending on the architecture, a unique TLB entry may be required to access each runqueue. Since there may be more runqueues than cpu TLB entries, a scan of all runqueues can trash the TLB. Each memory reference incurs a TLB miss & refill. In addition, the runqueue cacheline that contains nr_running & nr_uninterruptible may be evicted from the cache between the two passes. This causes unnecessary cache misses. Combining nr_running() & nr_interruptible() into a single function substantially reduces the TLB & cache misses on large systems. This should have no measureable effect on smaller systems. On a 128p IA64 system running a memory stress workload, the new function reduced the overhead of calc_load() from 605 usec/call to 324 usec/call. Signed-off-by: Jack Steiner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3055addadbe9bfb2365006a1c13fd342a8d30d52 Author: Dimitri Sivanich Date: Fri Mar 31 02:31:20 2006 -0800 [PATCH] hrtimer: call get_softirq_time() only when necessary in run_hrtimer_queue() It seems that run_hrtimer_queue() is calling get_softirq_time() more often than it needs to. With this patch, it only calls get_softirq_time() if there's a pending timer. Signed-off-by: Dimitri Sivanich Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 669d7868ae414cdb7b7e5df375dc8e4b47f26f6d Author: Thomas Gleixner Da