commit 30fbc9f77c5a77f5f7f053d29eb92e41f6043406 Merge: 6e96783... 8960909... Author: Linus Torvalds Date: Fri Mar 9 10:38:09 2007 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] DEC: Remove call to register_prom_console. commit 6e96783f586cc0a64651087cb518209a8577123f Merge: 8466c83... 0feba82... Author: Linus Torvalds Date: Fri Mar 9 10:34:55 2007 -0800 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: [JFFS2] print a message when marking bad block [JFFS2] Check for all-zero node headers [MTD] [OneNAND] Classify the page data and oob buffer [MTD] [OneNAND] Exit the loop when transferring/filling of the oob is finished [MTD] [OneNAND] add Nokia Copyright and a credit [MTD] [OneNAND] Fix typo & wrong comments [MTD] [OneNAND] Use oob buffer instead of main one in oob functions [MTD] Correct partition failed erase address [JFFS2] Use yield() between GC passes in background thread. [MTD] [NAND] Correct misspelled preprocessor variable. [MTD] [MAPS] dilnetpc: Fix printk warning [MTD] [NOR] Fix oops in cfi_amdstd_sync [MTD] ESB2 check for closed ROM window [JFFS2] Fix writebuffer recovery in the first page of a block [MTD] [NAND] make oobavail public commit 8466c833799b30ab343c5108cd2e460f9f16c9d8 Merge: 2f8d16a... 0a38f54... Author: Linus Torvalds Date: Fri Mar 9 10:12:46 2007 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: ibmtr: Drain rich supply of modpost warnings. 3c59x: Fix several modpost warnings z85230: Fix FIFO handling r8169: fix a race between PCI probe and dev_open r8169: revert bogus BMCR reset sky2: turn off Rx checksum on bad hardware mv643xx: Clear pending interrupts before calling request_irq myri10ge: add a wc_enabled flag to myri10ge_priv myri10ge: prevent 4k rdma on SGI TIOCE chipset myri10ge: use pci_map_page to prepare the dmatest buffer myri10ge: fix error checking and return value in myri10ge_allocate_rings netxen: fix warnings via-rhine: set avoid_D3 for broken BIOSes [PATCH] bcm43xx: Fix assertion failures in interrupt handler [PATCH] bcm43xx: Fix bug in frequency to channel conversion [PATCH] bcm43xx: Fix errors in specs to code translation in B6PHY init commit 0a38f5442053b10c773b6a10a4d67e2293551f12 Merge: 82c00b6... 7d9f3e8... Author: Jeff Garzik Date: Fri Mar 9 11:58:11 2007 -0500 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 82c00b62c811142c8e7d3aef92fbf3fc77b83709 Author: Ralf Baechle Date: Thu Mar 8 12:53:07 2007 +0000 ibmtr: Drain rich supply of modpost warnings. Building ibmtr as a module produces a spectacular pile of modpost warnings: WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x450) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x454) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x458) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x45c) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4e8) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4ec) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4f0) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4f4) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x500) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x504) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x508) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x50c) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x520) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x524) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x528) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x534) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x540) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x544) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x548) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x54c) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x558) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x55c) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x560) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x564) and 'ibmtr_reset_timer' Fix by making ibmtr_probe an __init function. While at it, move move ibmtr_probe_card below ibmtr_probe so the protoype for ibmtr_probe can be deleted. Signed-off-by: Ralf Baechle drivers/net/tokenring/ibmtr.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) Signed-off-by: Jeff Garzik commit 95c408a95f9b16c638566df57c070b408edf1a01 Author: Ralf Baechle Date: Thu Mar 8 15:33:16 2007 +0000 3c59x: Fix several modpost warnings WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4580) and 'vortex_eisa_remove' WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4584) and 'vortex_eisa_remove' WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4588) and 'vortex_eisa_remove' WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x458c) and 'vortex_eisa_remove' Fixed by: o move definition of vortex_eisa_driver below the functions it references. o remove now unnecessary prototypes for vortex_eisa_probe and vortex_eisa_remove. o Make vortex_eisa_probe an __init function. o Make vortex_eisa_remove a __devexit function. o Wrap vortex_eisa_driver reference to vortex_eisa_remove with __devexit_p(). Signed-off-by: Ralf Baechle drivers/net/3c59x.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) Signed-off-by: Jeff Garzik commit fe79745507593941adb44a6b2e392645c54ca1c2 Author: Alan Cox Date: Wed Mar 7 16:37:38 2007 +0000 z85230: Fix FIFO handling We must exit immediately on a FIFO fill not take the end of packet path otherwise each underrun in PIO transmit mode causes a runt packet and the data is lost. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 2efa53f373ed811d4860904f5205b8a3b376e253 Author: Francois Romieu Date: Fri Mar 9 00:00:05 2007 +0100 r8169: fix a race between PCI probe and dev_open Initialize the timer with the rest of the private-struct. Signed-off-by: Jeff Garzik Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 9e0db8ef4a8c8fd6f3a506259975d7f8db962421 Author: Francois Romieu Date: Thu Mar 8 23:59:54 2007 +0100 r8169: revert bogus BMCR reset Added during bf793295e1090af84972750898bf8470df5e5419 The current code requests a reset but prohibits autoneg, 1000 Mb/s, 100 Mb/s and full duplex. The 8168 does not like it at all. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 874183072de73a36a958585e3186639fd2634701 Author: Stephen Hemminger Date: Thu Mar 8 12:42:30 2007 -0800 sky2: turn off Rx checksum on bad hardware On Yukon FE, occasional hardware receive checksum errors are seen. An early indication of the problem is single bit differences in the two checksum engines. Use this as a detection mechanism to turn off Rx checksumming. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 85cf572cd5a1b63d5efd5bd538201bd56cd5ad24 Author: Dale Farnsworth Date: Wed Mar 7 22:21:23 2007 -0700 mv643xx: Clear pending interrupts before calling request_irq Signed-off-by: Dale Farnsworth Acked-by: Giridhar Pemmasani Signed-off-by: Jeff Garzik commit 276e26c3160602efea1d0acc9fe7b45bb4c2c8e1 Author: Brice Goglin Date: Wed Mar 7 20:02:32 2007 +0100 myri10ge: add a wc_enabled flag to myri10ge_priv Add a wc_enabled flag in the myri10ge_priv instead of relying on mtrr >= 0. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 4c882dd808b907652c9a8fe4f7d345cb4dee6a92 Author: Brice Goglin Date: Wed Mar 7 20:01:53 2007 +0100 myri10ge: prevent 4k rdma on SGI TIOCE chipset Do not use 4k rdma request on SGI TIOCE chipset since this bridge does not support it. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 34fdccea93e858aaece3f127628365b546f96857 Author: Brice Goglin Date: Wed Mar 7 20:00:45 2007 +0100 myri10ge: use pci_map_page to prepare the dmatest buffer Allocate a specific page and use pci_map_page for dma test instead of relying on another existing buffer. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 355c7265f4745a2aa6f0482d466e2271e6b3c61a Author: Brice Goglin Date: Wed Mar 7 19:59:52 2007 +0100 myri10ge: fix error checking and return value in myri10ge_allocate_rings Fix a missing error check in myri10ge_allocate_rings() and set status to -ENOMEM before all actual allocations so that the error path returns what it should. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit b8d095d782fa1e97d5dc05c08ba32c8eb28b85e4 Author: Ralf Baechle Date: Tue Mar 6 20:35:37 2007 +0000 netxen: fix warnings CC [M] drivers/net/netxen/netxen_nic_hw.o drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_hw_resources': drivers/net/netxen/netxen_nic_hw.c:231: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'dma_addr_t' drivers/net/netxen/netxen_nic_hw.c:250: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'dma_addr_t' u64 is unsigned long so the cast to u64 will result in a warning on the printf arguments for 64-bit builds. So cast to unsigned long long instead. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit e84df485c8e059bc9d8d0691ae6a3deafa1f9350 Author: Roger Luethi Date: Tue Mar 6 19:57:37 2007 +0100 via-rhine: set avoid_D3 for broken BIOSes This patch sets avoid_D3 for BIOSes known to be broken. Said BIOSes fail at PXE boot if the chip is in power state D3. Signed-off-by: Roger Luethi Signed-off-by: Jeff Garzik commit 2f8d16a996da0b9be2536994aa7a825418364471 Author: Tejun Heo Date: Fri Mar 9 19:34:19 2007 +0900 devres: release resources on device_del() Some platform devices are driven without driver attached, so managed resources can be acquired without driver attached. Make sure such resources are released by calling devres_release_all() in device_del(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1aa506e437a94d520f852d39d5d6a6e7f2e01901 Author: Tejun Heo Date: Fri Mar 9 19:36:12 2007 +0900 libata: fix ata_host_release() free order host->ops->host_stop() might access ports. Free ports after host_stop. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 8ba5e4cbe444f10352756b6c7715bb26bb087680 Author: Robert Hancock Date: Thu Mar 8 18:02:18 2007 -0600 sata_nv: revert use of notifiers for now Commit 721449bf0d51213fe3abf0ac3e3561ef9ea7827a added support for using the ADMA notifier bits to determine which commands to check for completion. However there have been reports that this causes command timeouts in certain cases. This is still being investigated. In addition, apparently the notifiers won't work if ADMA is disabled on the other port as a result of an ATAPI device being connected, and we don't handle this case properly. For now, just restore the previous behavior of checking all active commands to see if they are complete, without relying on the notifiers. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 14d66ab7e2e06d3727719d3e4eec6bf9f70251c3 Author: Petr Vandrovec Date: Thu Mar 8 10:12:12 2007 +0100 Fix simplex adapters with libata Recently I got my hands on nVidia's MCP61 PM-AM board, and it contains IDE chip configured by BIOS with only primary channel enabled. This confuses code which probes for device DMA capabilities - it gets 0x60 (happy duplex device) from primary channel BMDMA, but 0xFF (nobody here) from secondary channel BMDMA. Due to this code then believes that chip is simplex. I do not address this problem in my patch, as I'm not sure how to handle this. Probably ata_pci_init_one should have bitmap of enabled/possible interfaces instead of their count, but it looks like quite intrusive change, and maybe we do not care - for device with only one channel simplex and regular DMA engines are same. But making device simplex pointed out that support for DMA on simplex devices is currently broken - ata_dev_xfermask tests whether device is simplex and if it is whether DMA engine was assigned to this port. If not then it strips out DMA bits from device. Problem is that code which assigns DMA engine to port in ata_set_mode first detect device mode and assigns DMA engine to channel only if some DMA capable device was found. And as xfermask stripped out DMA bits, host->simplex_claimed is always NULL with current implementation. By allowing DMA either if simplex_claimed is NULL or if it points to current port DMA can be finally used - it gets assigned to first port which contains any DMA capable device. Before: pata_amd 0000:00:06.0: version 0.2.8 PCI: Setting latency timer of device 0000:00:06.0 to 64 ata5: PATA max UDMA/133 cmd 0x000101f0 ctl 0x000103f6 bmdma 0x0001f000 irq 14 ata6: PATA max UDMA/133 cmd 0x00010170 ctl 0x00010376 bmdma 0x0001f008 irq 15 scsi4 : pata_amd ata5.00: ATAPI, max UDMA/66 ata5.00: simplex DMA is claimed by other device, disabling DMA ata5.00: configured for PIO4 scsi5 : pata_amd ata6: port disabled. ignoring. ata6: reset failed, giving up scsi 4:0:0:0: CD-ROM ATAPI DVD W DH16W1P LG12 PQ: 0 ANSI: 5 After: pata_amd 0000:00:06.0: version 0.2.8 PCI: Setting latency timer of device 0000:00:06.0 to 64 ata5: PATA max UDMA/133 cmd 0x000101f0 ctl 0x000103f6 bmdma 0x0001f000 irq 14 ata6: PATA max UDMA/133 cmd 0x00010170 ctl 0x00010376 bmdma 0x0001f008 irq 15 scsi4 : pata_amd ata5.00: ATAPI, max UDMA/66 ata5.00: configured for UDMA/33 scsi5 : pata_amd ata6: port disabled. ignoring. ata6: reset failed, giving up scsi 4:0:0:0: CD-ROM ATAPI DVD W DH16W1P LG12 PQ: 0 ANSI: 5 Signed-off-by: Petr Vandrovec Signed-off-by: Jeff Garzik commit 9a2eb709256cd591119edc2809b4fcac7cb8eb6c Author: Alan Cox Date: Wed Mar 7 16:13:07 2007 +0000 ata_piix: Remove ugly layering violation A while ago I modified the libata code so that drivers can return -ENOENT for unknown ports not fiddle with the EH flags and print stuff directly. Somewhere along the line ata_piix didn't get fully converted. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0feba829ee82a6e43baabe3f0bdf91bd937a67a1 Author: Artem Bityutskiy Date: Thu Mar 8 10:35:10 2007 +0200 [JFFS2] print a message when marking bad block New bad eraseblock is an event which is important enough to be printed about. Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 8960909ca71da6120cad2fd7ece7dbe32ae05b40 Author: Ralf Baechle Date: Thu Mar 8 17:36:13 2007 +0000 [MIPS] DEC: Remove call to register_prom_console. Register_prom_console was removed when mips was converted to early printk. Signed-off-by: Ralf Baechle commit c7258a4477b5ed0243c28ec107b98bb946757448 Author: David Woodhouse Date: Fri Mar 9 11:44:00 2007 +0000 [JFFS2] Check for all-zero node headers Due to a poor choice of CRC32 seed, a node header which is all zeroes would pass the CRC32 check. Explicitly check for this case, and treat it as we do a CRC failure. Signed-off-by: David Woodhouse commit 470bc844361b238bcbe6a07ba47d51fca25f2742 Author: Kyungmin Park Date: Fri Mar 9 10:08:11 2007 +0900 [MTD] [OneNAND] Classify the page data and oob buffer Classify the page data and oob buffer and it prevents the memory fragementation (writesize + oobsize) Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit 5bc399e9ef430efd5725b66aa2ad7ad2d81e372b Author: Kyungmin Park Date: Fri Mar 9 09:41:07 2007 +0900 [MTD] [OneNAND] Exit the loop when transferring/filling of the oob is finished When transferring/filling of the oob is finished in OOB_AUTO, we exit the loop Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit 81280d5879761f90b3a341d52371d03998730d8e Author: Adrian Hunter Date: Thu Feb 15 09:47:29 2007 +0900 [MTD] [OneNAND] add Nokia Copyright and a credit add Nokia Copyright and a credit Signed-off-by: Adrian Hunter Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit e3da8067b3ef16943c02b64baa84dacca1e423be Author: Kyungmin Park Date: Thu Feb 15 09:36:39 2007 +0900 [MTD] [OneNAND] Fix typo & wrong comments Fix typo & wrong comments Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit 91014e9bfaaac32ab46ab46251d774468891bafe Author: Kyungmin Park Date: Mon Feb 12 10:34:39 2007 +0900 [MTD] [OneNAND] Use oob buffer instead of main one in oob functions In oob functions, it is used main buffer instead of oob one. So fix it. Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit d0035aef390194df1433f436038416d2c5b0fc0e Author: Dave Jones Date: Thu Mar 8 23:47:35 2007 -0500 [PATCH] build fix for i386 earlyquirk.c missing close bracket. Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit a55028ff74356895a50359dd9fb74d523b66723f Author: Dave Jones Date: Thu Mar 8 19:45:26 2007 -0500 [PATCH] update 'getting sparse' info. - point to the sparse webpage - use git:// instead of rsync:// Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit fe69933652562f093ccde600cecf234930c01932 Author: Len Brown Date: Thu Mar 8 18:28:32 2007 -0500 [PATCH] ACPI: repair nvidia early quirk breakage on x86_64 x86_64 nvidia_bugs() broke when we bailed out on not finding the HPET. However, the quirk works by checking for _not_ finding the HPET... Delete the nvidia_hpet_detected flag and simply test for not finding the HPET, which is simple to do now that acpi_table_parse returns 1 on failure. Signed-off-by: Len Brown Signed-off-by: Linus Torvalds commit eb9c4f2ef7150ea2144b53811d1cf555d8e27f69 Merge: c5bfdb7... 55c9add... Author: Linus Torvalds Date: Thu Mar 8 16:04:11 2007 -0800 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IPoIB: Turn on interface's carrier after broadcast group is joined RDMA/ucma: Avoid sending reject if backlog is full RDMA/cxgb3: Fix MR permission problems RDMA/cxgb3: Don't reuse skbs that are non-linear or cloned RDMA/cxgb3: Squelch logging AE errors RDMA/cxgb3: Stop EP timer when MPA exchange is aborted by peer RDMA/cxgb3: Move QP to error on destroy if the state is IDLE RDMA/cxgb3: Fixes for "normal close" failures RDMA/cxgb3: Fix build on sparc64 RDMA/cma: Initialize rdma_bind_list in cma_alloc_any_port() RDMA/cxgb3: Don't use mm after it's freed in iwch_mmap() RDMA/cxgb3: Start ep timer on a MPA reject IB/mthca: Fix error path in mthca_alloc_memfree() IB/ehca: Fix sync between completion handler and destroy cq IPoIB: Only handle async events for one port commit c5bfdb7261f2c426c730b65ce59440e8de219fda Merge: 2ef5507... e2eb8d4... Author: Linus Torvalds Date: Thu Mar 8 15:09:57 2007 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [SCTP] ipv6: inconsistent lock state ipv6_add_addr/sctp_v6_copy_addrlist commit 2ef550790ac0d7bb0da1c6432f69f86f55ac1695 Author: David S. Miller Date: Thu Mar 8 14:48:36 2007 -0800 [SPARC64]: Fix PARPORT build (again). Need to provide {claim,release}_dma_lock() for this guy too. Signed-off-by: David S. Miller commit 55c9adde13dfc6b738e0f70c071a0622e52f35ed Author: Shirley Ma Date: Thu Mar 8 14:59:30 2007 -0800 IPoIB: Turn on interface's carrier after broadcast group is joined Do netif_carrier_on() right after the IPv4 broadcast multicast group is joined, rather than waiting for all of the initial set of multicast group joins to finish. This allows at least IPv4 traffic to limp along on broken fabrics where not all multicast groups can be joined. Signed-off-by: Shirley Ma Signed-off-by: Roland Dreier commit e2eb8d452827b8d1f73db384cd7c6482eac29478 Author: Jarek Poplawski Date: Thu Mar 8 14:43:41 2007 -0800 [SCTP] ipv6: inconsistent lock state ipv6_add_addr/sctp_v6_copy_addrlist lockdep found that dev->lock taken from softirq in ipv6_add_addr is also taken in sctp_v6_copy_addrlist with softirqs enabled, so lockup is possible. Noticed-by: Simon Arlott Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit ca4266359d0c1199af088447f209ab5bcc32a989 Author: Alan Cox Date: Thu Mar 8 23:13:50 2007 +0000 [PATCH] libata-acpi: Try and stop all the non PCI devices crashing For 2.6.20 it mostly used to just not work, for 2.6.21-rc it crashes, this seems to be down to luck (bad or good). The libata-acpi code needs to avoid doing PCI work on non-PCI devices. This is one hack although it's not pretty and perhaps there is a "right" way to check if a struct device * is PCI ? Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 908e0a8a265fe8057604a9a30aec3f0be7bb5ebb Author: Peter Zijlstra Date: Wed Mar 7 20:41:30 2007 -0800 [PATCH] ecryptfs: nested locking annotation ecryptfs uses a lock_parent() function, which I hope really locks the parents and is not abused Signed-off-by: Peter Zijlstra Cc: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f70c81d4ddb0d300abc252cb594198d3c797a5e1 Author: Pat Gefre Date: Wed Mar 7 20:41:29 2007 -0800 [PATCH] 2.6 Altix: console fix for CONFIG_DEBUG_SHIRQ usage The sn console driver was snagged by the use of CONFIG_DEBUG_SHIRQ! The request_irq() immediate call to the interrupt handler caused another attempt to lock the port lock - deadlock. This is a patch to fix that. Signed-off-by: Patrick Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44f5c4ced6ddee2f5f2e45fa45b93370245d85bd Author: Jeff Dike Date: Wed Mar 7 20:41:26 2007 -0800 [PATCH] uml: arch_prctl should set thread fs In my previous x86_64 thread fix, I forgot to initialize thread.arch.fs in arch_prctl. A process calling arch_prctl to set %fs would lose it on the next context switch. It also turns out that you can switch to a process which is in the process of exiting and which has lost its mm. In this case, it's worse than useless to try to call arch_prctl on the host process. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bebff6ca5871e07b665cdaf71028ea21eb0bf0e Author: suzuki Date: Wed Mar 7 20:41:24 2007 -0800 [PATCH] check_partition(): fix error check Fix inverted check introduced in 57881dd9df40b76dc7fc6a0d13fd75f337accb32 "Fix check_partition routines". Signed-off-by: Suzuki K P Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6dfb4fd7dd94429ef1d5233688aaed2a63f856b Author: Davide Libenzi Date: Wed Mar 7 20:41:21 2007 -0800 [PATCH] Add epoll compat_ code to fs/compat.c IA64 and ARM-OABI are currently using their own version of epoll compat_ code. An architecture needs epoll_event translation if alignof(u64) in 32 bit mode is different from alignof(u64) in 64 bit mode. If an architecture needs epoll_event translation, it must define struct compat_epoll_event in asm/compat.h and set CONFIG_HAVE_COMPAT_EPOLL_EVENT and use compat_sys_epoll_ctl and compat_sys_epoll_wait. All 64 bit architecture should use compat_sys_epoll_pwait. [sfr: restructure and move to fs/compat.c, remove MIPS version of compat_sys_epoll_pwait, use __put_user_unaligned] Signed-off-by: Stephen Rothwell Cc: David Woodhouse Cc: Russell King Cc: "Luck, Tony" Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b40df5743ee8aed8674edbbb77b8fd3c8c7a747f Author: Jiri Kosina Date: Wed Mar 7 20:41:18 2007 -0800 [PATCH] bluetooth: fix socket locking in hci_sock_dev_event() [Bluetooth] Fix socket locking in hci_sock_dev_event() hci_sock_dev_event() uses bh_lock_sock() to lock the socket lock. This is not deadlock-safe against locking of the same socket lock in l2cap_connect_cfm() from softirq context. In addition to that, hci_sock_dev_event() doesn't seem to be called from softirq context, so it is safe to use lock_sock()/release_sock() instead. The lockdep warning can be triggered on my T42p simply by switching the Bluetooth off by the keyboard button. ================================= [ INFO: inconsistent lock state ] 2.6.21-rc2 #4 --------------------------------- inconsistent {in-softirq-W} -> {softirq-on-W} usage. khubd/156 [HC0[0]:SC0[0]:HE1:SE1] takes: (slock-AF_BLUETOOTH){-+..}, at: [] hci_sock_dev_event+0xa8/0xc5 [bluetooth] {in-softirq-W} state was registered at: [] mark_lock+0x59/0x414 [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] __lock_acquire+0x3e5/0xb99 [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] lock_acquire+0x67/0x81 [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] _spin_lock+0x29/0x34 [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] hci_send_cmd+0x126/0x14f [bluetooth] [] hci_event_packet+0x729/0xebd [bluetooth] [] hci_rx_task+0x2a/0x20f [bluetooth] [] hci_rx_task+0x6c/0x20f [bluetooth] [] trace_hardirqs_on+0x10d/0x14e [] tasklet_action+0x3d/0x68 [] __do_softirq+0x41/0x92 [] do_softirq+0x27/0x3d [] do_IRQ+0x7b/0x8f [] common_interrupt+0x24/0x34 [] common_interrupt+0x2e/0x34 [] acpi_processor_idle+0x1b3/0x34a [] acpi_processor_idle+0x1b6/0x34a [] cpu_idle+0x39/0x4e [] start_kernel+0x372/0x37a [] unknown_bootoption+0x0/0x202 [] 0xffffffff Signed-off-by: Jiri Kosina Acked-by: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47c51dff4af25341c575e5089dbb92d61ac69cdf Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:17 2007 -0800 [PATCH] x86_64: fix 2.6.18 regression - PTRACE_OLDSETOPTIONS should be accepted Also PTRACE_OLDSETOPTIONS should be accepted, as done by kernel/ptrace.c and forced by binary compatibility. UML/32bit breaks because of this - since it is wise enough to use PTRACE_OLDSETOPTIONS to be binary compatible with 2.4 host kernels. Until 2.6.17 (commit f0f2d6536e3515b5b1b7ae97dc8f176860c8c2ce) we had: default: return sys_ptrace(request, pid, addr, data); Instead here we have: case PTRACE_GET_THREAD_AREA: case ...: return sys_ptrace(request, pid, addr, data); default: return -EINVAL; This change was a style change - when a case is added, it must be explicitly tested this way. In this case, not enough testing was done. Cc: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de7b37cd01f145dd3a3ca333fd631e58ec0bdbab Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:14 2007 -0800 [PATCH] um: fix errno usage Avoid reusing userspace errno twice - it can be cleared by libc code everywhere (in particular printk() does clear it in my setup). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f97869df672f7f05ce3e8672ca42792d6df852b Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:13 2007 -0800 [PATCH] uml: activate_fd: return ENOMEM only when appropriate Avoid returning ENOMEM in case of a duplicate IRQ - ENOMEM was saved into err earlier. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec0ac8ad33189f81324948ee5dc72d3e1dc64682 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:12 2007 -0800 [PATCH] um: fix confusion irq early reenabling Fix confusion about call context - comments and code are inconsistent and plain wrong, my fault. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b53378856f4ea43182d13658f7c2138971366148 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:11 2007 -0800 [PATCH] um: mark both consoles as CON_ANYTIME Since both UML consoles do not use percpu variables, they may be called when the cpu is still offline, and they may be marked CON_ANYTIME (this is documented in kernel/printk.c, grep for CON_ANYTIME to find mentions of this). Works well in testing done with lock debug enabled, should be safe but is not needed for next release. This would probably help also stderr_console.c, but this is yet to test. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ff1d36cf4b8b7dc4efbc83ac617a63020b1125d Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:10 2007 -0800 [PATCH] um: remove dead code about os_usr1_signal() and os_usr1_process() os_usr1_signal() is totally unused, os_usr1_process() is used only by TT mode. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83f4e8afc9a22eabb1c4cb771ffcb3af81734082 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:09 2007 -0800 [PATCH] um: fix a memory leak in the multicast driver Memory allocated by mcast_user_init must be freed in the matching mcast_remove. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6eb0be6d5cc1851deb6619e6f8b1bbd0a0dbab4 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:08 2007 -0800 [PATCH] uml: hostfs: make hostfs= option work as a jail, as intended. When a given host directory is specified to be mounted both in hostfs=path1 and with mount option -o path2, we should give access to path1/path2, but this does not happen. Fix that in the simpler way. Also, root_ino can be the empty string, since we use %s/%s as format. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bca271136f06514253aa28c24c04fc23b88e971e Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:07 2007 -0800 [PATCH] uml: hostfs: fix double free Fix double free in the error path - when name is assigned into root_inode we do not own it any more and we must not kfree() it - see patch for details. Thanks to William Stearns for the initial report. CC: William Stearns Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ce3c83a9c22f59937b86c80b478dfbffe54dbab Merge: eee8abe... 3ca5de6... Author: Linus Torvalds Date: Thu Mar 8 07:28:30 2007 -0800 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: i8042 - another attempt to fix AUX delivery checks commit 74641d75275936796d239f828b80cb030e9f9b0a Author: Adrian Hunter Date: Thu Mar 8 12:20:12 2007 +0200 [MTD] Correct partition failed erase address If an erase operation fails, the address at which the failure occurred is returned by the driver. The MTD partition must adjust this address (by subtracting the partition offset) before returning to the caller. This was not happening, which caused JFFS2 to mark the wrong block bad! Signed-off-by: Adrian Hunter Signed-off-by: David Woodhouse commit f8a922c7bb4d93bd84b7371a8e2571e667d2afb5 Author: David Woodhouse Date: Thu Mar 8 10:28:30 2007 +0000 [JFFS2] Use yield() between GC passes in background thread. The garbage collection thread is strictly an optimisation. Everything it does would also be done just-in-time in the context of something in userspace trying to access the file system. Sometimes, however, it's a pessimisation. Especially during early boot when it's checksumming nodes and scanning inodes which are shortly going to be pulled in by read_inode anyway. We end up building the rbtree of node coverage twice for the same inode. By switching to yield() instead of cond_resched() in the main loop, we observe boot times on the OLPC system going down from about 100 seconds to 60. Signed-off-by: David Woodhouse commit 89e2bf61da9d7664293a57100a419f8116252607 Author: Robert P. J. Day Date: Wed Mar 7 18:33:25 2007 -0500 [MTD] [NAND] Correct misspelled preprocessor variable. Replace the apparently misspelled preprocessor variable "MTD_NAND_DISKONCHIP_BBTWRITE" with the correct form "CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE". Signed-off-by: Robert P. J. Day Signed-off-by: David Woodhouse commit 99109a6dacfc314a51371d9c3212a55cd7c0c98c Author: Alan Cox Date: Wed Mar 7 16:36:01 2007 +0000 [MTD] [MAPS] dilnetpc: Fix printk warning The type of a resource could be 32 or 64bit depending upon platform or option so cast it explicitly. Signed-off-by: Alan Cox Signed-off-by: David Woodhouse commit 83d480917b1af3f8fcffa7a9c8775e0f2dd03395 Author: Vijay Sampath Date: Tue Mar 6 02:39:44 2007 -0800 [MTD] [NOR] Fix oops in cfi_amdstd_sync The files cfi_cmdset_0002.c and cfi_cmdset_0020.c do not initialize their wait queues like is done in cfi_cmdset_0001.c. This causes an oops when the wait queue is accessed. I have copied the code from cfi_cmdset_0001.c that is pertinent to initialization of the wait queue. Signed-off-by: Vijay Sampath Acked-by: Joern Engel Acked-by: Josh Boyer Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit dc164bbb4b5be9df4f249ab33576fa783c363b93 Author: Cyrill Gorcunov Date: Tue Mar 6 02:39:45 2007 -0800 [MTD] ESB2 check for closed ROM window Add checking for closed ROM window on Intel ESB2 Southbridge. Signed-off-by: Cyrill Gorcunov Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 180bfb31fef77815d56b875d4f28d353fdc87bf8 Author: Vitaly Wool Date: Tue Mar 6 17:01:04 2007 +0300 [JFFS2] Fix writebuffer recovery in the first page of a block For the case when nand_write_page fail with -EIO for the first page in an eraseblock, jffs2_wbuf_recover ends up producing a BUG in jffs2_block_refile as jeb->first_node is not yet set up (it's set up later in jffs2_wbuf_recover). This BUG is not really a bug; it's just jffs2_wbuf_recover calling jffs2_block_refile with the wrong second parameter. This patch takes care of this situation. Signed-off-by: Vitaly Wool Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse commit 1f92267c51a514f35ad5b0fd46cb099c0980b679 Author: Vitaly Wool Date: Tue Mar 6 16:56:34 2007 +0300 [MTD] [NAND] make oobavail public During the MTD rework the oobavail parameter of mtd_info structure has become private. This is not quite correct in terms of integrity and logic. If we have means to write to OOB area, then we'd like to know upfront how many bytes out of OOB are spare per page to be able to adapt to specific cases. The patch inlined adds the public oobavail parameter. Signed-off-by: Vitaly Wool Signed-off-by: David Woodhouse commit 3ca5de6dd4ec5a139b2b8f00dce3e4726ca91af1 Author: Dmitry Torokhov Date: Wed Mar 7 23:20:55 2007 -0500 Input: i8042 - another attempt to fix AUX delivery checks Do not assume that AUX_LOOP command is broken unless it completes successfully but returns wrong (unexpected) data. Signed-off-by: Dmitry Torokhov commit 7d9f3e85f45e8f636bdd7ce5f0b1704034380175 Author: Pavel Roskin Date: Mon Mar 5 19:28:00 2007 -0600 [PATCH] bcm43xx: Fix assertion failures in interrupt handler In the bcm43xx interrupt handler, sanity checks are wrongly done before the verification that the interrupt is for the bcm43xx. Signed-off-by: Pavel Roskin Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit d632f9fa38203ad5bac31e46921812216693b14f Author: Joerg Sommer Date: Fri Mar 2 12:32:06 2007 -0600 [PATCH] bcm43xx: Fix bug in frequency to channel conversion The frequency to channel routine in bcm43xx requires that the frequency be in MHz, but that condition is not always met. This patch does the necessary conversion. Signed-off-by: Joerg Sommer Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 01a597769c7ef4db979c6a23aa97e5d2e53cbc46 Author: Larry Finger Date: Wed Feb 28 14:54:39 2007 -0600 [PATCH] bcm43xx: Fix errors in specs to code translation in B6PHY init There are three errors in the transcription of the latest revision to the B6PHY init specifications. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit eee8abe5de9cbd936b51db292c8d3c406b0e79e7 Merge: 06aa5b4... de79059... Author: Linus Torvalds Date: Wed Mar 7 19:05:34 2007 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [BRIDGE]: adding new device to bridge should enable if up [IPV6]: Do not set IF_READY if device is down [IPSEC]: xfrm audit hook misplaced in pfkey_delete and xfrm_del_sa [IPSEC]: Add xfrm policy change auditing to pfkey_spdget [IPSEC]: xfrm_policy delete security check misplaced [CONNECTOR]: Bugfix for cn_call_callback() [DCCP]: Revert patch which disables bidirectional mode [IPV6]: Handle np->opt being NULL in ipv6_getsockopt_sticky(). [UDP]: Reread uh pointer after pskb_trim [NETFILTER]: nfnetlink_log: fix crash on bridged packet [NETFILTER]: nfnetlink_log: zero-terminate prefix [NETFILTER]: nf_conntrack_ipv6: fix incorrect classification of IPv6 fragments as ESTABLISHED commit 06aa5b4aae223ea4d623dc68e85466174bb92c84 Merge: c91a325... b2e569d... Author: Linus Torvalds Date: Wed Mar 7 19:04:21 2007 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] ARC: Fix several compiler warnings. [MIPS] ISA: Fix typo [CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl. commit c91a32503d9ff8079cc45fa743d428fd705042dd Merge: 4559214... 3bc207d... Author: Linus Torvalds Date: Wed Mar 7 19:03:51 2007 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fsys_getcpu for IA64 [IA64] remove duplicate declaration of efi_initialize_iomem_resources [IA64] Pick highest possible saved_max_pfn for crash_dump [IA64] fix NULL pointer in ia64/irq_chip-mask/unmask function commit b2e569d876e153365b01525a102b7d90bb309446 Author: Ralf Baechle Date: Thu Mar 8 00:47:11 2007 +0000 [MIPS] ARC: Fix several compiler warnings. CC arch/mips/arc/init.o arch/mips/arc/init.c: In function 'prom_init': arch/mips/arc/init.c:27: warning: ISO C90 forbids mixed declarations and code arch/mips/arc/init.c:35: warning: format ‘%08lx’ expects type ‘long unsigned int’, but argument 2 has type 'ULONG' arch/mips/arc/init.c:28: warning: unused variable 'c' arch/mips/arc/init.c:27: warning: unused variable ‘cnt’ Signed-off-by: Ralf Baechle commit 012390517e3e6734d381ff81c4a7e9817636e2f1 Author: Ralf Baechle Date: Thu Mar 8 00:45:26 2007 +0000 [MIPS] ISA: Fix typo Lost CONFIG_ prefix discovered by Robert P. J. Day . Signed-off-by: Ralf Baechle commit b35692ebdef0c1cd4a05a58559a94ced54ff9c82 Author: Ralf Baechle Date: Thu Mar 8 00:14:25 2007 +0000 [CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl. o Fix use of uninitialized variable sec. o Make the RTC_ALM_SET ioctl return -EINVAL for non-zero seconds - the DS1286 has no second field for the alarm time. o Replace the obscure BIN_TO_BCD macro with BIN2BCD. Signed-off-by: Ralf Baechle commit 3bc207d2b72ea0e6927cccc653c2dc8be593f89f Author: Fenghua Yu Date: Mon Feb 12 16:27:10 2007 -0800 [IA64] fsys_getcpu for IA64 On 1.6GHz Montectio Tiger4, the following performance data is measured with kernel built with defconfig which has NUMA configured: Fastest sys_getcpu: 502 itc counts. Fastest fsys_getcpu: 28 itc counts. fsys_getcpu performance is largly impacted by whether data (node_to_cpu_map etc) is in cache. It can take fsys_getcpu up to ~150 itc counts in cold cache case. Signed-off-by: Fenghua Yu Signed-off-by: Tony Luck commit ddbad076303dfc0ed4fcba53907dc175bb6d67b2 Author: Horms Date: Tue Mar 6 16:20:10 2007 +0900 [IA64] remove duplicate declaration of efi_initialize_iomem_resources efi_initialize_iomem_resources() is declared in both include/linux/efi.h and arch/ia64/kernel/setup.c. This patch removes the latter. Signed-off-by: Simon Horman Signed-off-by: Tony Luck commit e55fdf11f3029bcd41b1b9547ad9db12c27eea76 Author: Tony Luck Date: Wed Mar 7 16:13:25 2007 -0800 [IA64] Pick highest possible saved_max_pfn for crash_dump Berhhard Walle noted that on his HP rx8640 he ended up with saved_max_pfn smaller than the highest address of system ram in /proc/iomem and proposed a patch to base the address on the unrounded and unfiltered EFI memory map address. Simon Horman and Magnus Damm suggested that the whole test be moved earlier in the function. This is the combination of both of these patches. Signed-off-by: Tony Luck commit de79059ecd7cd650f3788ece978a64586921d1f1 Author: Aji Srinivas Date: Wed Mar 7 16:10:53 2007 -0800 [BRIDGE]: adding new device to bridge should enable if up One change introduced by the workqueue removal patch is that adding an interface that is up to a bridge which is also up does not ever call br_stp_enable_port(), leaving the port in DISABLED state until we do ifconfig down and up or link events occur. The following patch to the br_add_if function fixes it. This is a regression introduced in 2.6.21. Submitted-by: Aji_Srinivas@emc.com Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c7ababbdc647e67e953d153ddf62cbdc9fe3297e Author: Herbert Xu Date: Wed Mar 7 16:02:40 2007 -0800 [IPV6]: Do not set IF_READY if device is down Now that we add the IPv6 device at registration time we don't need to set IF_READY in ipv6_add_dev anymore because we will always get a NETDEV_UP event later on should the device ever become ready. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 16bec31db751030171b31d7767fa3a5bdbe980ea Author: Eric Paris Date: Wed Mar 7 16:02:16 2007 -0800 [IPSEC]: xfrm audit hook misplaced in pfkey_delete and xfrm_del_sa Inside pfkey_delete and xfrm_del_sa the audit hooks were not called if there was any permission/security failures in attempting to do the del operation (such as permission denied from security_xfrm_state_delete). This patch moves the audit hook to the exit path such that all failures (and successes) will actually get audited. Signed-off-by: Eric Paris Acked-by: Venkat Yekkirala Acked-by: James Morris Signed-off-by: David S. Miller commit 215a2dd3b43e0dc425e81d21de9d961416b1dad4 Author: Eric Paris Date: Wed Mar 7 16:01:45 2007 -0800 [IPSEC]: Add xfrm policy change auditing to pfkey_spdget pfkey_spdget neither had an LSM security hook nor auditing for the removal of xfrm_policy structs. The security hook was added when it was moved into xfrm_policy_byid instead of the callers to that function by my earlier patch and this patch adds the auditing hooks as well. Signed-off-by: Eric Paris Acked-by: Venkat Yekkirala Acked-by: James Morris Signed-off-by: David S. Miller commit ef41aaa0b755f479012341ac11db9ca5b8928d98 Author: Eric Paris Date: Wed Mar 7 15:37:58 2007 -0800 [IPSEC]: xfrm_policy delete security check misplaced The security hooks to check permissions to remove an xfrm_policy were actually done after the policy was removed. Since the unlinking and deletion are done in xfrm_policy_by* functions this moves the hooks inside those 2 functions. There we have all the information needed to do the security check and it can be done before the deletion. Since auditing requires the result of that security check err has to be passed back and forth from the xfrm_policy_by* functions. This patch also fixes a bug where a deletion that failed the security check could cause improper accounting on the xfrm_policy (xfrm_get_policy didn't have a put on the exit path for the hold taken by xfrm_policy_by*) It also fixes the return code when no policy is found in xfrm_add_pol_expire. In old code (at least back in the 2.6.18 days) err wasn't used before the return when no policy is found and so the initialization would cause err to be ENOENT. But since err has since been used above when we don't get a policy back from the xfrm_policy_by* function we would always return 0 instead of the intended ENOENT. Also fixed some white space damage in the same area. Signed-off-by: Eric Paris Acked-by: Venkat Yekkirala Acked-by: James Morris Signed-off-by: David S. Miller commit 05e52dd7396514648fba6c275eb7b49eca333c6d Author: Philipp Reisner Date: Wed Mar 7 12:55:39 2007 -0800 [CONNECTOR]: Bugfix for cn_call_callback() When system under heavy stress and must allocate new work instead of reusing old one, new work must use correct completion callback. Patch is based on Philipp's and Lars' work. I only cleaned small stuff (and removed spaces instead of tabs). Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit 151a99317ee9efcfd3e642da62e1edf4f47fcb3e Author: Gerrit Renker Date: Wed Mar 7 12:53:48 2007 -0800 [DCCP]: Revert patch which disables bidirectional mode This reverts an earlier patch which disabled bidirectional mode, meaning that a listening (passive) socket was not allowed to write to the other (active) end of the connection. This mode had been disabled when there were problems with CCID3, but it imposes a constraint on socket programming and thus hinders deployment. A change is included to ignore RX feedback received by the TX CCID3 module. Many thanks to Andre Noll for pointing out this issue. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 286930797d74b2c9a5beae84836044f6a836235f Author: David S. Miller Date: Wed Mar 7 12:50:46 2007 -0800 [IPV6]: Handle np->opt being NULL in ipv6_getsockopt_sticky(). Signed-off-by: David S. Miller commit d644329bc9f10213a282387dfe4984ff891dd768 Author: Herbert Xu Date: Tue Mar 6 20:26:48 2007 -0800 [UDP]: Reread uh pointer after pskb_trim The header may have moved when trimming. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit ba5dcee128d9f2877a6d2a5b150c24d90d77dad1 Author: Patrick McHardy Date: Tue Mar 6 20:24:53 2007 -0800 [NETFILTER]: nfnetlink_log: fix crash on bridged packet physoutdev is only set on purely bridged packet, when nfnetlink_log is used in the OUTPUT/FORWARD/POSTROUTING hooks on packets forwarded from or to a bridge it crashes when trying to dereference skb->nf_bridge->physoutdev. Reported by Holger Eitzenberger Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 881dbfe8accc9434dd0d7d052505e3dca6ad9b3c Author: Patrick McHardy Date: Tue Mar 6 20:24:35 2007 -0800 [NETFILTER]: nfnetlink_log: zero-terminate prefix Userspace expects a zero-terminated string, so include the trailing zero in the netlink message. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit dd63006b8fb5abf2336e145632610c6175a28fea Author: Patrick McHardy Date: Tue Mar 6 20:24:18 2007 -0800 [NETFILTER]: nf_conntrack_ipv6: fix incorrect classification of IPv6 fragments as ESTABLISHED The individual fragments of a packet reassembled by conntrack have the conntrack reference from the reassembled packet attached, but nfctinfo is not copied. This leaves it initialized to 0, which unfortunately is the value of IP_CT_ESTABLISHED. The result is that all IPv6 fragments are tracked as ESTABLISHED, allowing them to bypass a usual ruleset which accepts ESTABLISHED packets early. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e253eb0c082e71082cc980a0c81582c2bc734605 Author: KAMEZAWA Hiroyuki Date: Wed Mar 7 14:57:35 2007 -0800 [IA64] fix NULL pointer in ia64/irq_chip-mask/unmask function This patch fixes boot failure because irq_desc->mask() is NULL. - Added mask/unmask functions to ia64's irq desc function table. - rename hw_interrupt_type to irq_chip. hw_interrupt_type is old name. - Tony: Added same change to arch/ia64/sn/kernel/irq.c as pointed out by Eric Biederman ... mask/unmask functions there can be no-op. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 455921451a176d90c5cfef898f061bb6fc83faaf Merge: 0782588... a9e28d9... Author: Linus Torvalds Date: Wed Mar 7 11:27:53 2007 -0800 Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 * 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32: avr32: dma-mapping.h [AVR32] Don't use kmap() in flush_icache_page() [AVR32] Fix bogus ti->flags manipulation in debug handler [AVR32] Fix typo in include/asm-avr32/Kbuild [AVR32] show_trace: Only walk valid stack addresses [AVR32] at32_spi_setup_slaves should be __init commit 0782588b63d0a4307fd277b35c449a17bc59ccc0 Merge: d694c16... c3f49bc... Author: Linus Torvalds Date: Wed Mar 7 10:09:12 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed [GFS2] build fix [GFS2] go_drop_bh is never used, so remove it [GFS2] Remove unused variable [GFS2] Fix bz 229831, lookup returns wrong inode [GFS2] Fix bz 230143, incorrect flushing of rgrps [GFS2] pass formal ino in do_filldir_main [DLM] fs/dlm/user.c should #include "user.h" [GFS2] fix hangup when multiple processes are trying to write to the same file [GFS2] NFS filehandle check [GFS2] add newline to printk message [GFS2] fix locking mistake commit c3f49bc209b28d2b5f82b78baaa827eb3a4d1891 Author: Steven Whitehouse Date: Wed Mar 7 09:06:48 2007 +0000 [GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed The following removes an incorrect assertion from the GFS2 glops code. This fixes Red Hat bz 229873. Thanks to Abhijith Das for testing the patch and confirming the fix. Signed-off-by: Steven Whitehouse Cc: Abhijith Das commit 95d97b7dd7d7a7a13d11a38b3ecb64849d2e5086 Author: akpm@linux-foundation.org Date: Mon Mar 5 23:10:39 2007 -0800 [GFS2] build fix fs/gfs2/glock.c:2198: error: 'THIS_MODULE' undeclared here (not in a function) Cc: Steven Whitehouse Signed-off-by: Andrew Morton commit 631c42e170564108423fa4073531db159f2523ea Author: Steven Whitehouse Date: Thu Mar 1 10:36:32 2007 +0000 [GFS2] go_drop_bh is never used, so remove it The ->go_drop_bh function is never used, so this removes it and the single caller, Signed-off-by: Steven Whitehouse commit 04b159b132c0d8e92dae8c72f134fd5b13b43deb Author: Steven Whitehouse Date: Thu Mar 1 11:14:44 2007 +0000 [GFS2] Remove unused variable Remove an unused variable. Signed-off-by: Steven Whitehouse commit 1be3867955731b5cb2dc14060cc46f0882e87873 Author: Steven Whitehouse Date: Thu Mar 1 10:00:53 2007 +0000 [GFS2] Fix bz 229831, lookup returns wrong inode The following patch fixes Red Hat bz 229831. Without this patch its possible for the wrong inode to be returned in certain cases. It is a pretty unusual event, so that its taken some time to track down. Thanks and due to Josef Whiter who did a lot of the testing required to thrack this down and fix it. Signed-off-by: Steven Whitehouse commit cad5b9392754910ee7dbe551eb004010a864c882 Author: Steven Whitehouse Date: Wed Feb 28 14:03:00 2007 +0000 [GFS2] Fix bz 230143, incorrect flushing of rgrps The below patch fixes a problem where we were not flushing rgrps correctly. It only occurred in the specific case that a callback was received for an rgrp which was dirty and when a journal log flush had not already resulted in the rgrp being flushed anyway. This fixes Red Hat bz 230143, Signed-off-by: Steven Whitehouse commit fb0d3bce8e88cca4abb26076f778f64edcaf19aa Author: Wendy Cheng Date: Wed Feb 28 11:24:25 2007 -0500 [GFS2] pass formal ino in do_filldir_main ok, the following is the minimum changes to get NFSD going before we settle down this issue .. would appreciate this in the tree so other NFS related works can get done in parallel. Signed-off-by: S. Wendy Cheng Signed-off-by: Steven Whitehouse commit 84c6e8cd359adc34d21e40efcafe09297510b3c8 Author: Adrian Bunk Date: Mon Feb 26 00:18:42 2007 +0100 [DLM] fs/dlm/user.c should #include "user.h" Every file should include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit a13cbe375303585fec1425135ed54adb62be41fc Author: Josef Whiter Date: Fri Feb 23 12:49:51 2007 -0500 [GFS2] fix hangup when multiple processes are trying to write to the same file This fixes a problem I encountered while running bonnie++. When you have one thread that opens a file and starts to write to it, and then another thread that tries to open and write to the same file, the second thread will loop forever trying to grab the inode lock for that inode. Basically we come in through generic_buffered_file_write, which calls gfs2_prepare_write, which then attempts to grab the glock. Because we don't own the lock, gfs2_prepare_write gets GLR_TRYFAILED, which returns AOP_TRUNCATED_PAGE to generic_buffered_file_write. At this point generic_buffered_file_write loops around again and immediately retries the prepare_write. This means that the second process never gets off of the processor in order to allow the process that holds the lock to finish its work and let go of the lock. This patch makes gfs2_glock_nq schedule() if it gets back a GLR_TRYFAILED, which resolves this problem. Signed-off-by: Josef Whiter Signed-off-by: Steven Whitehouse commit a7d2b2bdc9a0b55d5b08e15756c7e65c48c4bca5 Author: Wendy Cheng Date: Fri Feb 23 00:21:17 2007 -0500 [GFS2] NFS filehandle check File handle checking error found in '07 NFS connectathon. The fh_type and fh_len are not necessarily identical. Some of the client machines could fail mount with stale filehandle without this patch. Signed-off-by: S. Wendy Cheng Signed-off-by: Steven Whitehouse commit d5a6751b32c79680da90eaa76919ffe6e5b8a94f Author: Richard Fearn Date: Sat Feb 17 17:29:15 2007 +0000 [GFS2] add newline to printk message Patch for the 2.6.20 stable tree that adds a missing newline to one of the printk messages in fs/gfs2/ops_fstype.c. Signed-off-by: Richard Fearn Signed-off-by: Steven Whitehouse commit 2e95b6653bb69c893e6ee1b42b537939c1ea2b9c Author: Josef Whiter Date: Tue Feb 20 00:03:29 2007 -0500 [GFS2] fix locking mistake This patch fixes a locking mistake in the quota code, we do a mutex_lock instead of a mutex_unlock. Signed-off-by: Josef Whiter Signed-off-by: Steven Whitehouse commit d694c16bc332c7e706f44e3d10bea06228166a6f Merge: d04f41e... ccd45ad... Author: Linus Torvalds Date: Wed Mar 7 10:08:33 2007 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Kill off I/O cruft for R7780RP. sh: Revert lazy dcache writeback changes. sh: Enable SM501 support for RTS7751R2D. sh: Use L1_CACHE_BYTES for .data.cacheline_aligned. sysctl: Support vdso_enabled sysctl on SH. sh: Fix kernel thread stack corruption with preempt. doc: Add SH to vdso and earlyprintk in kernel-parameters.txt sh: Fix sigmask trampling in signal delivery. sh: Clear UBC when not in use. commit d04f41e35343f1d788551fd3f753f51794f4afcf Author: Ingo Molnar Date: Wed Mar 7 18:12:31 2007 +0100 [PATCH] CPU hotplug: call check_tsc_sync_source() with irqs off check_tsc_sync_source() depends on being called with irqs disabled (it checks whether the TSC is coherent across two specific CPUs). This is incidentally true during bootup, but not during cpu hotplug __cpu_up(). This got found via smp_processor_id() debugging. disable irqs explicitly and remove the unconditional enabling of interrupts. Add touch_nmi_watchdog() to the cpu_online_map busy loop. this bug is present both on i386 and on x86_64. Reported-by: Michal Piotrowski Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit a9e28d9b0b269a68a19e4ff0f6b9473f86b01358 Author: Gary Zambrano Date: Fri Mar 2 16:57:46 2007 -0800 avr32: dma-mapping.h Added dma_sync_single_range_for_cpu/device to dma-mapping.h in asm-avr32 to call dma_sync_single_for_cpu/device. This patch enables b44 to compile on systems with these cpus. This patch was created with the assumption that another method of dma_sync_single_range_for_cpu/device does not exist on these architectures. Signed-off by: Gary Zambrano Signed-off-by: Andrew Morton Signed-off-by: Haavard Skinnemoen commit 28c1d39db83357bad55e3482fe09386429728ded Author: Haavard Skinnemoen Date: Thu Mar 1 16:32:31 2007 +0100 [AVR32] Don't use kmap() in flush_icache_page() flush_icache_page() can be called from atomic context, so we can't use kmap(). Use page_address() instead. Signed-off-by: Haavard Skinnemoen commit a19b4a14053f24e2df93b6bcc72ed1086cce0de4 Author: Haavard Skinnemoen Date: Thu Mar 1 10:37:35 2007 +0100 [AVR32] Fix bogus ti->flags manipulation in debug handler We should OR in a bitmask, not a bit offset, into ti->flags. This might fix some strange behaviour when single stepping. Also, use set_ti_thread_flag() to manipulate the flags to avoid surprises in the future. Signed-off-by: Haavard Skinnemoen commit bfa4f55cc8d17e3944a4b5d08e2cce7d5a55a2d6 Author: Haavard Skinnemoen Date: Thu Feb 22 18:58:18 2007 +0100 [AVR32] Fix typo in include/asm-avr32/Kbuild It's header-y, not headers-y. Signed-off-by: Haavard Skinnemoen commit 3338368e922a6686a3b3d6f4da07babd224788d4 Author: Haavard Skinnemoen Date: Wed Feb 21 13:08:06 2007 +0100 [AVR32] show_trace: Only walk valid stack addresses Terminate the frame pointer walk if (a) the address is outside the task's kernel stack or (b) if the frame pointer isn't monotonically increasing. Without this fix, show_trace() may enter an infinite loop, walking through random data anywhere in memory. Since any address within the kernel stack is guaranteed to be valid, we may eliminate the __get_user() calls as well. Signed-off-by: Haavard Skinnemoen commit 9a596a6236e1b4d6c2e6105bd85eac19c9f4ec4c Author: Haavard Skinnemoen Date: Mon Feb 19 10:38:04 2007 +0100 [AVR32] at32_spi_setup_slaves should be __init Signed-off-by: Haavard Skinnemoen commit 3492856e33da734501f2bdd8656cbfdf61f60330 Author: Sean Hefty Date: Tue Mar 6 11:58:32 2007 -0800 RDMA/ucma: Avoid sending reject if backlog is full Change the returned error code to ENOMEM if the connection event backlog is full. This prevents the ib_cm from issuing a reject on the connection, which can allow retries to succeed. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit e64518f3736971f22d5c22a6bab40891d2db337f Author: Steve Wise Date: Tue Mar 6 14:44:07 2007 -0600 RDMA/cxgb3: Fix MR permission problems Fix memory region permission problems: - remove useless and redundant iwch_mem_perms enum. - create ib_to_tpt_access_rights() for mapping ib access rights to T3 TPT permissions. - create ib_to_mwbind_access_rights() for mapping ib access rights to T3 MWBIND WR permissions. - fix up the mem reg code to utilize the new functions. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 1f6a849b7ce6c3007088cd437dfc2b9c7cb5d21e Author: Steve Wise Date: Tue Mar 6 14:44:05 2007 -0600 RDMA/cxgb3: Don't reuse skbs that are non-linear or cloned Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 8cfccf02bb63b9733e852d475a8be58baaefef8a Author: Steve Wise Date: Tue Mar 6 14:44:03 2007 -0600 RDMA/cxgb3: Squelch logging AE errors Only print one AE error for a given connection in the kernel log. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit adf376b3708f6111e87916fae083633c1be2f88f Author: Steve Wise Date: Tue Mar 6 14:44:01 2007 -0600 RDMA/cxgb3: Stop EP timer when MPA exchange is aborted by peer Stop the endpoint timer when the MPA exchange is aborted by the peer. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 2df50da00e679439aca08a59cd0b4db484159540 Author: Steve Wise Date: Tue Mar 6 14:43:58 2007 -0600 RDMA/cxgb3: Move QP to error on destroy if the state is IDLE Change iwch_destroy_qp() to always move the QP to ERROR and let iwch_modify_qp() decide what to do. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 42e31753546d2186d4a675e7d00daa02ea7c8e85 Author: Steve Wise Date: Tue Mar 6 14:43:56 2007 -0600 RDMA/cxgb3: Fixes for "normal close" failures Fixes for "normal close" failures: - Start normal close timer when moving to CLOSING state. - Handle ABORTING state in close_con_rpl(). - Stop timer correctly on abort during a normal close. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit c3bb1092c80fa2b9117cb0382d136a409496a07f Author: David Miller Date: Mon Mar 5 15:21:29 2007 -0800 RDMA/cxgb3: Fix build on sparc64 cxgb3 uses dma_alloc_coherent() et al. thus needs linux/dma-mapping.h include in order to build reliably. Noticed on sparc64. Signed-off-by: David S. Miller Acked-by: Steve Wise Signed-off-by: Roland Dreier commit cb164b8c6a2bdf995c938e5f157d41465b18e5c3 Author: Sean Hefty Date: Mon Mar 5 12:50:17 2007 -0800 RDMA/cma: Initialize rdma_bind_list in cma_alloc_any_port() The struct rdma_bind_list fields for hlist are not being initialized, resulting in a corrupted list. Fix this by using kzalloc() to make sure all pointers are NULL. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit aeb100e2466b11e6087ee6f467b712e119213158 Author: Steve Wise Date: Fri Mar 2 16:06:36 2007 -0600 RDMA/cxgb3: Don't use mm after it's freed in iwch_mmap() Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 7d526e6b2c5d6bba70fdc1fc2943bdaf9cc6147d Author: Steve Wise Date: Mon Mar 5 17:32:46 2007 -0600 RDMA/cxgb3: Start ep timer on a MPA reject If the consumer rejects the connection we end up under-referencing the endpoint structure. The fix is to call iwch_ep_disconnect() instead of the low level disconnect functions so that the endpoint close timer is started correctly. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit ccd45ad405bcb1504bd923bd0487902374c942c8 Author: Paul Mundt Date: Mon Mar 5 20:19:57 2007 +0900 sh: Kill off I/O cruft for R7780RP. We don't have any use for these machvec fixups anymore, kill them all off and go with the generic instead. Signed-off-by: Paul Mundt commit 39e688a94b94eaba768b1494e19e96f828fc2688 Author: Paul Mundt Date: Mon Mar 5 19:46:47 2007 +0900 sh: Revert lazy dcache writeback changes. These ended up causing too many problems on older parts, revert for now.. Signed-off-by: Paul Mundt commit c87a7111349891043cb0a62b0ba745264d4b600a Author: Paul Mundt Date: Thu Mar 1 18:47:08 2007 +0900 sh: Enable SM501 support for RTS7751R2D. This enables the SM501 drivers for the R2D board. Additional work needs to be done to migrate off of the VoyagerGX cchip code to make use of the rest of the mfd infrastructure. Signed-off-by: Paul Mundt commit 87e29cacb7d09c81b09224bec395f970df958af4 Author: Paul Mundt Date: Thu Mar 1 15:56:31 2007 +0900 sh: Use L1_CACHE_BYTES for .data.cacheline_aligned. Previously this was using a hardcoded 32, use L1_CACHE_BYTES for cacheline alignment instead. Signed-off-by: Paul Mundt commit 5c36e6578d81f79ede871d3e66a0d6beeffeb3dc Author: Paul Mundt Date: Thu Mar 1 10:07:42 2007 +0900 sysctl: Support vdso_enabled sysctl on SH. All of the logic for this was already in place, we just hadn't wired it up in the sysctl table. Signed-off-by: Paul Mundt commit e6bcf562e58662b9765748d346e4c076b20e3aa5 Author: Hideo Saito Date: Wed Feb 28 18:35:42 2007 +0900 sh: Fix kernel thread stack corruption with preempt. When I run a preemptive kernel-2.6.20 for SH7780, a created kthread(pdflush) can not exit by do_exit() in kernel_thread_helper. I think that the created kthread should have a room for 'struct pt_regs' space on the stack top, because __switch_to() will refer to the space as follows using 'regs = task_pt_regs(prev)' and next condition may be true. Signed-off-by: Hideo Saito Signed-off-by: Paul Mundt commit e523d93c8487667552dd29ff756d6ea6bce30851 Author: Paul Mundt Date: Wed Feb 28 18:30:01 2007 +0900 doc: Add SH to vdso and earlyprintk in kernel-parameters.txt SH supports both of these options, add it to the docs. Signed-off-by: Paul Mundt commit c8bfa1fdc84af7b5e3c7f825a9f0bc6e8a19f5d5 Author: Ryusuke Sakato Date: Fri Feb 23 13:22:56 2007 +0900 sh: Fix sigmask trampling in signal delivery. There was a missing return in do_signal() that caused the saved sigmask to be written back after having successfully delivered the signal. Signed-off-by: Ryusuke Sakato Signed-off-by: Paul Mundt commit 9432f96803139adaff0cd9f4fa38b7fb99cda366 Author: Stuart Menefy Date: Fri Feb 23 13:22:17 2007 +0900 sh: Clear UBC when not in use. This takes care of tearing down the UBC so it's not inadvertently left configured at the next context switch time. Failure to do this results in spurious SIGTRAPs in certain debug sequences. Signed-off-by: Stuart Menefy Signed-off-by: Paul Mundt commit 88171cfed5810a2354eb1977883589a05ce8d304 Author: Roland Dreier Date: Thu Mar 1 13:17:14 2007 -0800 IB/mthca: Fix error path in mthca_alloc_memfree() The garbled logic in mthca_alloc_memfree() causes it to return 0, even if it fails to allocate all doorbell records. Fix it to return -ENOMEM when it fails. Signed-off-by: Roland Dreier commit 31726798bd8fbef6244b28cf962f4a4c45793dea Author: Hoang-Nam Nguyen Date: Wed Feb 28 18:01:02 2007 +0100 IB/ehca: Fix sync between completion handler and destroy cq This patch fixes two issues reported by Roland Dreier and Christoph Hellwig: - Mismatched sync/locking between completion handler and destroy cq We introduced a counter nr_events per cq to track number of irq events seen. This counter is incremented when an event queue entry is seen and decremented after completion handler has been called regardless if scaling code is active or not. Note that nr_callbacks tracks number of events assigned to a cpu and both counters can potentially diverge. The sync between running completion handler and destroy cq is done by using the global spin lock ehca_cq_idr_lock. - Replace yield by wait_event on the counter above to become zero. Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit a27cbe878203076247c1b5287f5ab59ed143b560 Author: Roland Dreier Date: Tue Feb 27 07:37:49 2007 -0800 IPoIB: Only handle async events for one port An asynchronous event carries the port number that the event occurred on, so there's no reason for an IPoIB interface to process an event associated with a different local HCA port. Signed-off-by: Roland Dreier