commit e3c0ac04f980750a368f7cd5f1b8d1d2cdc1f735 Merge: 943547a... 6f4a7f4... Author: Linus Torvalds Date: Tue Dec 4 12:21:11 2007 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: PHY: Add the phy_device_release device method. gianfar: fix compile warning pasemi_mac: Fix reuse of free'd skb SMC911X: Fix using of dereferenced skb after netif_rx sky2: recovery deadlock fix Fix memory corruption in fec_mpc52xx Don't claim to do IPv6 checksum offload cxgb - revert file mode changes. commit 6f4a7f4183bdbd02741dcd8edbd10b8628acc5d5 Author: Anton Vorontsov Date: Tue Dec 4 16:17:33 2007 +0300 PHY: Add the phy_device_release device method. Lately I've got this nice badness on mdio bus removal: Device 'e0103120:06' does not have a release() function, it is broken and must be fixed. ------------[ cut here ]------------ Badness at drivers/base/core.c:107 NIP: c015c1a8 LR: c015c1a8 CTR: c0157488 REGS: c34bdcf0 TRAP: 0700 Not tainted (2.6.23-rc5-g9ebadfbb-dirty) MSR: 00029032 CR: 24088422 XER: 00000000 ... [c34bdda0] [c015c1a8] device_release+0x78/0x80 (unreliable) [c34bddb0] [c01354cc] kobject_cleanup+0x80/0xbc [c34bddd0] [c01365f0] kref_put+0x54/0x6c [c34bdde0] [c013543c] kobject_put+0x24/0x34 [c34bddf0] [c015c384] put_device+0x1c/0x2c [c34bde00] [c0180e84] mdiobus_unregister+0x2c/0x58 ... Though actually there is nothing broken, it just device subsystem core expects another "pattern" of resource managment. This patch implement phy device's release function, thus we're getting rid of this badness. Also small hidden bug fixed, hope none other introduced. ;-) Signed-off-by: Anton Vorontsov Acked-by: Andy Fleming Signed-off-by: Jeff Garzik commit f9663aea2a938f9dc60dbfef34b9e7847a69c947 Author: Grant Likely Date: Sat Dec 1 22:10:03 2007 -0700 gianfar: fix compile warning Eliminate an uninitialized variable warning. The code is correct, but a pointer to the automatic variable 'addr' is passed to dma_alloc_coherent. Since addr has never been initialized, and the compiler doesn't know what dma_alloc_coherent will do with it, it complains. Signed-off-by: Grant Likely Signed-off-by: Jeff Garzik commit 4352d82647f679fb8dd9440b34400fa49beedb2c Author: Olof Johansson Date: Mon Dec 3 21:34:14 2007 -0600 pasemi_mac: Fix reuse of free'd skb Turns out we're freeing the skb when we detect CRC error, but we're not clearing out info->skb. We could either clear it and have the stack reallocate it, or just leave it and the rx ring refill code will reuse the one that was allocated. Reusing a freed skb obviously caused some nasty crashes of various kind, as reported by Brent Baude and David Woodhouse. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit d30f53aeb31d453a5230f526bea592af07944564 Author: Wang Chen Date: Tue Dec 4 10:01:37 2007 +0800 SMC911X: Fix using of dereferenced skb after netif_rx Signed-off-by: Wang Chen Signed-off-by: Jeff Garzik commit 8cfcbe998aa0459e20bbad61376f81c1715b25d6 Author: Stephen Hemminger Date: Mon Dec 3 17:02:17 2007 -0800 sky2: recovery deadlock fix Prevent deadlock in sky2 recovery logic. sky2_down calls napi_synchronize which gets stuck if napi was already disabled. Fix by rearranging slightly and not calling napi_disable until after both ports are stopped. The napi_disable probably is being overly paranoid, but it is safe now. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4c537e6371a9510c82eb96fb7e1e66017e0e2053 Author: Jon Smirl Date: Mon Dec 3 22:38:10 2007 +0000 Fix memory corruption in fec_mpc52xx The mpc5200 fec driver is corrupting memory. This patch fixes two bugs where the wrong skb was being referenced. Signed-off-by: Jon Smirl Acked-by: Domen Puncer Signed-off-by: Grant Likely Signed-off-by: David Woodhouse Signed-off-by: Jeff Garzik commit 0581d3f53053de597ef4956568c15785e59828ef Author: David Woodhouse Date: Mon Dec 3 04:34:32 2007 +0000 Don't claim to do IPv6 checksum offload Signed-off-by: David Woodhouse Signed-off-by: Jeff Garzik commit 4c14fe91d0209897fda4dea0102c8cd2e1ddd860 Author: Divy Le Ray Date: Sat Dec 1 15:57:17 2007 -0800 cxgb - revert file mode changes. revert inavertant file mode changes Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 943547abdfe9b4e27e36a25987909619908dffbf Author: Bartlomiej Zolnierkiewicz Date: Sun Dec 2 03:47:01 2007 +0100 pata_amd/pata_via: de-couple programming of PIO/MWDMA and UDMA timings * Don't program UDMA timings when programming PIO or MWDMA modes. This has also a nice side-effect of fixing regression added by commit 681c80b5d96076f447e8101ac4325c82d8dce508 ("libata: correct handling of SRST reset sequences") (->set_piomode method for PIO0 is called before ->cable_detect method which checks UDMA timings to get the cable type). * Bump driver version. Signed-off-by: Bartlomiej Zolnierkiewicz Tested-by: "Thomas Lindroth" Acked-by: Alan Cox Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 6ba8695870a5a2ebf6f3d1ee3ac1e4d96d667cf6 Author: peerchen Date: Mon Dec 3 22:20:37 2007 +0800 ahci: add the Device IDs of MCP79 AHCI controller to ahci.c Add the device IDs of legacy mode of MCP79 AHCI controller to ahci.c Signed-off-by: Peer Chen Signed-off-by: Jeff Garzik commit 306b30f74d37f289033c696285e07ce0158a5d7b Author: Mark Lord Date: Tue Dec 4 14:07:52 2007 -0500 sata_mv: Warn about HPT RocketRAID BIOS treatment of "Legacy" drives The Highpoint RocketRAID boards using Marvell 7042 chips overwrite the 9th sector of attached drives at boot time, when those drives are configured as "Legacy" (the default) in the HighPoint BIOS. This kills GRUB, and probably other stuff. But it all happens *before* Linux is even loaded. So, for now we'll log a WARNING when such boards are detected, and advise users to configure BIOS "JBOD" volumes instead, which don't appear to suffer from this problem. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 3f3debdbfb7713aa06c4370bab6bef277dfd7a37 Author: Robert Hancock Date: Sun Nov 25 16:59:36 2007 -0600 sata_nv: don't use legacy DMA in ADMA mode (v3) We need to run any DMA command with result taskfile requested in ADMA mode when the port is in ADMA mode, otherwise it may try to use the legacy DMA engine in ADMA mode which is not allowed. Enforce this with BUG_ON() since data corruption could potentially result if this happened. Also, fail any attempt to try and issue NCQ commands with result taskfile requested, since the hardware doesn't allow this. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 2254c2e0184c603f92fc9b81016ff4bb53da622d Merge: a3aaabd... 7af0d6f... Author: Linus Torvalds Date: Tue Dec 4 09:37:39 2007 -0800 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] Make sure the restore psw masks are initialized. [S390] Fix compile error on 31bit without preemption [S390] dcssblk: prevent early access without own make_request function [S390] cio: add missing reprobe loop end statement [S390] cio: Issue SenseID per path. commit a3aaabd6b402d8b0ede5aa4a040e9fdbbfdf9116 Merge: 98f20fb... da54bec... Author: Linus Torvalds Date: Tue Dec 4 09:28:45 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: arch_register_cpu() section fix x86: free_cache_attributes() section fix x86: add the word 'WARNING' in check_nmi_watchdog() output x86: revert CONFIG_X86_HT semantics change commit 98f20fb6a9b1db4ef6ab19e5eb0e41f04d38b4aa Merge: 2208210... db292ca... Author: Linus Torvalds Date: Tue Dec 4 09:28:23 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: default to more agressive yield for SCHED_BATCH tasks sched: fix crash in sys_sched_rr_get_interval() commit 220821028cd764c24e60485251c4d0bc1732bdfa Author: Adrian Bunk Date: Tue Dec 4 14:35:00 2007 +0100 MAINTAINERS: remove the MTRR entry I haven't seen Richard doing MTRR related work for quite some time, and the "X86 ARCHITECTURE" entry in MAINTAINERS already covers the people currently responsible for this code. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 799b37b5ee6b4c197f38611eb7f02552e4f14e70 Author: Ingo Molnar Date: Tue Dec 4 11:32:38 2007 +0100 drivers/s390/net/ctcmain.c: fix build bug SET_MODULE_OWNER() is obsolete. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit da54becc7166b5fad70538acea5e93bdd83dd8a6 Author: Andrew Morton Date: Tue Dec 4 17:19:07 2007 +0100 x86: arch_register_cpu() section fix fix this on i386 allnoconfig: WARNING: vmlinux.o(.text+0x6f2e): Section mismatch: reference to .init.text:register_cpu (between 'arch_register_cpu' and 'text_poke') Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit f22d9bc1e87270586610216084b00cb2fb09abba Author: Adrian Bunk Date: Tue Dec 4 17:19:07 2007 +0100 x86: free_cache_attributes() section fix free_cache_attributes() must be __cpuinit since it calls the __cpuinit cache_remove_shared_cpu_map(). This patch fixes the following section mismatch reported by Chris Clayton: ... WARNING: vmlinux.o(.text+0x90b6): Section mismatch: reference to .init.text:cache_remove_shared_cpu_map (between 'free_cache_attributes' and 'show_level') ... Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 75bc122c2dc4d497909248e85d86139e54c8fd13 Author: Don Zickus Date: Tue Dec 4 17:19:07 2007 +0100 x86: add the word 'WARNING' in check_nmi_watchdog() output Our automated test suite looks for keywords like error, fail, warning in the boot log. In the case when the nmi watchdog is determined to be stuck in check_nmi_watchdog(), none of those keywords are displayed. This patch adds a keyword, "WARNING:", so it makes it easier to notice when the nmi watchdog isn't working correctly. Also add a proper KERN_WARNING mark to this printout. Signed-off-by: Don Zickus Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit ee0011a798ba0e9134506830c58323f2bfcd2443 Author: Adrian Bunk Date: Tue Dec 4 17:19:07 2007 +0100 x86: revert CONFIG_X86_HT semantics change The recent Kconfig changes in x86 resulted in CONFIG_X86_HT no longer being set if (X86_32 && MK8). After grep'ing through the tree I think the problem is that different places have different assumptions about the semantics of CONFIG_X86_HT, either: - hyperthreading or - multicore This should be sorted out properly, but until then we should keep the 2.6.23 status quo. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit db292ca302e83534f5f0f7139e13d7e6976e51f9 Author: Ingo Molnar Date: Tue Dec 4 17:04:39 2007 +0100 sched: default to more agressive yield for SCHED_BATCH tasks do more agressive yield for SCHED_BATCH tuned tasks: they are all about throughput anyway. This allows a gentler migration path for any apps that relied on stronger yield. Signed-off-by: Ingo Molnar commit 77034937dc4575ca0a76bf209838ecd39e804089 Author: Ingo Molnar Date: Tue Dec 4 17:04:39 2007 +0100 sched: fix crash in sys_sched_rr_get_interval() Luiz Fernando N. Capitulino reported that sched_rr_get_interval() crashes for SCHED_OTHER tasks that are on an idle runqueue. The fix is to return a 0 timeslice for tasks that are on an idle runqueue. (and which are not running, obviously) this also shrinks the code a bit: text data bss dec hex filename 47903 3934 336 52173 cbcd sched.o.before 47885 3934 336 52155 cbbb sched.o.after Reported-by: Luiz Fernando N. Capitulino Signed-off-by: Ingo Molnar commit 7af0d6f753f5adf773f99470666b50490d3379f1 Author: Heiko Carstens Date: Tue Dec 4 16:09:05 2007 +0100 [S390] Make sure the restore psw masks are initialized. In case of TRACE_IRQFLAGS the restore psw masks will not be initialized if noexec is turned on. This will lead to an immediate system crash. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit ab1809b4ed9a3aaf3b34133a776a94f9fad54cc4 Author: Christian Borntraeger Date: Tue Dec 4 16:09:04 2007 +0100 [S390] Fix compile error on 31bit without preemption Commit b8e7a54cd06b0b0174029ef3a7f5a1415a2c28f2 introduced a compile error if CONFIG_PREEMPT is not set: arch/s390/kernel/built-in.o: In function `cleanup_io_leave_insn': /space/kvm/arch/s390/kernel/entry.S:(.text+0xbfce): undefined reference to `preempt_schedule_irq' This patch hides preempt_schedule_irq if CONFIG_PREEMPT is not set. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 436d1bc7fe6e78e37fe5f5022ea4d5c133d825eb Author: Christian Borntraeger Date: Tue Dec 4 16:09:03 2007 +0100 [S390] dcssblk: prevent early access without own make_request function When loading a dcss segment with the dcssblk driver, sometimes the following kind of message appears: bio too big device dcssblk0 (8 > 0) Buffer I/O error on device dcssblk0, logical block 172016 .. The fix is to move the disk registration after setting the make_request function, to avoid calls into generic_make_request for dcssblock without having the make_request function set up properly. Cc: Gerald Schaefer Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 671756162cfb0b3ccbb6a0047baa3010885561a2 Author: Peter Oberparleiter Date: Tue Dec 4 16:09:02 2007 +0100 [S390] cio: add missing reprobe loop end statement Add loop end statement to prevent looping over empty subchannel sets. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit c94dec99f9759c41cadf0f2781846da5b40a98f6 Author: Cornelia Huck Date: Tue Dec 4 16:09:01 2007 +0100 [S390] cio: Issue SenseID per path. We may receive a unit check for every path when we issue a SenseID. Unfortunately, the channel subsystem will try on a different path every time if we use a lpm of 0xff, which will exhaust our retry counter. Therefore, revert SenseID to its previous per-path behaviour and just leave out the suspend multipath reconnect. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky