commit 5ecd3100e695228ac5e0ce0e325e252c0f11806f Author: Linus Torvalds Date: Mon Jun 4 17:57:25 2007 -0700 Linux 2.6.22-rc4 commit 464cf177df7727efcc5506322fc5d0c8b896f545 Author: Tejun Heo Date: Sun May 27 15:10:40 2007 +0200 libata: always use polling SETXFER Several people have reported LITE-ON LTR-48246S detection failed because SETXFER fails. It seems the device raises IRQ too early after SETXFER. This is controller independent. The same problem has been reported for different controllers. So, now we have pata_via where the controller raises IRQ before it's ready after SETXFER and a device which does similar thing. This patch makes libata always execute SETXFER via polling. As this only happens during EH, performance impact is nil. Setting ATA_TFLAG_POLLING is also moved from issue hot path to ata_dev_set_xfermode() - the only place where SETXFER can be issued. Note that ATA_TFLAG_POLLING applies only to drivers which implement SFF TF interface and use libata HSM. More advanced controllers ignore the flag. This doesn't matter for this fix as SFF TF controllers are the problematic ones. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 78ae87c3cd723c8a8dcd67d4e4cbc6d63671c108 Author: Andrew Morton Date: Sun Jun 3 13:50:41 2007 -0700 vanishing ioctl handler debugging We've had several reoprts of the CPU jumping to 0x00000000 is do_ioctl(). I assume that there's a race and someone is zeroing out the ioctl handler while this CPU waits for the lock_kernel(). The patch adds code to detect this, then emits stuff which will hopefuly lead us to the culprit. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c738480d21a190e3d99c7ce985ab9484f373a3c Author: Andrew Morton Date: Sun Jun 3 13:50:40 2007 -0700 mtrr atomicity fix Rafael gets this on an SMP box with kernel preemption enabled, during hibernation and restore (100% of the time): Enabling non-boot CPUs ... BUG: using smp_processor_id() in preemptible [00000001] code: bash/4514 caller is mtrr_save_state+0x9/0x40 Cc: "Rafael J. Wysocki" Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e44a45ae7b7f7c7a4ebd6aa39b703bf2b97fe848 Author: David Brownell Date: Sun Jun 3 13:50:40 2007 -0700 SPI dynamic busid generation bugfix Fix SPI dynamic bus ID assignment to start at 2^15-1 rather than a negative number. Valid bus ids are supposed to be positive, and are (now) stored in an 's16' value. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a2430708fb8f31c084503cb47240483ec2c2662 Author: David S. Miller Date: Sun Jun 3 17:56:04 2007 -0700 [SCSI] JAZZ ESP and SUN ESP need SPI_ATTRS Reported by Meelis Roos. Signed-off-by: David S. Miller Signed-off-by: James Bottomley commit 8ce7955aa52c37db1425ea4bd4edcfa67e253454 Author: Michael Schmitz Date: Sun Jun 3 12:55:04 2007 +0200 [SCSI] atari_NCR5380: update_timeout removal Atari SCSI driver fixes: remove update_timeout kludge Signed-off-by: Michael Schmitz Signed-off-by: Geert Uytterhoeven Acked-by: Christoph Hellwig Signed-off-by: James Bottomley commit 1dfa2812404c37d7571622195f907cea3331616c Author: Dmitry Torokhov Date: Sun Jun 3 23:29:36 2007 -0400 Input: reduce raciness when input handlers disconnect There is a race between input handler's release() and disconnect() methods: when input handler disconnects it wakes up all regular users and then process to walk user list to wake up async. users. While disconnect() walks the list release() removes elements of the same list causing oopses. While this is not a substibute for proper locking we can reduce odds of getting an oops if we wake up normal readers after walking the list. Signed-off-by: Dmitry Torokhov commit 26be5a509af5f80c7012bd4f0478a94746c9c9d9 Author: Dmitry Torokhov Date: Fri May 11 01:16:12 2007 -0400 Input: ucb1x00 - do not access input_dev->private directly Use input_get_drvdata() and input_set_drvdata() helpers to do that. Signed-off-by: Dmitry Torokhov Acked-by: Pavel Machek commit 899b69d079713d0f568fb2700b86987aa94f29b2 Author: David S. Miller Date: Sun Jun 3 17:39:56 2007 -0700 [ATA]: Don't allow to enable this for SPARC64 without PCI. Based upon a report from Meelis Roos. Signed-off-by: David S. Miller commit e11a6c236b3070ed05b079f91a9b3defa48b54d3 Author: David S. Miller Date: Sun Jun 3 17:35:24 2007 -0700 [VIDEO]: XVR500 and XVR2500 require FB=y Signed-off-by: David S. Miller commit 6e1d91039becc9d5bcd046d8c709dbaf471220e3 Author: Patrick McHardy Date: Fri Jun 1 11:45:04 2007 -0700 [ICMP]: Fix icmp_errors_use_inbound_ifaddr sysctl Currently when icmp_errors_use_inbound_ifaddr is set and an ICMP error is sent after the packet passed through ip_output(), an address from the outgoing interface is chosen as ICMP source address since skb->dev doesn't point to the incoming interface anymore. Fix this by doing an interface lookup on rt->dst.iif and using that device. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 584bdf8cbdf6f277c2a00e083257ee75687cf6f4 Author: Wei Dong Date: Thu May 31 22:49:28 2007 -0700 [IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP Signed-off-by: Wei Dong Signed-off-by: David S. Miller commit 4fcd6b991685493185c2bb8a76b21aadb658bd76 Author: Herbert Xu Date: Thu May 31 22:15:50 2007 -0700 [NET] gso: Fix GSO feature mask in sk_setup_caps This isn't a bug just yet as only TCP uses sk_setup_caps for GSO. However, if and when UDP or something else starts using it this is likely to cause a problem if we forget to add software emulation for it at the same time. The problem is that right now we translate GSO emulation to the bitmask NETIF_F_GSO_MASK, which includes every protocol, even ones that we cannot emulate. This patch makes it provide only the ones that we can emulate. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6418204f919c030ca0c943f6c77dc84aff2ec0d2 Author: Ilpo Järvinen Date: Thu May 31 21:37:55 2007 -0700 [TCP]: Fix GSO ignorance of pkts_acked arg (cong.cntrl modules) The code used to ignore GSO completely, passing either way too small or zero pkts_acked when GSO skb or part of it got ACKed. In addition, there is no need to calculate the value in the loop but simple arithmetics after the loop is sufficient. There is no need to handle SYN case specially because congestion control modules are not yet initialized when FLAG_SYN_ACKED is set. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 75202e76893c11ce7f8bcc9a07f994d71e3d5113 Author: Bill Nottingham Date: Thu May 31 21:33:35 2007 -0700 [NET]: Fix comparisons of unsigned < 0. Recent gcc versions emit warnings when unsigned variables are compared < 0 or >= 0. Signed-off-by: Bill Nottingham Signed-off-by: David S. Miller commit 60468d5b5b6931b4d4d704e26b5f17a6e476e6f8 Author: Venkatesh Pallipadi Date: Thu May 31 21:28:44 2007 -0700 [NET]: Make net watchdog timers 1 sec jiffy aligned. round_jiffies for net dev watchdog timer. Signed-off-by: Venkatesh Pallipadi Signed-off-by: David S. Miller commit b206a65d671d359d0947f0b6da9d418c49a9b28a Author: Jeff Garzik Date: Thu May 31 21:26:23 2007 -0700 [ATM]: Fix warning. The compiler warning drivers/atm/firestream.c: In function ‘top_off_fp’: drivers/atm/firestream.c:1505: warning: cast to pointer from integer of different size does indicate a bug, albeit a minor one. Fixed, by using a 32-bit temporary prior to the call to bus_to_virt(). The larger bug is still present: the entire driver assumes that machine pointers are 32-bit, as it stores pointers in 32-bit hardware registers. This is obvious to anyone who knows the driver well, but for the casual readers it is helpfully noted with FIXME. Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller commit 3f196eb519a419bf83ecc22753943fd0a0de4f8f Author: Mark Glines Date: Thu May 31 15:44:48 2007 -0700 [TCP]: Use default 32768-61000 outgoing port range in all cases. This diff changes the default port range used for outgoing connections, from "use 32768-61000 in most cases, but use N-4999 on small boxes (where N is a multiple of 1024, depending on just *how* small the box is)" to just "use 32768-61000 in all cases". I don't believe there are any drawbacks to this change, and it keeps outgoing connection ports farther away from the mess of IANA-registered ports. Signed-off-by: Mark Glines Signed-off-by: David S. Miller commit 278a3de5abc7901805689a66340b5af9882b4f9a Author: David S. Miller Date: Thu May 31 15:19:20 2007 -0700 [AF_UNIX]: Fix datagram connect race causing an OOPS. Based upon an excellent bug report and initial patch by Frederik Deweerdt. The UNIX datagram connect code blindly dereferences other->sk_socket via the call down to the security_unix_may_send() function. Without locking 'other' that pointer can go NULL via unix_release_sock() which does sock_orphan() which also marks the socket SOCK_DEAD. So we have to lock both 'sk' and 'other' yet avoid all kinds of potential deadlocks (connect to self is OK for datagram sockets and it is possible for two datagram sockets to perform a simultaneous connect to each other). So what we do is have a "double lock" function similar to how we handle this situation in other areas of the kernel. We take the lock of the socket pointer with the smallest address first in order to avoid ABBA style deadlocks. Once we have them both locked, we check to see if SOCK_DEAD is set for 'other' and if so, drop everything and retry the lookup. Signed-off-by: David S. Miller commit 007a880d627aee0e854e793099bb33d0c1130678 Author: Michael Chan Date: Thu May 31 14:49:51 2007 -0700 [TG3]: Fix link problem on Dell's onboard 5906. The bug is caused by code that always set (TG3_FLAG_USE_MI_INTERRUPT | TG3_FLAG_USE_LINKCHG_REG) on all Dell's onboard devices. With these 2 flags set, the link status is polled by tg3_timer() and will only work when the PHY is set up to interrupt the MAC on link changes. This breaks 5906 because the 5906 PHY does not support TG3_FLAG_USE_MI_INTERRUPT the same as other PHYs. For correctness, only Dell's onboard 5701 needs these 2 flags to be set. This change will fix the 5906 problem and will change other Dell devices except 5700 and 5701 to use the more efficient interrupt-driven link changes. Update version to 3.77. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 1c92b4e50ef926d1e26fcc056a520e4a7d12478c Author: David S. Miller Date: Thu May 31 13:24:26 2007 -0700 [AF_UNIX]: Make socket locking much less confusing. The unix_state_*() locking macros imply that there is some rwlock kind of thing going on, but the implementation is actually a spinlock which makes the code more confusing than it needs to be. So use plain unix_state_lock and unix_state_unlock. Signed-off-by: David S. Miller commit beaf53bff7985ad57b5b6983f3d6142380449370 Author: Li Yang Date: Fri May 25 13:54:02 2007 +0800 NET: add MAINTAINERS entry for ucc_geth driver Signed-off-by: Li Yang Acked-by: Kim Phillips Signed-off-by: Jeff Garzik commit 6ffdd071e0386645d539a7386f77669777412fea Author: Brice Goglin Date: Wed May 30 21:13:59 2007 +0200 myri10ge: report link up/down in standard ethtool way Report link up/down in standard ethtool way Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 225c3837bb47d33357dcdad9f88321d75a3eb7fd Author: Mithlesh Thukral Date: Fri Jun 1 04:13:08 2007 -0700 NetXen: Removal of extra free_irq call NetXen: Removal of redundant free_irq This patch removes a redundant free_irq() call from remove() routine. This will also eliminate a warning during unload of driver. Signed-by: Mithlesh Thukral Signed-off-by: Jeff Garzik commit df31233ab95980d037d0304aaf44f9939fbaede5 Author: Valerie Henson Date: Wed May 30 06:08:54 2007 -0600 Update tulip maintainer email address I've quit Intel and gone into business as a Linux consultant. Update my email address in MAINTAINERS. Signed-off-by: Valerie Henson Signed-off-by: Jeff Garzik commit 6026ee67eda769122be535e8f05be438dfdcb29a Author: Paul Mundt Date: Fri Jun 1 17:36:48 2007 +0900 smc91x: sh solution engine fixes. The current smc91x I/O routines ifdef the solution engine subtypes individually, which is rather bogus, as they can simply use CONFIG_SOLUTION_ENGINE instead. This fixes it for some of the other solution engines that weren't included in the ifdef list (SH7206 specifically). There are also inb/outb definitions which are totally bogus (missing brackets in _both_ cases, SMC_CAN_USE_8BIT == 0, and even better, they try to use a 16-bit access to fake 8-bit access). Kill that nonsense off completely. Signed-off-by: Paul Mundt -- drivers/net/smc91x.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) Signed-off-by: Jeff Garzik commit 416b5d10afdc797c21c457ade3714e8f2f75edd9 Author: Auke Kok Date: Fri Jun 1 10:22:39 2007 -0700 e1000: disable polling before registering netdevice To assure the symmetry of poll enable/disable in up/down, we should initialize the netdevice to be poll_disabled at load time. Doing this after register_netdevice leaves us open to another race, so lets move all the netif_* calls above register_netdevice so the stack starts out how we expect it to be. Signed-off-by: Auke Kok Cc: Herbert Xu Cc: Doug Chapman Signed-off-by: Jeff Garzik commit 25805dcf9d83098cf5492117ad2669cd14cc9b24 Author: Stephen Hemminger Date: Fri Jun 1 09:44:01 2007 -0700 network drivers: eliminate unneeded kill_vid code Many drivers had code that did kill_vid, but they weren't doing vlan filtering. With new API the stub is unneeded unless device sets NETIF_F_HW_VLAN_FILTER. Bad habit: I couldn't resist fixing a couple of nearby style things in acenic, and forcedeth. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit cb434e380d58d3956c75dc5ead00eced599b9d16 Author: Stephen Hemminger Date: Fri Jun 1 09:44:00 2007 -0700 atl1: eliminate unneeded kill_vid code This driver has unneeded stubs for VLAN filtering. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 7b332244a63dc1f408fd2ebb2636d58ac69a4916 Author: Stephen Hemminger Date: Fri Jun 1 09:43:59 2007 -0700 8139cp: fix VLAN unregistration The 8139cp driver did VLAN unregistration incorrectly. It disables VLAN completely when the first VID is unregistered. It should instead disable VLAN when the group is unregistered by calling cp_vlan_rx_register with a NULL grp. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3d4e66f5cd217160da9c3a2e3ec27b22e743bd25 Author: Stephen Hemminger Date: Fri Jun 1 09:43:58 2007 -0700 sky2: Fix VLAN unregistration Fix sky2 disabling VLAN completely when the first vid is unregistered. sky2 disables VLAN completely when the first VID is unregistered. It should instead disable VLAN when the group is unregistered by calling sky2_vlan_rx_register with grp = NULL. Signed-off-by: Patrick McHardy Signed-off-by: Stephen Hemminger drivers/net/sky2.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) Signed-off-by: Jeff Garzik commit d2d1acdb6a632486be9a731f40c68980c09f0490 Author: Stephen Hemminger Date: Fri Jun 1 09:43:57 2007 -0700 VLAN: kill_vid is only useful for VLAN filtering devices The interface for network device VLAN extension was confusing. The kill_vid function is only really useful for devices that do hardware filtering. Devices that only do VLAN receiption without filtering were being forced to provide the hook, and there were bugs in those devices. Many drivers had kill_vid routine that called vlan_group_set_device, with NULL, but that is done already. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit e68a8c10c4c5daf363e946d10c1a5cba77d7f92c Author: Stephen Hemminger Date: Wed May 30 14:23:17 2007 -0700 qla3xxx: device doesnt do hardware checksumming. Reading the code for ql_hw_csum_setup(), it is obvious that this driver is broken for IPV6. The driver sets the NETIF_F_HW_SUM flag, but the code for checksum setup only deals with IPV4. Compile tested only, no hardware available. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 627aa944a17ba82ca3ba87dc1d6ee85bd314ec79 Author: Milton Miller Date: Thu May 31 01:29:01 2007 +1000 [POWERPC] Fix zImage.coff generation for 32-bit pmac Commit 9da82a6dee9db4cd5ae7a74ab4f51afb52b6efb9 inadvertently removed the platform override for zImage.coff to be generated with pmaccoff. Rather than add a special makefile rule, change the platform for which the wrapper platform uses the special rules. Signed-off-by: Milton Miller Signed-off-by: Paul Mackerras commit f48419666e645208c0156aecab1ee6157303da3c Author: Stefan Roese Date: Sat Jun 2 19:30:20 2007 +1000 [POWERPC] Fix compile breakage for IBM/AMCC 4xx arch/ppc platforms The IBM/AMCC 405 platforms don't compile anymore in the current kernel version. This fixes the compile breakage. Signed-off-by: Stefan Roese Signed-off-by: Paul Mackerras commit e358ae4dd4ca823abc5ee06c61e3915636e60191 Author: Johannes Berg Date: Sat Jun 2 19:13:44 2007 +1000 [POWERPC] Don't allow PMAC_APM_EMU for 64-bit In b302887854d6f0c6f9fc3f1080535e7c1bd53134 I switched the apm emulation code to use the generic code but accidentally dropped the PPC32 dependency from the configuration symbol. This adds it back. Signed-off-by: Johannes Berg Signed-off-by: Paul Mackerras commit f5921697cf5cae68dcbfa881d9e08f3cebef47eb Author: Michael Ellerman Date: Fri Jun 1 17:23:26 2007 +1000 [POWERPC] Compare irq numbers with NO_IRQ not IRQ_NONE There is a thinko in the irq code, it uses IRQ_NONE to indicate no irq, whereas it should be using NO_IRQ. IRQ_NONE is returned from irq handlers to say "not handled". As it happens they currently have the same value (0), so this is just for future proof-ness. Signed-off-by: Michael Ellerman Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit a4c28ab7445f5ca60e56ffd90edb3e9fc1330b71 Author: Akinobu Mita Date: Tue May 29 20:46:51 2007 +1000 [POWERPC] Fix return from pte_alloc_one() in out-of-memory case pte_alloc_one() is expected to return NULL if out of memory. But it returns virt_to_page(NULL), which is not NULL. This fixes it. Cc: Paul Mackerras Signed-off-by: Akinobu Mita Signed-off-by: Paul Mackerras commit 66b30922c8a2c880fe61080c5bf87ae6615b9f64 Author: Michael Neuling Date: Tue May 29 17:01:52 2007 +1000 [POWERPC] Fix compile warning in pseries xics code In 616883df78bd4b3fcdb6ddc39bd3d4cb902bfa32 request_irq was marked as __must_check so we must... er... check it. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit b610b9780bdb2750849f32c2eefef46af58c67f8 Author: David Gibson Date: Tue May 29 15:37:12 2007 +1000 [POWERPC] Don't use HOSTCFLAGS in BOOTCFLAGS In the bootwrapper code for powerpc, we include HOSTCFLAGS into the BOOTCFLAGS used for building the zImage wrapper code. Since the wrapper code is not host code, this makes no sense. This patch removes the use of HOSTCFLAGS here, instead including directly into BOOTCFLAGS those flags from the normal kernel CFLAGS which also make sense in the bootwrapper code. In particular, this makes the bootwrapper use -msoft-float, preventing the compiler from generating floating point instructions. Previously, under some circumstances the compiler could generate floating point instructions in the bootwrapper which would cause exceptions on embedded CPUS which don't have floating point support. Signed-off-by: David Gibson Acked-by: Josh Boyer Signed-off-by: Paul Mackerras commit 0570d4ed4325c0fb2ceb75f45a21d878b1741b61 Author: Stephen Rothwell Date: Mon May 28 16:12:59 2007 +1000 [POWERPC] Create a zImage for legacy iSeries This zImage is really just the stripped vmlinux, but it means that there is one less special case for iSeries and also that the zImages will be built for a combined kernel build that happens to include iSeries. This zImage boots fine on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 18456d015c50bc903fc66c65621170170190a1fd Author: Stephen Rothwell Date: Mon May 28 10:20:45 2007 +1000 [POWERPC] pasemi idle uses hard_smp_processor_id and so needs to include asm/smp.h so a UP build works. Signed-off-by: Stephen Rothwell Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 42d284bc45a9d6625b30c3175563829847406e03 Author: Stephen Rothwell Date: Mon May 28 10:19:08 2007 +1000 [POWERPC] ps3/interrupt.c uses get_hard_smp_processor_id and so needs to include asm/smp.h for a UP build to work. Signed-off-by: Stephen Rothwell Acked-by: Geoff Levand Signed-off-by: Paul Mackerras commit 6ad8d010b2f364b739020e514e61b6a73444464b Author: Benjamin Herrenschmidt Date: Sun May 27 15:18:22 2007 +1000 [POWERPC] Fix possible access to free pages I think we have a subtle race on ppc64 with the tlb batching. The common code expects tlb_flush() to actually flush any pending TLB batch. It does that because it delays all page freeing until after tlb_flush() is called, in order to ensure no stale reference to those pages exist in any TLB, thus causing potential access to the freed pages. However, our tlb_flush only triggers the RCU for freeing page table pages, it does not currently trigger a flush of a pending TLB/hash batch, which is, I think, an error. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 988519acb3dbe7168276a36cbb8fd91fddbffaee Author: David Gibson Date: Fri May 25 13:19:17 2007 +1000 [POWERPC] Fix compiler/assembler flags for Ebony platform boot files The recent addition of assembler flags for 44x.c and ebony.c in the bootwrapper to make them compile on certain toolchains was not correct and could break other platforms. This patch switches to using a compiler flag instead, which implies the appropriate assembler flag, and also stops the compiler itself generating instructions which are invalid for the platform in question. Signed-off-by: David Gibson Acked-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 7d43e57764fe6922703c36d8d0d56a7ead21f03d Author: Benjamin Herrenschmidt Date: Thu May 24 15:41:04 2007 +1000 [POWERPC] Fix ppc32 single-stepping out of syscalls The ppc32 kernel didn't properly set/clear the TIF_SINGLESTEP flag, causing return from syscalls to not SIGTRAP, thus executing one more instruction before stopping again. This fixes it. The ptrace code is a bit of a mess, and is overdue for at least a -proper- 32/64 bits split and possibly more cleanups but this minimum fix should be ok for 2.6.22 Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 5169b8a1659fef9cc093ed3d889a854945a18177 Author: Michael Ellerman Date: Wed May 23 18:08:13 2007 +1000 [POWERPC] Update documentation for of_find_node_by_type() The documentation for of_find_node_by_type() incorrectly refers to the "name" parameter - it should be "type". Also the behaviour when from == NULL is not really documented, fix that. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 6287ee32952b502c23d54f12895c3895ddbe5013 Author: Bob Moore Date: Tue Apr 3 19:59:37 2007 -0400 ACPICA: Support for external package objects as method arguments Implemented support to allow Package objects to be passed as method arguments to the acpi_evaluate_object interface. Previously, this would return an AE_NOT_IMPLEMENTED exception. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 8ff6f48d99a0351bcc9ceab422042ef9d3bad9aa Author: Luck, Tony Date: Thu May 24 13:57:40 2007 -0700 ACPI: Section mismatch ... acpi_map_pxm_to_node Last of the "Section mismatch" errors from ia64 builds! acpi_map_pxm_to_node() is defined with attribute __cpuinit, but is called by "normal" kernel functions acpi_getnode() and acpi_map_cpu2node(). Commit f363d16fbb9374c0bd7f2757d412c287169094c9 moved the data structures on which this routine operates from __cpuinitdata to regular memory, so this routine can also move out of init space. Signed-off-by: Tony Luck Signed-off-by: Len Brown commit 0477d24e2a87a9077b62298b01b031929f5cf2a2 Author: David Woodhouse Date: Fri Jun 1 20:04:43 2007 +0100 [JFFS2] Fix obsoletion of metadata nodes in jffs2_add_tn_to_tree() We should keep the mdata node with higher version number, not just the one we happen to find latest. Doh. Signed-off-by: David Woodhouse commit 718ea8361b15aec5f4cb559d63ba34bc5a58d8f9 Author: David Woodhouse Date: Fri Jun 1 19:21:59 2007 +0100 [MTD] Fix error checking after get_mtd_device() in get_sb_mtd functions It returns ERR_PTR(foo) on error, not just NULL. Signed-off-by: David Woodhouse commit 94774a3a8e01989960aaadaea6deff51a4e7deed Author: Salyzyn, Mark Date: Wed May 30 11:59:13 2007 -0400 [SCSI] aacraid: fix shutdown handler to also disable interrupts. Moves quiesce, thread and interrupt shutdown into aacraid drivers' .shutdown handler. This fix to the aac_shutdown handler will remove the superfluous reset of the adapter during a (clean) kexec. This fix may mitigate the active investigation 'kexec and aacraid broken' but it is unlikely to affect the root cause (issue likely present in both kexec and kdump). This patch reduces the chance the problem will occur with a kexec. The fix for root cause is currently expected to be the minimum value check to the aacraid.startup_timeout driver variable after an adapter reset within aacraid_commit_reset.patch submitted on 05/22/2007 and awaiting testing by Yinghai to confirm. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit c1a834dc704763673df10282995257f2de93cbe9 Author: Ingo Molnar Date: Fri Jun 1 00:47:16 2007 -0700 timer stats: speedups Make timer-stats have almost zero overhead when enabled in the config but not used. (this way distros can enable it more easily) Also update the documentation about overhead of timer_stats - it was written for the first version which had a global lock and a linear list walk based lookup ;-) Signed-off-by: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fcc15ec3c1c287a781a4620e52522b6186f26f6 Author: Bjorn Steinbrink Date: Fri Jun 1 00:47:15 2007 -0700 timer statistics: fix race Fix two races in the timer stats lookup code. One by ensuring that the initialization of a new entry is finished upon insertion of that entry. The other by cleaning up the hash table when the entries array is cleared, so that we don't have any "pre-inserted" entries. Thanks to Eric Dumazet for reminding me of the memory barriers. Signed-off-by: Bjorn Steinbrink Signed-off-by: Ian Kumlien Acked-by: Ingo Molnar Cc: Eric Dumazet Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c79d9c9e9ace5eeae54f484f62fbd86bf27a344a Author: Sam Ravnborg Date: Fri Jun 1 00:47:14 2007 -0700 net/hp100: fix section mismatch warning Fix following section mismatch warning in hp100: WARNING: drivers/net/hp100.o(.init.text+0x26a): Section mismatch: reference to .exit.text: (after 'init_module') The warning says that we use a function marked __exit from a function marked __init. This is not good on architectures where we discard __exit section for drivers that are built-in. Note: This warning is only seen by my local copy of modpost but the change will soon hit upstream. Signed-off-by: Sam Ravnborg Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39959588f58668472bc7108942a8998acedce911 Author: Sam Ravnborg Date: Fri Jun 1 00:47:13 2007 -0700 kvm: fix section mismatch warning in kvm-intel.o Fix following section mismatch warning in kvm-intel.o: WARNING: o-i386/drivers/kvm/kvm-intel.o(.init.text+0xbd): Section mismatch: reference to .exit.text: (between 'hardware_setup' and 'vmx_disabled_by_bios') The function free_kvm_area is used in the function alloc_kvm_area which is marked __init. The __exit area is discarded by some archs during link-time if a module is built-in resulting in an oops. Note: This warning is only seen by my local copy of modpost but the change will soon hit upstream. Signed-off-by: Sam Ravnborg Cc: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2b77b233557bde22498a519f650b1ccc91ddb4e Author: Sam Ravnborg Date: Fri Jun 1 00:47:12 2007 -0700 acpi: fix section mismatch warning in asus + toshiba Fix following section mismatch warnings in acpi WARNING: drivers/acpi/asus_acpi.o(.init.text+0xb7): Section mismatch: reference to .exit.text: (after 'init_module') WARNING: o-i386/drivers/acpi/toshiba_acpi.o(.init.text+0x13a): Section mismatch: reference to .exit.text: (after 'init_module') The exit function is used in the init function during an error codition. As __exit may be discarded during link-time / run-time this is no good. Do not mark the exit function __exit. Note: This warning is only seen by my local copy of modpost but the change will soon hit upstream. Signed-off-by: Sam Ravnborg Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 162dd3b9e41d2c7531bf09c580c8e82dbf01e7ba Author: Sam Ravnborg Date: Fri Jun 1 00:47:11 2007 -0700 isdn: fix section mismatch warnings Fix the following section mismatch warnings: WARNING: drivers/isdn/hardware/eicon/divadidd.o(.init.text+0xc4): Section mismatch: reference to .exit.text: (between 'init_module' and 'diddfunc_init') WARNING: drivers/isdn/hardware/eicon/divas.o(.init.text+0xf4): Section mismatch: reference to .exit.text:divasfunc_exit (between 'init_module' and 'divasfunc_init') WARNING: drivers/isdn/hardware/eicon/divas.o(.init.text+0x10d): Section mismatch: reference to .exit.text:divasfunc_exit (between 'init_module' and 'divasfunc_init') WARNING: drivers/isdn/hardware/eicon/divas.o(.init.text+0x148): Section mismatch: reference to .exit.text:divasfunc_exit (between 'init_module' and 'divasfunc_init') They all point to situation whare a function marked __init calls a function marked __exit - but the __exit section may have been discarded. Note: This warning is generated by a modified copy of modpost in my tree. It will soon hit upstearm. Signed-off-by: Sam Ravnborg Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8281a2b661d5f4f8081b387886187bbf190b92d Author: Sam Ravnborg Date: Fri Jun 1 00:47:10 2007 -0700 microcode: fix section mismatch warning Fix the following section mismatch warnings in microcode.c: WARNING: arch/i386/kernel/built-in.o(.init.text+0x3966): Section mismatch: reference to .exit.text: (between 'microcode_init' and 'parse_maxcpus') WARNING: arch/i386/kernel/built-in.o(.init.text+0x3992): Section mismatch: reference to .exit.text: (between 'microcode_init' and 'parse_maxcpus') The warning are caused by a function marked __init that calls a function marked __exit. Functions marked __exit may be discarded either during link or run-time and thus the reference is not good. Signed-off-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bd327ef288923f4188050bae295661ed0fbb3fb Author: Krzysztof Helt Date: Fri Jun 1 00:47:09 2007 -0700 pm3fb: switching between X and fb fix This patch correctly restores console state after switching from X. Otherwise, screen is always off after switching from X. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27390bc335ff86d92c3819cc28035fde23d1a9c2 Author: Christoph Lameter Date: Fri Jun 1 00:47:09 2007 -0700 SLUB: fix locking for hotplug callbacks Hotplug callbacks are performed with interrupts enabled. Slub requires interrupts to be disabled for flushing caches. Signed-off-by: Christoph Lameter Cc: Michal Piotrowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac140a8f8396504b33ddafb7309feca77bff8497 Author: Andrea Paterniani Date: Fri Jun 1 00:47:07 2007 -0700 SPI: Freescale iMX SPI controller driver fixes Fix 2 bugs: - SPI_DMA_RHDMA bad value. - Missing return value in setup() function (lost passing from patch-2.6.20-rc4-spi_imx to patch-2.6.20-rc6-spi_imx). Signed-off-by: Andrea Paterniani Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b11115c15351faba978ce1b9e75068e77f6ef48d Author: Maciej W. Rozycki Date: Fri Jun 1 00:47:07 2007 -0700 serial_core.h: include The header refers to handle_sysrq(), but does not include which provides a declaration of the function. This may result in an implicit declaration and a warning if the actual one is seen later on. Signed-off-by: Maciej W. Rozycki Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62e5b05db6cd5dd9cf9614cc5d2d0702c1e339bb Author: Satoru Takeuchi Date: Fri Jun 1 00:47:06 2007 -0700 Better documentation for ERESTARTSYS Add comment for errnos related to restart syscall to avoid the leakage of them to user programs. Signed-off-by: Satoru Takeuchi Cc: Oleg Nesterov Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7083174a2ca5ff80de773d2054caee2f77bf9f9 Author: Jay Estabrook Date: Fri Jun 1 00:47:05 2007 -0700 ALPHA: misc fixes 1. arch/alpha/Kconfig several adjustments: a) additions to the systems list and cleanup of same b) change limits of NR_CPUS and make dep. on platform Note that MARVEL support is limited to 32 CPUs whan using 42-bit KSEG - one needs 48-bit KSEG to handle up to 64, and we've never supported 48-bit KSEG. 2. include/asm-alpha/core_wildfire.h fix a typo that undoubtedly prevents WILDFIRE support from working Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ae0b6c704877d0c6b95dd7c3b1907770ca28b79 Author: Jay Estabrook Date: Fri Jun 1 00:47:04 2007 -0700 ALPHA: correct low-level I/O routines for sable-lynx This code corrects the behavior of the t2_readX/t2_writeX routines, and t2_ioreadNN/t2_iowriteNN routines. The value T2_DENSE_MEM is now subtracted from the "xaddr" argument in each of the readX/writeX routines, since those routines may be called directly, rather than always through the ioreadNN/iowriteNN routines. Examples of the direct calls, via the __raw_readX/writeX macros, are the memcpy_fromio/toio, _memset_c_io, and scr_memcpyw routines. Signed-off-by: Jay Estabrook Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 025a22151c41890e5d30a1d4fb84c547b84d7671 Author: Jay Estabrook Date: Fri Jun 1 00:47:03 2007 -0700 ALPHA: support graphics on non-zero PCI domains This code replaces earlier and incomplete handling of graphics on non-zero PCI domains (aka hoses or peer PCI buses). An option (CONFIG_VGA_HOSE) is set TRUE if configuring a GENERIC kernel, or a kernel for MARVEL, TITAN, or TSUNAMI machines, as these are the machines whose SRM consoles are capable of configuring and handling graphics options on non-zero hoses. All other machines have the option set FALSE. A routine, "find_console_vga_hose()", is used to find the graphics device which the machine's firmware believes is the console device, and it sets a global (pci_vga_hose) for later use in managing access to the device. This is called in "init_arch" on TITAN and TSUNAMI machines; MARVEL machines use a custom version of this routine because of extra complexity. A routine, "locate_and_init_vga()", is used to find the graphics device and set a global (pci_vga_hose) for later use in managing access to the device, in the case where "find_console_vga_hose" has failed. Various adjustments are made to the ioremap and ioportmap routines for detecting and translating "legacy" VGA register and memory references to the real PCI domain. [akpm@linux-foundation.org: don't statically init bss] [akpm@linux-foundation.org: build fix] Signed-off-by: Jay Estabrook Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8778beb981b7e5df3472b05475e4c7905dad1f3d Author: Yoshinori Sato Date: Fri Jun 1 00:47:01 2007 -0700 h8300 trival patches - warning fix. - call trace area check fix. - There is no meaning, ' & ' it deletes Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a9a62bb035b1f74e7d017e3bd48d1c687d7de3c Author: Haavard Skinnemoen Date: Fri Jun 1 00:47:00 2007 -0700 atmel_spi dma address bugfix When either rx_buf or tx_buf is not being used, i.e. for plain read- or write operations, the atmel_spi uses a fixed-size DMA buffer instead. If the transfer is longer than the size of this buffer, it is split into multiple DMA transfers. When the transfer is split like this, the atmel_spi driver ends up using the same DMA address again and again even for the buffer that came from the user, which is of course wrong. Fix this by adding the number of bytes already transferred to the DMA address so that the data ends up in the right place. Thanks to Wu Xuan for discovering this bug. Signed-off-by: Haavard Skinnemoen Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e88b34bade55a51dd23a50de0ac5076cbbb8f4fd Author: Luis R. Rodriguez Date: Fri Jun 1 00:46:57 2007 -0700 prism54: MAINTAINERS update Cc: "John W. Linville" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 924ad158442a5db3e935efcb6131cbffadd6544c Author: Karsten Keil Date: Fri Jun 1 00:46:55 2007 -0700 Fix broken CLIR in isdn driver I noticed that CLIR (aka "hide your calling number") in isdn_tty is broken: The at-command parser filters out the required "R" (e.g. ATDR089123456) It's been broken for a *very* long time. Signed-off-by: Karsten Keil Signed-off-by: Matthias Goebl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bf1dedd1a5fd6f1d8369dfc9bb10056bc886cea Author: Tilman Schmidt Date: Fri Jun 1 00:46:54 2007 -0700 ISDN4Linux: fix maturity label According to the definitions recently posted on LKML, the maturity label for the ISDN4Linux subsystem is wrong. This patch corrects it and also clarifies the accompanying help text a bit. Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 040b6362d58fe9a344e053546c12bf821f6fce99 Author: Oleg Nesterov Date: Fri Jun 1 00:46:53 2007 -0700 tty: fix leakage of -ERESTARTSYS to userland Spotted by Satoru Takeuchi. kill_pgrp(task_pgrp(current)) sends the signal to the current's thread group, but can choose any sub-thread as a target for signal_wake_up(). This means that job_control() and tty_check_change() may return -ERESTARTSYS without signal_pending(). Signed-off-by: Oleg Nesterov Cc: Satoru Takeuchi Cc: Roland McGrath Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13466c8419c3ab3ccd5e905eef53ca49c6c201be Author: Yasunori Goto Date: Fri Jun 1 00:46:53 2007 -0700 memory hotplug: fix unnecessary calling of init_currenty_empty_zone() zone->present_pages is updated in online_pages(). But, __add_zone() can be called twice or more before calling online_pages(). So, init_currenty_empty_zone() can be called unnecessary times. It is cause of memory leak of zone's wait_table. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cd8fa87fbf31b2ab77b8aaec497e7f6a3757578 Author: Matthew Garrett Date: Fri Jun 1 00:46:51 2007 -0700 RTC: use fallback IRQ if PNP tables don't provide one Intel Macs (and possibly other machines) provide a PNP entry for the RTC, but provide no IRQ. As a result the rtc-cmos driver doesn't allow wakeup alarms. If the RTC is located at the legacy ioport range, assume that it's on IRQ 8 unless the tables say otherwise. Signed-off-by: Matthew Garrett Cc: Matthieu CASTET Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 926b28984da035ac407e6b8f22ee8b4f94f51cf1 Author: Pekka Enberg Date: Fri Jun 1 00:46:50 2007 -0700 Documentation: How to use GDB to decode OOPSes Adds instructions how to use GDB to figure out the exact location of an OOPS to Documentation/BUG-HUNTING. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a920b5b666d0be8141bd1ce620fffa7de96b81b Author: Andy Whitcroft Date: Fri Jun 1 00:46:48 2007 -0700 add a trivial patch style checker We are seeing increasing levels of minor patch style violations in submissions to the mailing lists as well as making it into the tree. These detract from the quality of the submission and cause unnessary work for reviewers. As a first step package up the current state of the patch style checker and include it in the kernel tree. Add instructions suggesting running it on submissions. This adds version v0.01 of the checkpatch.pl script. Signed-off-by: Andy Whitcroft Signed-off-by: Joel Schopp Cc: Randy Dunlap Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc913b1899ce0c15ec496d1aa121c36785e0528a Author: Jeff Garzik Date: Fri Jun 1 00:46:47 2007 -0700 misc/tifm_7xx1: replace deprecated irq flag Signed-off-by: Jeff Garzik Cc: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9db71a188bd04114c04b1faa6538f1c4faa0a9a7 Author: Geert Uytterhoeven Date: Fri Jun 1 00:46:46 2007 -0700 fbdev: Move declaration of fb_class to Move the forward declaration of fb_class from drivers/video/console/fbcon.h to , together with the other forward declarations related to drivers/video/fbmem.c. This kills the following sparse warning: | drivers/video/fbmem.c:1363:14: warning: symbol 'fb_class' was not declared. Should it be static? Signed-off-by: Geert Uytterhoeven Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfeeffbb4fb73a32c00d52742850f88e563726a5 Author: Avuton Olrich Date: Fri Jun 1 00:46:45 2007 -0700 cfag12864bfb: Use sys_ instead of cfb_ framebuffer accessors Because the framebuffer memory is allocated system RAM, use the sys_ drawing libraries. It also fixes the following compile error: LD .tmp_vmlinux1 drivers/built-in.o:(.data+0x8b48): undefined reference to `cfb_fillrect' drivers/built-in.o:(.data+0x8b50): undefined reference to `cfb_copyarea' drivers/built-in.o:(.data+0x8b58): undefined reference to `cfb_imageblit' [adaplas] Use fb_sys_read/write for the same reasons as above. Signed-off-by: Avuton Olrich Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38d473f99575f57f5911c7c94922fcf0b0a58b8d Author: Ondrej Zajicek Date: Fri Jun 1 00:46:43 2007 -0700 vt8623fb: arkfb: null pointer dereference fix This patch prevents null pointer dereference in arkfb and vt8623fb. Signed-off-by: Ondrej Zajicek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d9f95f916e926195a57b76064586ea0b1985848 Author: Krzysztof Helt Date: Fri Jun 1 00:46:42 2007 -0700 skeletonfb: fix of xxxfb_setup ifdef This patch fixes wrong ifdef around the xxxfb_setup. It also moves this function to remove forward declaration. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ede66fca23cfee4ee80b48298007d930f49bbe Author: Ulrich Drepper Date: Fri Jun 1 00:46:41 2007 -0700 fix compat futex code for private futexes When the private futex support was added the compat code wasn't changed. The result is that code using compat code which fail, e.g., because the timeout values are not correctly passed. The following patch should fix that. Signed-off-by: Ulrich Drepper Cc: Eric Dumazet Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9e82af823c10d8f981072e0d7c3a8a31f73e0bd Author: Tim Gardner Date: Fri Jun 1 00:46:40 2007 -0700 Work around Dell E520 BIOS reboot bug Force Dell E520 to use the BIOS to shutdown/reboot. I have at least one report that this patch fixes shutdown/reboot problems on the Dell E520 platform. (Andi says: People can always set the boot option. It hardly seems like a critical issue needing a backport.) Signed-off-by: Tim Gardner Acked-by: Andi Kleen Acked-by: Matt Domsch Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0939c17c7bcf1c838bea4445b80a6966809a438f Author: Chris Wright Date: Fri Jun 1 00:46:39 2007 -0700 x86: fix oprofile double free Chuck reports that the recent fix from Andi to oprofile 6c977aad03a18019015035958c65b6729cd0574c introduces a double free. Each cpu's cpu_msrs is setup to point to cpu 0's, which causes free_msrs to free cpu 0's pointers for_each_possible_cpu. Rather than copy the pointers, do a deep copy instead. [acme@redhat.com: allocate_msrs() was using for_each_online_cpu()] Signed-off-by: Chris Wright Cc: Andi Kleen Cc: Alan Cox Cc: Dave Jones Cc: Chuck Ebbert Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24faa9eef876d39e0826a36f31ae0e8b0eeb9835 Author: Jason Gaston Date: Fri Jun 1 00:46:38 2007 -0700 pci_ids: update patch for Intel ICH9M This patch updates the Intel ICH9M LPC Controller DID's, due to a specification change. Signed-off-by: Jason Gaston Cc: Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8343685643f2901fe11aa9d0358cafbeaf7b4c3 Author: Yoann Padioleau Date: Fri Jun 1 00:46:36 2007 -0700 parse errors in ifdefs Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs. Cc: "Luck, Tony" Cc: Ivan Kokshaysky Cc: Richard Henderson Cc: Russell King Cc: Ralf Baechle Cc: Jeff Garzik Cc: Jan Kara Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 632155e659449685b719995d7e7081cff7b01aba Author: Yoann Padioleau Date: Fri Jun 1 00:46:35 2007 -0700 potential parse error in ifdef I have made a tool to parse the kernel that does not pre-process the source. That means that my parser tries to parse all the code, including code in the #else branch or code that is not often compiled because the driver is not very used (or not used at all). So, my parser sometimes reports parse error not originally detected by gcc. Here is my (first) patch. [akpm@linux-foundation.org: fix amd8111e.c] Signed-off-by: Yoann Padioleau Acked-by: Matthew Wilcox Acked-by: Wim Van Sebroeck Acked-by: David Woodhouse Acked-by: Jeff Garzik Acked-by: James Bottomley Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78b7611c4a1e3ff008abc4751b566cb533d68f3d Author: Eric W. Biederman Date: Fri Jun 1 00:46:33 2007 -0700 msi: mask the msix vector before we unmap it With these two lines in the reverse order the drives/block/ccis.c was oopsing in msi_free_irqs. Silly us calling writel on an area after we unmap it. BUG: unable to handle kernel paging request at virtual address f8b2200c printing eip: c01e9cc7 *pdpt = 0000000000003001 *pde = 0000000037e48067 *pte = 0000000000000000 Oops: 0002 [#1] SMP Modules linked in: cciss ipv6 parport_pc lp parport autofs4 i2c_dev i2c_core sunrpc loop dm_multipath button battery asus_acpi ac tg3 floppy sg dm_snapshot dm_zero dm_mirror ext3 jbd dm_mod ata_piix libata mptsas scsi_transport_sas mptspi scsi_transport_spi mptscsih mptbase sd_mod scsi_mod CPU: 1 EIP: 0060:[] Not tainted VLI EFLAGS: 00010286 (2.6.22-rc2-gd2579053 #1) EIP is at msi_free_irqs+0x81/0xbe eax: f8b22000 ebx: f71f3180 ecx: f7fff280 edx: c1886eb8 esi: f7c4e800 edi: f7c4ec48 ebp: 00000002 esp: f5a0dec8 ds: 007b es: 007b fs: 00d8 gs: 0033 ss: 0068 Process rmmod (pid: 5286, ti=f5a0d000 task=c47d2550 task.ti=f5a0d000) Stack: 00000002 f8b72294 00000400 f8b69ca7 f8b6bc6c 00000002 00000000 00000000 00000000 00000000 00000000 f5a997f4 f8b69d61 f7c5a4b0 f7c4e848 f7c4e848 f7c4e800 f7c4e800 f8b72294 f7c4e848 f8b72294 c01e3cdf f7c4e848 c024c469 Call Trace: [] cciss_shutdown+0xae/0xc3 [cciss] [] cciss_remove_one+0xa5/0x178 [cciss] [] pci_device_remove+0x16/0x35 [] __device_release_driver+0x71/0x8e [] driver_detach+0xa0/0xde [] bus_remove_driver+0x27/0x41 [] pci_unregister_driver+0xb/0x13 [] cciss_cleanup+0xf/0x51 [cciss] [] sys_delete_module+0x110/0x135 [] sysenter_past_esp+0x5f/0x85 Here's a patch that just reverses the 2 lines of code as Eric suggests. Please consider this for inclusion. Signed-off-by: Mike Miller Signed-off-by: Chase Maupin Signed-off-by: "Eric W. Biederman" Cc: Andi Kleen Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dd11f9be47188ce08543ef65e9ece9beb2027dc Author: Eric W. Biederman Date: Fri Jun 1 00:46:32 2007 -0700 msi: fix the ordering of msix irqs "Mike Miller (OS Dev)" writes: Found what seems the problem with our vectors being listed backward. In drivers/pci/msi.c we should be using list_add_tail rather than list_add to preserve the ordering across various kernels. Please consider this for inclusion. Signed-off-by: "Eric W. Biederman" Screwed-up-by: Michael Ellerman Cc: "Mike Miller (OS Dev)" Cc: Andi Kleen Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4eb527a0ca83de28e773371f42abad2ab1ed7fdf Author: Mariusz Kozlowski Date: Fri Jun 1 00:46:30 2007 -0700 m68k: parenthesis balance Balance parenthesis in m68k mac debug code. Signed-off-by: Mariusz Kozlowski Acked-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85d71244f02583886dc20a60df2d4657d42116b4 Author: Jan Kara Date: Fri Jun 1 00:46:29 2007 -0700 Fix possible UDF data corruption update_next_aext() could possibly rewrite values in elen and eloc, possibly leading to data corruption when rewriting a file. Use temporary variables instead. Also advance cur_epos as it can also point to an indirect extent pointer. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 296baae254c2e9ead4da5bfa57ecec86750331c7 Author: Jan Altenberg Date: Fri Jun 1 00:46:29 2007 -0700 Add select PHYLIB to the UCC_GETH Kconfig option ucc_geth has been migrated to use the common phylib code. So lets add a 'select PHYLIB' to the UCC_GETH Kconfig entry. Signed-off-by: Jan Altenberg Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e1c49db4c640b35df13889b86b9d62215ade4b6 Author: Zou Nan hai Date: Fri Jun 1 00:46:28 2007 -0700 x86_64: allocate sparsemem memmap above 4G On systems with huge amount of physical memory, VFS cache and memory memmap may eat all available system memory under 4G, then the system may fail to allocate swiotlb bounce buffer. There was a fix for this issue in arch/x86_64/mm/numa.c, but that fix dose not cover sparsemem model. This patch add fix to sparsemem model by first try to allocate memmap above 4G. Signed-off-by: Zou Nan hai Acked-by: Suresh Siddha Cc: Andi Kleen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa0aa866c82e441787e07169cb4925e3b673e891 Author: Alexey Dobriyan Date: Fri Jun 1 00:46:27 2007 -0700 Fix vmi.c compilation Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea55d30798ac206c9f584ac264b6b8eb093d237a Author: Artem Bityutskiy Date: Wed May 30 12:08:14 2007 +0300 [JFFS2] Fix buffer length calculations in jffs2_get_inode_nodes() If we have already read enough bytes, no need to call read_more(). Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 184b812f7da6726d7ea4ca409c7a8762ff6c6df6 Author: Jay Cliburn Date: Sat May 26 17:01:04 2007 -0500 PCI: quirk disable MSI on via vt3351 The Via VT3351 APIC does not play well with MSI and unleashes a flood of APIC errors when MSI is used to deliver interrupts. The problem was recently exposed when the atl1 network device driver, which enables MSI by default, stimulated APIC errors on an Asus M2V mainboard, which employs the Via VT3351. See http://bugzilla.kernel.org/show_bug.cgi?id=8472 for additional details on this bug. Signed-off-by: Jay Cliburn Signed-off-by: Greg Kroah-Hartman commit 73a74ed3a6f8fcb817fdffa2c2718f96d0108b7f Author: Ivan Kokshaysky Date: Wed May 23 14:50:02 2007 -0700 PCI: i386: fixup for Siemens Nixdorf AG FSC Multiprocessor Interrupt Controllers Wolfgang gets: PCI: Cannot allocate resource region 0 of device 0000:00:04.0 PCI: Error while updating region 0000:00:04.0/0 (a8008000 != fec08000) Note that the BAR seems to have high address bits hardwired to fec00000. And device 0000:00:04.0 is 00:04.0 System peripheral: Siemens Nixdorf AG FSC Multiprocessor Interrupt Controller (rev 02) I'd guess that when we try to reassign this resource, PCI interrupts might just stop working. This could explain SCSI timeouts and other weird things. Cc: Wolfgang Erig Cc: Chuck Ebbert Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3c92c57af9a24a08b8d2f76650b1209239914fcd Author: Ben Gardner Date: Thu May 10 22:58:58 2007 -0700 PCI: Fix pci_find_present pci_find_present() is only matching the last item in the list of ids. The break after the match is found only escapes the for loop, not the while loop, so found gets reset to NULL on the next pass. Signed-off-by: Ben Gardner Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e3008dedff4bdc96a5f67224cd3d8d12237082a0 Author: Andy Gospodarek Date: Thu May 10 22:58:57 2007 -0700 PCI: disable MSI by default on systems with Serverworks HT1000 chips I've been seeing lots of messages like these: eth0: No interrupt was generated using MSI, switching to INTx mode. Please report this failure to the PCI maintainer and include system chipset information. On several systems that use the following Severworks HT1000 (also sometimes labeled as a Broadcom chipset as well) bridge chips. It doesn't appear MSI works well (if at all) on these systems. Signed-off-by: Andy Gospodarek Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 4fdadebc313f46a750e9ffca9c68c35c587ced9f Author: Dan Williams Date: Thu Apr 26 18:21:38 2007 -0700 msi: fix ARM compile In file included from drivers/pci/msi.c:22: include/asm/smp.h:17:26: asm/arch/smp.h: No such file or directory include/asm/smp.h:20:3: #error " included in non-SMP build" include/asm/smp.h:23:1: warning: "raw_smp_processor_id" redefined In file included from include/linux/sched.h:65, from include/linux/mm.h:4, from drivers/pci/msi.c:10: include/linux/smp.h:85:1: warning: this is the location of the previous definition Tested on powerpc, i386, and x86_64. Signed-off-by: Dan Williams Acked-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman commit 436bd75e47cf804dfe89f805106bb53ff577e99a Author: Theodore Ts'o Date: Thu May 31 12:43:28 2007 -0400 Define/reserve new ext4 superblock fields Signed-off-by: "Theodore Ts'o" commit 315054f023d28ee64f308adf8b5737831541776b Author: Alex Tomas Date: Thu May 24 13:04:25 2007 -0400 When ext4_ext_insert_extent() fails to insert new blocks we should free just the allocated blocks. Signed-off-by: Alex Tomas Signed-off-by: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 25d14f983f70ddbeb15fa2d0f32f6b70bca42a15 Author: Amit Arora Date: Thu May 24 13:04:13 2007 -0400 ext4: Extent overlap bugfix This patch adds a check for overlap of extents and cuts short the new extent to be inserted, if there is a chance of overlap. Signed-off-by: Amit Arora Signed-off-by: "Theodore Ts'o" commit 8a9dc94498f39c259b011d0abcb89bdf73cafa2d Author: Mingming Cao Date: Thu May 24 13:04:41 2007 -0400 Remove unnecessary exported symbols. Signed-Off-By: Mingming Cao Signed-off-by: "Theodore Ts'o" commit 8c55e20411c9499c52890a081724a8b71f3dc3a1 Author: Dave Kleikamp Date: Thu May 24 13:04:54 2007 -0400 EXT4: Fix whitespace Replace a lot of spaces with tabs Signed-off-by: Dave Kleikamp Signed-off-by: "Theodore Ts'o" commit ca9a7af35f1ce4a990c6c3aace65ed36f89d50bf Author: Kristian Høgsberg Date: Thu May 31 11:36:23 2007 -0400 firewire: Install firewire-constants.h and firewire-cdev.h for userspace. This just adds them to include/linux/Kbuild using header-y. Signed-off-by: Kristian Høgsberg Signed-off-by: Stefan Richter commit 1ca31ae7cfed3e2a8e48fbf6ed6cac06495b6158 Author: Kristian Høgsberg Date: Thu May 31 11:16:43 2007 -0400 firewire: Change struct fw_cdev_iso_packet to not use bitfields. The struct is part of the userspace interface and can not use bitfields. This patch replaces the bitfields with a __u32 'control' word and provides access macros to set the bits. Signed-off-by: Kristian Høgsberg Signed-off-by: Stefan Richter commit 2aef469a35a273609beaa7094d5a07c1f6d75285 Author: Kristian Høgsberg Date: Wed May 30 19:06:35 2007 -0400 firewire: Implement suspend/resume PCI driver hooks. It's a low-impact design, that just makes suspend/resume look like a bus reset to the upper level drivers, but it should be sufficient. Signed-off-by: Kristian Høgsberg Signed-off-by: Stefan Richter commit b32744751e751e0abb184cf3b7359c9387a4bdf8 Author: Stefan Richter Date: Wed May 30 20:44:52 2007 -0400 firewire: add to MAINTAINERS Signed-off-by: Stefan Richter Acked-by: Kristian Høgsberg commit 14e2198646d92ef52a69d20269580a3fbe7c996b Author: Stefan Richter Date: Sun May 27 13:18:27 2007 +0200 firewire: fw-sbp2: implement sysfs ieee1394_id The attribute /sys/bus/scsi/devices/*:*:*:*/ieee1394_id, as generated by the old sbp2 driver, is typically used to create persistently named links in /dev/disk/by-id. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit d7794c86686a05276de42f145e485099426aca68 Author: Stefan Richter Date: Sun May 27 13:17:15 2007 +0200 ieee1394: sbp2: offer SAM-conforming target port ID in sysfs With "modprobe sbp2 long_ieee1394_id=y", the format of /sys/bus/scsi/devices/*:*:*:*/ieee1394_id is changed from e.g. 0001041010004beb:0:0 to 0001041010004beb:00042c:0000. The longer format fully conforms to object identifier sizes as per SAM(-2...4) and reflects what the SAM target port identifier is meant to contain: A Discovery ID allegedly specified by ISO/IEC 13213:1994 --- however there is no such thing; the authors of SAM probably meant Directory ID). Especially target nodes with multiple dynamically added targets may use Directory IDs to persistently identify target ports. The new format is independent of implementation details of nodemgr. Thus the same ieee1394_id attribute format can be implemented in the new firewire stack. The ieee1394_id is typically used to create persistently named links in /dev/disk/by-id. Signed-off-by: Stefan Richter commit a52938f3e2e7c1dd2f00775016703991b7809c42 Author: Stefan Richter Date: Sun May 27 13:11:47 2007 +0200 ieee1394: fix calculation of sysfs attribute "address" struct csr1212_keyval.offset is relative to 0xffff f000 0000 rather than 0xffff f000 0400. Signed-off-by: Stefan Richter commit cc4c24e115ca7bc2e4ec74d70bcb8fda1d1a8df8 Author: Henrique de Moraes Holschuh Date: Wed May 30 20:50:14 2007 -0300 ACPI: thinkpad-acpi: do not use named sysfs groups The initial version of the thinkpad-acpi sysfs interface (not yet released in any stable mainline kernel) made liberal use of named sysfs groups, in order to get the attributes more organized. This proved to be a really bad design decision. Maybe if attribute groups were as flexible as a real directory, and if binary attributes were not second-class citizens, the idea of subdirs and named groups would not have been so bad. This patch makes all the thinkpad-acpi sysfs groups anonymous (thus removing the subdirs), adds the former group names as a prefix (so that hotkey/enable becomes hotkey_enable for example), and updates the documentation. These changes will make the thinkpad-acpi sysfs ABI a lot easier to maintain. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 3ecb0a5a7b567c9719d61938bcdba22938084b65 Author: Peter Oberparleiter Date: Thu May 31 17:38:07 2007 +0200 [S390] cio: deregister ccw device when pgid disband failed Deregister ccw device when device failure is detected during offline- processing (e.g. when no last-path-gone indication was presented by the hardware) to prevent the device from entering a non-recoverable not-operational state. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 59a8a6e227cf0bc42e5be741ebfea97c222ab9ef Author: Cornelia Huck Date: Thu May 31 17:38:06 2007 +0200 [S390] cio: Use device_schedule_callback() for removing disconnected devices. We can't deregister disconnected and orphaned devices directly from the online attribute's store method, but must take a detour. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit ea1f4eece943968940a399c72c1ca675d51e466e Author: Heiko Carstens Date: Thu May 31 17:38:05 2007 +0200 [S390] Fix section annotations. Use the __cpuinit instead of __devinit section annotations for code that deals with cpu hotplug. In addition add some more annotations on functions that have been left out so far. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit d330f93595a4eb100118c8af50012d6b0dc559e3 Author: Christoph Hellwig Date: Thu May 31 17:38:04 2007 +0200 [S390] raw3270: use mutex instead of semaphore Signed-off-by: Christoph Hellwig Signed-off-by: Martin Schwidefsky commit e11f0d04c6bc6bcf301bc60c060c4ac346e61885 Author: Christoph Hellwig Date: Thu May 31 17:38:03 2007 +0200 [S390] arch/s390/kernel/debug.c: use mutex instead of semaphore Signed-off-by: Christoph Hellwig Signed-off-by: Martin Schwidefsky commit 3006d7c67139e5173cf58986c7b6e080a893e2ac Author: Christoph Hellwig Date: Thu May 31 17:38:02 2007 +0200 [S390] dasd_eer: use mutex instead of semaphore Signed-off-by: Christoph Hellwig Signed-off-by: Martin Schwidefsky commit c41d4e3e688e338418311f449a4c68f6cb8eabbb Author: Michael Holzheu Date: Thu May 31 17:38:01 2007 +0200 [S390] Add exception handler for diagnose 224 To be able to run with the diagnose 224 switched off, a potential specification exception has to be handled. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 12d810c1b8c2b913d48e629e2b5c01d105029839 Author: Roman Zippel Date: Thu May 31 00:40:54 2007 -0700 m68k: discontinuous memory support Fix support for discontinuous memory Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00c541eae7a477e3d1adb1ebf27cccc0bdb5f824 Author: Andrew Morton Date: Thu May 31 00:40:52 2007 -0700 afs: needs sched.h mips: fs/afs/flock.c: In function `afs_lock_may_be_available': fs/afs/flock.c:55: error: dereferencing pointer to incomplete type fs/afs/flock.c: In function `afs_lock_work': fs/afs/flock.c:84: error: dereferencing pointer to incomplete type fs/afs/flock.c:89: error: dereferencing pointer to incomplete type fs/afs/flock.c:109: error: dereferencing pointer to incomplete type fs/afs/flock.c:135: error: dereferencing pointer to incomplete type fs/afs/flock.c:143: error: dereferencing pointer to incomplete type fs/afs/flock.c:158: error: dereferencing pointer to incomplete type fs/afs/flock.c:161: error: dereferencing pointer to incomplete type fs/afs/flock.c:179: error: `TASK_UNINTERRUPTIBLE' undeclared (first use in this function) fs/afs/flock.c:179: error: (Each undeclared identifier is reported only once fs/afs/flock.c:179: error: for each function it appears in.) fs/afs/flock.c:179: error: `TASK_INTERRUPTIBLE' undeclared (first use in this function) fs/afs/flock.c:182: error: dereferencing pointer to incomplete type Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ffa68755a0eddf3baeecd0e7612a5106cf2db23 Author: Christoph Lameter Date: Thu May 31 00:40:51 2007 -0700 SLUB: Fix NUMA / SYSFS bootstrap issue We need this patch in ASAP. Patch fixes the mysterious hang that remained on some particular configurations with lockdep on after the first fix that moved the #idef CONFIG_SLUB_DEBUG to the right location. See http://marc.info/?t=117963072300001&r=1&w=2 The kmem_cache_node cache is very special because it is needed for NUMA bootstrap. Under certain conditions (like for example if lockdep is enabled and significantly increases the size of spinlock_t) the structure may become exactly the size as one of the larger caches in the kmalloc array. That early during bootstrap we cannot perform merging properly. The unique id for the kmem_cache_node cache will match one of the kmalloc array. Sysfs will complain about a duplicate directory entry. All of this occurs while the console is not yet fully operational. Thus boot may appear to be silently failing. The kmem_cache_node cache is very special. During early boostrap the main allocation function is not operational yet and so we have to run our own small special alloc function during early boot. It is also special in that it is never freed. We really do not want any merging on that cache. Set the refcount -1 and forbid merging of slabs that have a negative refcount. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbe9c9612930e0604dc99ef2da7e063fa3278817 Author: Roman Zippel Date: Thu May 31 00:40:50 2007 -0700 m68k: runtime patching infrastructure Add the basic infrastructure to allow runtime patching of kernel and modules to optimize a few functions with parameters, which are only calculated once during bootup and are otherwise constant. Use this for the conversion between virtual and physical addresses. Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fc799e1b4efdbc405d87d9f154d64d9bc299e5c Author: Andrew Morton Date: Thu May 31 00:40:49 2007 -0700 ntfs_init_locked_inode(): fix array indexing Local variable `i' is a byte-counter. Don't use it as an index into an array of le32's. Reported-by: "young dave" Cc: "Christoph Lameter" Acked-by: Anton Altaparmakov Cc: Cc: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebdf7d399e67499dbd2a6b5154805fb049846cbb Author: Tejun Heo Date: Thu May 31 00:40:48 2007 -0700 pci-quirks: fix MSI disabling on RS400-200 and RS480 Commit c0affe9db42bf85f4a606b3262c35ec59a5d3788 doesn't work because the host controller is being quirked not a PCI bridge. This patch reverts the commit, rename quirk_svw_msi() to quirk_disable_all_msi() and use it instead. Signed-off-by: Tejun Heo Cc: Matias Alejandro Torres Cc: Greg K-H Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1aee215d760175601b820bd1e2f0364e844ff8c Author: Christoph Lameter Date: Thu May 31 00:40:47 2007 -0700 SLUB: More documentation Update documentation to describe how to read a SLUB error report. Add slub parameters to Documentation/kernel-parameters. Signed-off-by: Christoph Lameter Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9af20376ee65cd2d13f7eb587fab70879d8c355b Author: Marc Pignat Date: Thu May 31 00:40:44 2007 -0700 at91: fix enable/disable_irq_wake symmetry in pcmcia driver Fix enable_irq_wake and disable_irq_wake symmetry in at91 pcmcia driver disable_irq_wake call must be symmetric with enable_irq_wake. This patch fix that problem for the at91_pcmia driver. It seems that this patch was forgotten when we've fixed irq_wake symmetry in all at91 related drivers. It was discussed in the "at91 drivers and [enable/disable]_irq_wake (wrong?) usage" thread on the linux-arm-kernel mailing list. Signed-off-by: Marc Pignat Cc: David Brownell Cc: Russell King Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Andrew Victor Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8387c1a46376b8cfc5f4751b27a6c90f930992cf Author: Linus Torvalds Date: Thu May 31 07:55:16 2007 -0700 smpboot: fix cachesize comparison in smp_tune_scheduling() Jarek Poplawski noted that boot_cpu_data.x86_cache_size is signed int and can be < 0 too. In fact we test for it. Except we assigned it to an unsigned value.. Cc: Jarek Poplawski Cc: Ingo Molnar Cc: Nick Piggin Cc: Andi Kleen Cc: Andrew Morton Signed-off-by: Linus Torvalds commit a2b7d2e97edcad0e95ae0d3c253d3f2f69254fa4 Author: Antonino A. Daplas Date: Thu May 31 14:04:57 2007 +0800 neofb: Fix pseudo_palette array overrun in neofb_setcolreg The pseudo_palette has room for 16 entries only, but in truecolor mode, it attempts to write 256. Signed-off-by: Antonino Daplas Acked-by: Tero Roponen Signed-off-by: Linus Torvalds commit 672cc6c6c72673570b5ca44fe8a8b9ed604f5a4f Author: Jaroslav Kysela Date: Thu May 31 11:03:27 2007 +0200 [ALSA] version 1.0.14 Signed-off-by: Jaroslav Kysela commit 8a73709ecc6a972c94e6ff9c0cc639f8f38b9151 Author: Horst H. von Brand Date: Thu May 31 01:27:52 2007 -0700 [SPARC]: Missing #include in drivers/sbus/char/flash.c drivers/sbus/char/flash.c does use macros VM_READ and such, needs to include linux/mm.h. Signed-off-by: Horst H. von Brand Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 1fb8812ba5a4c34b680d4405216310233f3c7573 Author: Andrew Morton Date: Thu May 31 01:19:24 2007 -0700 [SPARC32]: Build fix. Fix 6197fe4d720ea3e2ee94cdc7ef32d6c0151199de arch/sparc/lib/atomic32.c: In function '__cmpxchg_u32': arch/sparc/lib/atomic32.c:127: error: 'addr' undeclared (first use in this function) arch/sparc/lib/atomic32.c:127: error: (Each undeclared identifier is reported only once arch/sparc/lib/atomic32.c:127: error: for each function it appears in.) I assume this is what was intended.. Signed-off-by: Andrew Morton Acked-by: William Irwin Signed-off-by: David S. Miller commit dbbe3cb8cff6b494ac2cba6a94dc7aabe7e5b635 Author: David S. Miller Date: Wed May 30 19:01:47 2007 -0700 [SPARC64]: Add missing NCS and SVC hypervisor interfaces. Signed-off-by: David S. Miller commit 85553ddafc5415534bcbe63ffa3af6506e6a754e Author: David S. Miller Date: Thu May 31 01:34:55 2007 -0700 [IPSEC]: Add xfrm_sysctl.txt. And use it to document new xfrm_acq_expires sysctl. Signed-off-by: David S. Miller commit 9a834b87c5544c347fd788cd9d4eb276402ab54a Author: Stephen Hemminger Date: Thu May 31 01:21:39 2007 -0700 [BRIDGE]: Round off STP perodic timers. Peroidic STP timers don't have to be exact. The hold timer runs at 1HZ, and the hello timer normally runs at 2HZ; save power by aligning it them to next second. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 071f7722686151817855195654f16a0b65d9473c Author: Baruch Even Date: Thu May 31 01:20:45 2007 -0700 [BRIDGE]: Reduce frequency of forwarding cleanup timer in bridge. The bridge cleanup timer is fired 10 times a second for timers that are at least 15 seconds ahead in time and that are not critical to be cleaned asap. This patch calculates the next time to run the timer as the minimum of all timers or a minimum based on the current state. Signed-off-by: Baruch Even Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 67403754bceda484a62a697878ff20a0e8d3aae6 Author: Stephen Hemminger Date: Tue May 29 13:24:51 2007 -0700 [TCP] tcp_probe: use GCC printf attribute The function in tcp_probe is printf like, use GCC to check the args. Sighed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 63313494c4419bd5d60b4f3ef8970a98525ac9d3 Author: Sangtae Ha Date: Tue May 29 13:24:11 2007 -0700 [TCP] tcp_probe: a trivial fix for mismatched number of printl arguments. Just a fix to correct the number of printl arguments. Now, srtt is logging correctly. Signed-off-by: Sangtae Ha Signed-off-by: David S. Miller commit 4540250be1d724943a55eb9668e6edc1aaae28c4 Author: YOSHIFUJI Hideaki Date: Tue May 29 13:23:34 2007 -0700 [IPV6] ADDRCONF: Fix conflicts in DEVCONF_xxx constant. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit b0ba66671a92f7d12fdbc42592d36e678f713efc Author: Herbert Xu Date: Tue May 29 13:22:52 2007 -0700 [NET] napi: Call __netif_rx_complete in netif_rx_complete This patch kills a little bit of code duplication between the two variants of netif_rx_complete. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e4fd5da39f99d5921dda1fe3d93652fbd925fbfd Author: Pavel Emelianov Date: Tue May 29 13:19:18 2007 -0700 [TCP]: Consolidate checking for tcp orphan count being too big. tcp_out_of_resources() and tcp_close() perform the same checking of number of orphan sockets. Move this code into common place. Signed-off-by: Pavel Emelianov Signed-off-by: David S. Miller commit 4e07a91c37c69ec1647c218214591ee4fe3408fe Author: Arnaldo Carvalho de Melo Date: Tue May 29 13:17:47 2007 -0700 [SOCK]: Shrink struct sock by 8 bytes on 64-bit. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit be02097cf6342eb0426833f54c95e0fb4c9bca45 Author: David S. Miller Date: Tue May 29 13:16:31 2007 -0700 [AF_PACKET]: Kill CONFIG_PACKET_SOCKET. Always set, but af_packet.c, not by the Kconfig subsystem, so just get rid of it. Signed-off-by: David S. Miller commit 8c7fc03e27167425a1396320da43533462556b0c Author: David S. Miller Date: Tue May 29 13:15:41 2007 -0700 [IPV6]: Fix build warning. net/ipv6/ip6_fib.c: In function ‘fib6_add_rt2node’: net/ipv6/ip6_fib.c:661: warning: label ‘out’ defined but not used Signed-off-by: David S. Miller commit a2efcfa04865eaaa88b870f4babf12f4c1fc4f83 Author: David S. Miller Date: Tue May 29 13:12:50 2007 -0700 [AF_PACKET]: Kill bogus CONFIG_PACKET_MULTICAST It is unconditionally set by af_packet.c, not by the Kconfig subsystem, so just kill it off. Signed-off-by: David S. Miller commit ddc31ce311b65fc3c30ec9ca5baf688a882260bc Author: David S. Miller Date: Tue May 29 13:06:51 2007 -0700 [IPV4]: Kill references to bogus non-existent CONFIG_IP_NOSIOCRT Signed-off-by: David S. Miller commit f282d45cb496e3960046afd3d5f241265eda6fde Author: Kazunori MIYAZAWA Date: Tue May 29 13:03:17 2007 -0700 [IPSEC]: Fix panic when using inter address familiy IPsec on loopback. Signed-off-by: Kazunori MIYAZAWA Signed-off-by: David S. Miller commit 83f03fa5adbad0a829424241ad24ef9e4b4ba585 Author: Jerome Borsboom Date: Tue May 29 12:59:54 2007 -0700 [NET]: parse ip:port strings correctly in in4_pton in4_pton converts a textual representation of an ip4 address into an integer representation. However, when the textual representation is of in the form ip:port, e.g. 192.168.1.1:5060, and 'delim' is set to -1, the function bails out with an error when reading the colon. It makes sense to allow the colon as a delimiting character without explicitly having to set it through the 'delim' variable as there can be no ambiguity in the point where the ip address is completely parsed. This function is indeed called from nf_conntrack_sip.c in this way to parse textual ip:port combinations which fails due to the reason stated above. Signed-off-by: Jerome Borsboom Signed-off-by: David S. Miller commit 7ebba6d14f8d63cad583bf1cc0330b601d5a8171 Author: YOSHIFUJI Hideaki Date: Tue May 29 01:13:24 2007 -0700 [IPV6] ROUTE: No longer handle ::/0 specially. We do not need to handle ::/0 routes specially any longer. This should fix BUG #8349. Signed-off-by: YOSHIFUJI Hideaki Acked-by: Yuji Sekiya Signed-off-by: David S. Miller commit 144466bdf8c479ae36678ace7a3b8e8b748df6f6 Author: Kazunori MIYAZAWA Date: Fri May 25 01:22:25 2007 -0700 [IPSEC]: Fix IPv6 AH calculation in outbound Signed-off-by: Kazunori MIYAZAWA Signed-off-by: David S. Miller commit aad0e0b9b6e4f7085d5e2ec4b5bb59ffecd8b1fb Author: David S. Miller Date: Fri May 25 00:42:49 2007 -0700 [XFRM]: xfrm_larval_drop sysctl should be __read_mostly. Signed-off-by: David S. Miller commit 01e67d08faa782f1a4d38de702331f5904def6ad Author: David S. Miller Date: Fri May 25 00:41:38 2007 -0700 [XFRM]: Allow XFRM_ACQ_EXPIRES to be tunable via sysctl. Signed-off-by: David S. Miller commit 4738d2fa5986d3717055d8ee14b2aad87c30f1e7 Author: David S. Miller Date: Thu May 24 20:59:26 2007 -0700 [CASSINI]: Fix printk message typo. Signed-off-by: David S. Miller commit 189fe3174ce93f4c949325426c87c4d875a13424 Author: Rafael J. Wysocki Date: Thu May 31 18:10:22 2007 +1000 [CRYPTO] cryptd: Fix problem with cryptd and the freezer Make sure that cryptd is marked as nonfreezable and does not hold up the freezer. Signed-off-by: Rafael J. Wysocki Signed-off-by: Herbert Xu commit 897cc188f7f0e402b92a4a6a9e234b45c612eb42 Author: Takashi Iwai Date: Tue May 29 19:01:37 2007 +0200 [ALSA] hda-codec - Fix STAC922x capture boost level STAC922x provides the capture boost level up to 4, but actually it works only up to 2. Since the range of the mixer is automatically defined from amp-capability bits, we need to override the value beforehand. snd_hda_override_amp_caps() is introduced for this purpose. The function patch_stac922x() calls this for NID 0x12 (Mux Capture Volume). This should fix another recording problem on Intel Macs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f9acba4347ac2145456aa8dedaab3d74761da42a Author: Takashi Iwai Date: Tue May 29 18:01:06 2007 +0200 [ALSA] hda-codec - Fix input with STAC92xx The recent fix for STAC92xx surround outputs broke the input pin setting for shared line-in and mic jacks. This patch fixes the breakage. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7353e14d91b78dc6da0d93fb081346c5ef854876 Author: Steve Longerbeam Date: Tue May 29 14:36:17 2007 +0200 [ALSA] hda-codec - Fix pin configs for Gateway MX6453 Fix pin default configs for speaker associations and sequence for Gateway MX6453 machine with STAC925x codecs. Signed-off-by: Steve Longerbeam Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 799f88a3126cae3e59409f135da925cb0c1bc2c1 Author: Tobin Davis Date: Tue May 29 14:29:08 2007 +0200 [ALSA] hda-codec - Add support for MSI K9N Ultra This patch adds the MSI K9N Ultra system to the realtek patch. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e60623b406ff3f8fea145466557f22daea671ae1 Author: Daniel T Chen Date: Tue May 29 03:41:55 2007 -0400 [ALSA] hda-codec - Add quirk for Supermicro PDSBA to alc883_cfg_tbl[] Tested and verified in #alsa/Freenode on Tuesday, May 29, 2007. Signed-off-by: Daniel T Chen Signed-off-by: crimsun@Box.ncat.edu Signed-off-by: Jaroslav Kysela commit dd146a60cb70a843a8b3a21560fdcfb4c0c9c850 Author: Baruch Even Date: Fri May 25 12:18:49 2007 +0200 [ALSA] hda-codec - Add quirk for MSI S420 Add a quirk for MSI S420 (based on a guess work). From: Baruch Even Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c72816b79e9735284b3c0f6b3a4aa4e1c0537c0d Author: Zoltan Devai Date: Tue May 22 16:17:05 2007 +0200 [ALSA] Fix ASoC s3c24xx-pcm spinlock bug This should fix a spinlock lockup bug on the s3c24xx arch. From: Zoltan Devai Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 36c3b4e60a83187e82bc9bcde854e765bde3d670 Author: Daniel Drake Date: Mon May 21 12:27:57 2007 +0200 [ALSA] hda-intel: fix ASUS M2V detection Commit f32610edab47f36946d23b883aeae91e15986121 added ALC660VD support, but this caused a 2.6.21 regression for some users. The ASUS M2V device is now detected as ALC660VD rather than ALC660/861 but the PCI quirk was not carried over. This patch allows affected users to use audio again. http://bugzilla.kernel.org/show_bug.cgi?id=8273 https://bugs.gentoo.org/show_bug.cgi?id=178243 Signed-off-by: Daniel Drake Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2704364248378193a24505e414dbfd4201053349 Author: Takashi Iwai Date: Sat May 19 16:30:35 2007 +0200 [ALSA] ali5451 - Fix possible NULL dereference Reported by Eric Sesterhenn. Fix the wrong checks of extra voice pointer, which may cause NULL dereferences. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 3b542985edeed1a1af124ee055e2d35a30489d93 Author: Christian Rothlaender Date: Fri May 18 16:55:26 2007 +0200 [ALSA] hda-codec - Add support for ASUS A8J modem This patch adds support for the ASUS A8J Series 56k Modem (Motorola SM56) Signed-off-by: Christian Rothlaender Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit fb3409e71f0e5cb3e22327eba2e4d6fbd51d54df Author: Tobin Davis Date: Thu May 17 09:40:47 2007 +0200 [ALSA] HDA: Fix headphone mute issue on non-eapd Conexant systems This patch fixes an automute code issue for systems that do not rely on eapd support. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 49c605db8d75216f88c3a57cfed3adfaddb71c6a Author: Tobin Davis Date: Thu May 17 09:38:24 2007 +0200 [ALSA] HDA: Add more systems to Sigmatel codec This patch adds more Dell systems and a Panasonic laptop with STAC9200 codecs. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2c11f955b27edaf0270185781391abe6f39b7ed0 Author: Tobin Davis Date: Thu May 17 09:36:34 2007 +0200 [ALSA] HDA: Add support for Gateway NX860 This patch adds support for the Gateway NX860 system. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4e1c20842044da32f771631049b7082dad63a9c5 Author: Andrew Morton Date: Thu May 31 13:48:57 2007 +0900 sh: support older gcc's Make my version of gcc happy. Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit 66c5227ecd3041b0467a091ad81b8d312e572ea8 Author: Evgeniy Polyakov Date: Thu May 31 13:46:21 2007 +0900 sh: trivial build cleanups. Several errors were spotted during building for custom config (SMP included). Although SMP still does not compile (no ipi and __smp_call_function) and does not work, this looks a bit cleaner. Some other errors obtained via gcc-4.1.0 build. Signed-off-by: Evgeniy Polyakov Signed-off-by: Paul Mundt commit f75522cea12fe1ed9336c1a02b170bd06383e8a3 Author: Manuel Lauss Date: Thu May 31 13:44:55 2007 +0900 sh: Fix vsyscall build failure. CC arch/sh/kernel/vsyscall/vsyscall.o a/arch/sh/kernel/vsyscall/vsyscall.c: In function 'arch_setup_additional_pages': a/arch/sh/kernel/vsyscall/vsyscall.c:63: error: dereferencing pointer to incomplete type a/arch/sh/kernel/vsyscall/vsyscall.c:67: error: dereferencing pointer to incomplete type a/arch/sh/kernel/vsyscall/vsyscall.c:82: error: dereferencing pointer to incomplete type a/arch/sh/kernel/vsyscall/vsyscall.c:85: error: dereferencing pointer to incomplete type a/arch/sh/kernel/vsyscall/vsyscall.c: In function 'arch_vma_name': a/arch/sh/kernel/vsyscall/vsyscall.c:91: error: dereferencing pointer to incomplete type Signed-off-by: Manuel Lauss Signed-off-by: Paul Mundt commit bdff33ddd906b2ab9eb70e9098f507fac6d56b70 Author: Manuel Lauss Date: Thu May 31 13:44:17 2007 +0900 sh: Trivial fix for dma-api compile failure. Trivial fix for arch/sh/drivers/dma/dma-api.c compile failure: CC arch/sh/drivers/dma/dma-api.o a/arch/sh/drivers/dma/dma-api.c: In function 'dma_wait_for_completion': a/arch/sh/drivers/dma/dma-api.c:233: error: 'TASK_UNINTERRUPTIBLE' undeclared (first use in this function) a/arch/sh/drivers/dma/dma-api.c:233: error: (Each undeclared identifier is reported only once a/arch/sh/drivers/dma/dma-api.c:233: error: for each function it appears in.) a/arch/sh/drivers/dma/dma-api.c:233: warning: implicit declaration of function 'schedule' Signed-off-by: Manuel Lauss Signed-off-by: Paul Mundt commit 370ac91aab8403d74c2b59c3b43692eaed4ef268 Author: Takashi YOSHII Date: Thu May 31 13:42:21 2007 +0900 sh: Fix pcrel too far for in_nmi label. Add lost in_nmi definition to solve pcrel too far. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 3f0a6766e0cc5a577805732e5adb50a585c58175 Author: Bryan Wu Date: Thu May 31 11:31:55 2007 +0800 a bug in ramfs_nommu_resize function, passing old size to vmtruncate It should be pass "newsize" to vmtruncate function to modify the inode->i_size, while the old size is passed to vmtruncate. This bug was caught by LTP truncate test case on Blackfin platform. After it was fixed, the LTP truncate test case passed. Signed-off-by: Bryan Wu Cc: David Howells Signed-off-by: Linus Torvalds commit b4946ffb1860597b187d78d61ac6504177eb0ff8 Author: Trond Myklebust Date: Wed May 30 12:58:00 2007 -0400 NFS: Fix a refcount leakage in O_DIRECT The current code is leaking a reference to dreq->kref when the calls to nfs_direct_read_schedule() and nfs_direct_write_schedule() return an error. This patch moves the call to kref_put() from nfs_direct_wait() back into nfs_direct_read() and nfs_direct_write() (which are the functions that actually took the reference in the first place) fixing the leak. Thanks to Denis V. Lunev for spotting the bug and proposing the original fix. Acked-by: Denis V. Lunev Acked-by: Chuck Lever Signed-off-by: Trond Myklebust commit 7a74fc4925067c2102175baef73f9b07ab519b71 Author: Kyle McMartin Date: Wed May 30 02:43:16 2007 -0400 fix possible null ptr deref in kallsyms_lookup ugh, this function gets called by our unwinder. recursive backtrace for the win... bisection to find this one was "fun." Signed-off-by: Kyle McMartin Signed-off-by: Linus Torvalds commit b927b3e2c9bc39b7eeeaca91e4cd6c3ed59f165a Author: Richard Henderson Date: Tue May 29 16:03:28 2007 -0700 alpha: support new syscalls Some of the new syscalls require supporting TIF_RESTORE_SIGMASK. Signed-off-by: Richard Henderson Signed-off-by: Linus Torvalds commit 74fd1b687fbeba566ceb59cc1fdbc7a64c5e0c0b Author: Richard Henderson Date: Tue May 29 16:01:35 2007 -0700 alpha: cleanup in bitops.h Remove 2 functions private to the alpha implemetation, in favor of similar functions in . Provide a more efficient version of the fls64 function for pre-ev67 alphas. Signed-off-by: Richard Henderson Signed-off-by: Linus Torvalds commit cdea460643072e1ee3647434aa254b5b81364f68 Author: Russell King Date: Wed May 30 17:48:45 2007 +0100 [ARM] Fix some section mismatch warnings The following patch fixes these section mismatch warnings: WARNING: arch/arm/mach-at91/built-in.o(.text+0xdf4): Section mismatch: reference to .init.data:dk_nand_partition (between 'nand_partitions' and 'at91_leds_event') WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (after 'nand_partitions') WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (between 'nand_partitions' and 'ads7843_pendown_state') WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (after 'nand_partitions') WARNING: arch/arm/mach-at91/built-in.o(.text+0xc28): Section mismatch: reference to .init.data:kb9202_nand_partition (after 'nand_partitions') WARNING: arch/arm/mach-footbridge/built-in.o(.text+0xaa4): Section mismatch: reference to .init.data:cats_pci (between 'cats_pci_init' and 'ebsa285_leds_event')WARNING: arch/arm/mach-ixp2000/built-in.o(.text+0xb54): Section mismatch: reference to .init.text:ixp2000_init_irq (between 'ixdp2x00_init_irq' and 'ixdp2x00_irq_handler') WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x670): Section mismatch: reference to .init.text:ixp23xx_pci_common_init (between 'ixp23xx_pci_slave_init' and 'ixp23xx_pci_scan_bus') WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x890): Section mismatch: reference to .init.text:ixp23xx_init_irq (between 'ixdp2351_init_irq' and 'roadrunner_pci_preinit') WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x9a8): Section mismatch: reference to .init.text:ixp23xx_pci_preinit (after 'roadrunner_pci_preinit') WARNING: arch/arm/mach-imx/built-in.o(__ksymtab+0x80): Section mismatch: reference to .init.text:imx_set_mmc_info (between '__ksymtab_imx_set_mmc_info' and '__ksymtab_set_imx_fb_info') WARNING: arch/arm/mach-imx/built-in.o(__ksymtab+0x88): Section mismatch: reference to .init.text:set_imx_fb_info (after '__ksymtab_set_imx_fb_info') WARNING: arch/arm/mach-sa1100/built-in.o(.text+0x1930): Section mismatch: reference to .init.data:neponset_port_fns (between 'neponset_probe' and 'assabet_leds_event') WARNING: drivers/built-in.o(.text+0x3f100): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted') WARNING: drivers/built-in.o(.text+0x3f1c8): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted') WARNING: drivers/built-in.o(.text+0x4f988): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted') WARNING: drivers/built-in.o(.text+0x4fa50): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted') Signed-off-by: Sam Ravnborg Acked-by: Lennert Buytenhek Signed-off-by: Russell King commit 88f5774b0748d6d9ebec7a39caae98c0d83b8cc8 Author: Bill Nottingham Date: Wed May 30 04:16:43 2007 -0400 [SCSI] qla2xxx: fix timeout in qla2x00_down_timeout iterations is unsigned, so it is impossible to get out of the loop and return -ETIMEDOUT. Signed-off-by: Bill Nottingham Acked-by: Seokmann Ju Signed-off-by: James Bottomley commit f2f027c6e9912840020be8b78f037d5c8ac665e0 Author: Hugh Dickins Date: Wed May 23 14:41:42 2007 -0700 [SCSI] fix CONFIG_SCSI_WAIT_SCAN=m CONFIG_MODULES=y CONFIG_SCSI=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_WAIT_SCAN=m 2.6.21-rc5-mm2 VFS panics unable to find my root on /dev/sda2, but boots okay if I change drivers/scsi/Kconfig to "default y" instead of "default m" for SCSI_WAIT_SCAN. Make sure there's a late_initcall to scsi_complete_async_scans when it's built in, so a monolithic SCSI_SCAN_ASYNC kernel can rely on the scans being completed before trying to mount root, even if they're slow. [akpm@linux-foundation.org: build fixes] Signed-off-by: Hugh Dickins Acked-by: Matthew Wilcox Signed-off-by: James Bottomley commit ade21372b7c6927861845d65432ff0b0b1142ca0 Author: Thomas Klein Date: Wed May 30 12:39:23 2007 +0200 ehea: Fixed multi queue RX bug Must access the respective queue's dummy netdev instead of the port's netdev. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit d8511f83015032ab983073bdbc78bc4aca3eaf9e Author: Stephen Hemminger Date: Thu May 24 15:22:47 2007 -0700 sky2: enable IRQ on duplex renegotiation Don't want IRQ on FIFO error because there is nothing useful to do with it. But do want IRQ on duplex change. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 47313054352b879a2bc65379d55b05f48a0af7ec Author: Herbert Xu Date: Tue May 29 15:07:31 2007 -0700 e1000: restore netif_poll_enable call but make sure IRQs are off This restores the previously removed netif_poll_enable call in e1000_open. It's needed on all but the first call to e1000_open for a NIC as e1000_close always calls netif_poll_disable. netif_poll_enable can only be called safely if no polls have been scheduled. This should be the case as long as we don't enter our IRQ handler. In order to guarantee this we explicitly disable IRQs as early as possible when we're probing the NIC. Signed-off-by: Herbert Xu Cc: "Kok, Auke" Cc: Jeff Garzik Cc: Andrew Morton Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 8a32352661cc8e942897d205ba18f871ef7be597 Author: Maciej W. Rozycki Date: Tue May 29 16:12:22 2007 +0100 defxx: Fix the handling of ioremap() failures If ioremap_nocache() is unfortunate enough to fail, the error code is not set correctly leading to a false success from dfx_register(). This change fixes the problem. Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit 34dd962b748bdb4f96fc5e6e69dc66522924f489 Author: Stephen Hemminger Date: Thu May 24 15:22:45 2007 -0700 sky2: program proper register for fiber PHY Driver was reading value from one register, setting bit and then writing the wrong register. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 56069c0fdd3a4db5769df30c9700cd3bc002fc48 Author: Stephen Hemminger Date: Thu May 24 15:22:44 2007 -0700 sky2: checksum offload plus vlan bug Driver was not correctly setting up transmit descriptor when doing VLAN tag insertion with checksum offload. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit b4ed372b29e458021293e1c791d92d90f1bf5fe3 Author: Stephen Hemminger Date: Thu May 24 15:22:43 2007 -0700 sky2: dont set bogus bit in PHY register This code inherited from the sk98lin driver is incorrect on the Yukon2. The GPHY_CTRL register values are specific to the internal PHY of the chip and the values used were leftovers. Driver was setting bit 13 which is now the INT polarity for the PHY! Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 2389b272168ceec056ca1d8a870a97fa9c26e11a Author: Thomas Gleixner Date: Tue May 29 21:53:50 2007 +0100 [ARM] 4417/1: Serial: Fix AMBA drivers locking The -rt patch triggered a lockdep warning in the amba serial drivers, which never shows up on UP kernels. On SMP systems this would trigger as well. Release the port lock before calling tty_flip_buffer_push() and reacquire it after the call. This matches the code in the 8250 serial driver. Signed-off-by: Thomas Gleixner Signed-off-by: Russell King commit 2ccdd1e77da52ad494e9af46bf272d816830cb28 Author: Catalin Marinas Date: Fri May 18 11:25:31 2007 +0100 [ARM] 4394/1: ARMv7: Add the TLB range operations We are currently using the ARMv6 operations but need to duplicate some of the code because of the introduction of the new CPU barrier instructions in ARMv7. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 919a84292070949691346adaf3dfba642f12329e Author: Michael-Luke Jones Date: Sun May 27 21:33:28 2007 +0100 [ARM] 4410/1: Remove extern declarations in coyote/ixdpg425-pci.c This patch removes apparently unnecessary extern declarations in coyote-pci.c and ixdpg425-pci.c within arch/arm/mach-ixp4xx and has been compile-tested without producing warnings or errors. Kernel coding style forbids the use of extern declarations within .c files. Signed-off-by: Michael-Luke Jones Signed-off-by: Russell King commit 1ff082882f0f36536ab91b020573607668f9bb61 Author: Ben Dooks Date: Mon May 28 19:03:47 2007 +0100 [ARM] 4416/1: NWFPE: fix undeclared symbols Fix the undeclared symbols sparse is warning about. arch/arm/nwfpe/softfloat.c:1727:7: warning: symbol 'float64_to_uint32' was not declared. Should it be static? arch/arm/nwfpe/softfloat.c:1753:7: warning: symbol 'float64_to_uint32_round_to_zero' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Russell King commit e078761a0a815e142eee9f546f821ea259c82f7c Author: Ben Dooks Date: Mon May 28 18:57:31 2007 +0100 [ARM] 4415/1: AML5900: fix sparse warnings from map_io The map_io function does not need to be exported from this file, and therefore should be declared static. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 0cc69daa3e6c958bc678b3db268dc279b68fd76f Author: Ben Dooks Date: Mon May 28 18:55:43 2007 +0100 [ARM] 4414/1: S3C2443: sparse fix for clock.c Fix sparse warnings in the arch/arm/mach-s3c2443/clock.c, including an bug in initialising the cf clock initialiser where two values are being set for the ctrlbit. arch/arm/mach-s3c2443/clock.c:397:12: warning: symbol 'clk_usb_bus_host' was not declared. Should it be static? arch/arm/mach-s3c2443/clock.c:760:4: error: Initializer entry defined twice arch/arm/mach-s3c2443/clock.c:761:4: also defined here Signed-off-by: Ben Dooks Signed-off-by: Russell King commit eca8c2424171b6b6b2dcb0faa92dfddd1e3297d9 Author: Ben Dooks Date: Mon May 28 18:19:16 2007 +0100 [ARM] 4412/1: S3C2412: reset errata fix The S3C2412 has an reset-errata where the clock may cause a glitch switching back to EXTCLK. We force a switch to EXTCLK before writing the reset register to force use of the CLKCON sync logic to properly switch. Fix problem reported by Matthieu Castet. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 486cab2ba25b469f7a8822e84fd43960a472e3d9 Author: Andrew Victor Date: Mon May 28 10:47:19 2007 +0100 [ARM] 4411/1: KS8695: Another serial driver fix Fix a error reported by newer versions of GCC. error: static declaration of 'ks8695_reg' follows non-static declaration Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 28c670cb9b0df7c8579f78c9d06e148896378cf4 Author: Russell King Date: Sat May 26 12:08:29 2007 +0100 [ARM] oprofile: avoid lockdep warnings on mpcore oprofile init Fix lockdep warnings, caused by 'set_affinity' being called without the correct locks taken and local interrupts disabled: ================================= [ INFO: inconsistent lock state ] 2.6.22-rc2 #1 --------------------------------- inconsistent {in-hardirq-W} -> {hardirq-on-W} usage. swapper/1 [HC0[0]:SC0[0]:HE1:SE1] takes: (irq_controller_lock){++..}, at: [] gic_set_cpu+0x60/0xa0 {in-hardirq-W} state was registered at: [] lock_acquire+0x58/0x6c [] _spin_lock+0x40/0x50 [] gic_mask_irq+0x2c/0x6c [] handle_level_irq+0x11c/0x14c [] asm_do_IRQ+0x60/0x84 [] __irq_svc+0x4c/0xc0 [] __alloc_bootmem_nopanic+0x74/0x88 [] __alloc_bootmem+0x18/0x3c [] alloc_large_system_hash+0x16c/0x200 [] inode_init_early+0x5c/0xa4 [] vfs_caches_init_early+0x24/0xa0 [] start_kernel+0x220/0x2fc [<00008078>] 0x8078 irq event stamp: 88438 hardirqs last enabled at (88438): [] preempt_return+0x20/0x2c hardirqs last disabled at (88436): [] __do_softirq+0xb0/0x138 softirqs last enabled at (88437): [] __do_softirq+0x104/0x138 softirqs last disabled at (88428): [] irq_exit+0x68/0x7c other info that might help us debug this: no locks held by swapper/1. stack backtrace: [] (dump_stack+0x0/0x14) from [] (print_usage_bug+0x138/0x168) [] (print_usage_bug+0x0/0x168) from [] (mark_lock+0x484/0x6a0) [] (mark_lock+0x0/0x6a0) from [] (__lock_acquire+0x3c0/0x10c8) [] (__lock_acquire+0x0/0x10c8) from [] (lock_acquire+0x58/0x6c) [] (lock_acquire+0x0/0x6c) from [] (_spin_lock+0x40/0x50) [] (_spin_lock+0x0/0x50) from [] (gic_set_cpu+0x60/0xa0) [] (gic_set_cpu+0x0/0xa0) from [] (em_route_irq+0x38/0x40) [] (em_route_irq+0x0/0x40) from [] (em_setup+0x18/0xa4) [] (em_setup+0x0/0xa4) from [] (oprofile_arch_init+0x24/0xe8) [] (oprofile_arch_init+0x0/0xe8) from [] (oprofile_init+0x1c/0x64) [] (oprofile_init+0x0/0x64) from [] (kernel_init+0x154/0x368) [] (kernel_init+0x0/0x368) from [] (do_exit+0x0/0x904) oprofile: using arm/mpcore Signed-off-by: Russell King commit 5b10c8e436b69f25b6dcb5586bbdc5e39c20ed1d Author: Russell King Date: Sat May 26 12:04:17 2007 +0100 [ARM] Fix stacktrace FP range checking Fix an oops in the stacktrace code, caused by improper range checking. We subtract 12 off 'fp' before testing to see if it's below the low bound. However, if 'fp' were zero before, it becomes a very large positive number, causing this test to succeed where it should fail. Signed-off-by: Russell King commit b91d8a1205faa76affc4e1b7d5ccac1d17026970 Author: David Rientjes Date: Fri May 11 16:18:55 2007 -0700 [ARM] use __used attribute Use the newly introduced __used attribute in place of the deprecated __attribute_used__. Functionally the same. Signed-off-by: David Rientjes Signed-off-by: Russell King commit dd272b5716a54afa33a69f2241284d8ec60b7892 Author: Len Brown Date: Wed May 30 00:26:11 2007 -0400 ACPI: add __init to acpi_initialize_subsystem() Add __init to: acpi_initialize_subsystem() (and un-export it) acpi_os_initialize() Add __initdata to: acpi_osl_dmi_table[] Signed-off-by: Len Brown commit f507654d450d329c81a70eec0096d5dfe67802ec Author: Len Brown Date: Wed May 30 00:10:38 2007 -0400 ACPI: Make _OSI(Linux) a special case _OSI("Linux") is like _OS("Linux"), it is ill-defined and virtually no BIOS vendors test interaction with it. As a result, it can do more damage than good because it causes the BIOS to follow un-tested paths. Recently, several machines have turned up that erroneously test this string in a way which causes them to _not_ test other compatibility strings, including the ZI9 and Toshiba. So it appears that this bad code has made it into a BIOS vendor's reference BIOS. Linux has no choice but to stop advertising compatibility with _OSI string "Linux" - as there are an unbounded number of possible incompatibilities going forward. But some BIOSes have already shipped which do use it for things like conditionally re-enabling video on resume from S3. (Too bad they didn't do that unconditionally) Add special case code for _OSI(Linux) Squawk to dmesg if _OSI(Linux) is requested Add DMI list both to enable and disable _OSI(Linux) But for now, keep the default enabled via #define OSI_LINUX_ENABLED. http://bugzilla.kernel.org/show_bug.cgi?id=7787 Signed-off-by: Len Brown commit 7f397dcdb78d699a20d96bfcfb595a2411a5bbd2 Author: Matt Mackall Date: Tue May 29 21:58:10 2007 -0500 random: fix seeding with zero entropy Add data from zero-entropy random_writes directly to output pools to avoid accounting difficulties on machines without entropy sources. Tested on lguest with all entropy sources disabled. Signed-off-by: Matt Mackall Acked-by: "Theodore Ts'o" Signed-off-by: Linus Torvalds commit 602b6aeefe8932dd8bb15014e8fe6bb25d736361 Author: Matt Mackall Date: Tue May 29 21:54:27 2007 -0500 random: fix error in entropy extraction Fix cast error in entropy extraction. Add comments explaining the magic 16. Remove extra confusing loop variable. Signed-off-by: Matt Mackall Acked-by: "Theodore Ts'o" Signed-off-by: Linus Torvalds commit eaad084bb0f3a6259e56400cd45d061dbf040600 Author: Thomas Gleixner Date: Tue May 29 23:47:39 2007 +0200 NOHZ: prevent multiplication overflow - stop timer for huge timeouts get_next_timer_interrupt() returns a delta of (LONG_MAX > 1) in case there is no timer pending. On 64 bit machines this results in a multiplication overflow in tick_nohz_stop_sched_tick(). Reported by: Dave Miller Make the return value a constant and limit the return value to a 32 bit value. When the max timeout value is returned, we can safely stop the tick timer device. The max jiffies delta results in a 12 days timeout for HZ=1000. In the long term the get_next_timer_interrupt() code needs to be reworked to return ktime instead of jiffies, but we have to wait until the last users of the original NO_IDLE_HZ code are converted. Signed-off-by: Thomas Gleixner Acked-off-by: David S. Miller Signed-off-by: Linus Torvalds commit a2cb4a98f243d01f2c8d5799c764bb96ffa66c44 Author: Roland Dreier Date: Tue May 29 16:07:09 2007 -0700 IB/mlx4: Fix last allocated object tracking in bitmap allocator Set last allocated object to the object after the one just allocated before ORing in the extra top bits. Also handle the case where this wraps around. Signed-off-by: Roland Dreier commit d998ccce020e2cfcf11c6b57503532930ede2894 Author: Sean Hefty Date: Mon May 21 17:38:02 2007 -0700 IB/cm: Fix stale connection detection The ib_cm can incorrectly detect a stale connection (a new connection request for a QPN that is already connected) as a duplicate connection request. Separate the handling of potential duplicate REQs from stale connections. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit ec56dc0b7f6c3fec20bbc2e98ff1a06edf2fc9b9 Author: Michael S. Tsirkin Date: Mon May 28 14:37:27 2007 +0300 IPoIB/cm: Fix performance regression on Mellanox commit 518b1646 ("IPoIB/cm: Fix SRQ WR leak") introduced a severe performance regression on Mellanox cards, because keeping a QP in the error state for extended periods of time moves hardware to the slow path (until the QP is destroyed). For example, MPI latency goes from ~3 usecs to ~7 usecs. Fix this by posting a send WR on one of the QPs that are being flushed, instead of using a separate drain QP that is kept in the error state. This fixes bug , reported and bisected by Scott Weitzenkamp at Cisco and debugged by Sasha Mikheev at Voltaire. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 8b7e15772a286d0ef8e4f8eca422ce5368b6fa97 Author: Michael S. Tsirkin Date: Sun May 27 18:06:42 2007 +0300 IB/mthca: Fix handling of send CQE with error for QPs connected to SRQ mthca_free_err_wqe() currently treats both send and receive CQEs identically if a QP is using an SRQ. But for Tavor hardware, send CQEs with error can be chained together even if the RQ is part of SRQ, so we may miss some CQEs. Fix by following the WQE chain for all send CQEs even for non-SRQ QPs. This fixes crashes in IPoIB CM: Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit ae00d812436dc968f4a5dea7757b6a94910b6dc4 Author: Len Brown Date: Tue May 29 18:43:33 2007 -0400 ACPI: extend "acpi_osi=" boot option The boot option "acpi_osi=" has always disabled Linux _OSI support, thus disabling all OS Interface strings which are advertised by Linux to the BIOS. Now... acpi_osi="string" adds the interface string, and acpi_osi="!string" invalidates the pre-defined interface string eg. acpi_osi="!Windows 2006" would disable Linux's claim of Vista compatibility. Signed-off-by: Len Brown commit 68ccfaa8222f2a26f0689fad9e8c0c3f4c19f599 Author: Thomas Renninger Date: Sun Nov 19 23:01:40 2006 +0100 ACPI: thermal: Replace pointer with name in trip_points For users with active thermal trip points, they need the fan's name, rather than its address, to understand where to look to observe and control fan state. Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit 0efabac9b7c8535eeb199d2f16d3eb44dc4761b2 Author: Len Brown Date: Thu May 24 02:25:00 2007 -0400 ACPICA: allow Load(OEMx) tables HP and Hitachi machines have been implemented with SSDT's that use the "OEMx" signatures. But upon Load, ACPICA is rejecting these tables because they are not using the "SSDT" signature. ACPI Error (tbinstal-0134): Table has invalid signature [OEMx], must be SSDT... Signed-off-by: Len Brown commit d5d4db704b962773c03ee3beb3258b6450611e66 Author: Alan Stern Date: Tue May 29 16:34:52 2007 -0400 USB: replace flush_workqueue with cancel_sync_work This patch (as912) replaces a couple of calls to flush_workqueue() with cancel_sync_work() and cancel_rearming_delayed_work(). Using a more directed approach allows us to avoid some nasty deadlocks. The prime example occurs when a first-level device (the parent is a root hub) is removed while at the same time the root hub gets a remote wakeup request. khubd would try to flush the autosuspend workqueue while holding the root-hub's lock, and the remote-wakeup workqueue routine would be waiting to lock the root hub. The patch also reorganizes the power management portion of usb_disconnect(), separating it out into its own routine. The autosuspend workqueue entry is cancelled immediately instead of waiting for the device's release routine. In addition, synchronization with the autosuspend thread is carried out even for root hubs (an oversight in the original code). Signed-off-by: Alan Stern Cc: Andrew Morton Cc: Greg KH Cc: Mark Lord Signed-off-by: Linus Torvalds commit 4096b46f01a362fe2cc83f6be25cc7be6bce2ab7 Author: Sam Ravnborg Date: Tue May 29 21:29:00 2007 +0200 sparc64: fix alignment bug in linker definition script The RO_DATA section were hardcoded to a specific alignment in include/asm-generic/vmlinux.h. But for sparc64 this did not match the PAGE_SIZE. Introduce a new section definition named: RO_DATA that takes actual alignment as parameter. RODATA are provided for backward compatibility. On top of this avoid hardcoding alignment for sparc64 in reset of the script Fix is build-tested on sparc64 + x86_64. Signed-off-by: Sam Ravnborg commit d7ea3be56adc95b17351221fd95e78115f3b01f4 Author: Brandon Craig Rhodes Date: Mon May 28 09:38:46 2007 -0700 [PATCH] hostap: Allocate enough tailroom for TKIP When hostap_tx_encrypt() tries to allocate enough headroom and tailroom for ieee80211 encryption, it only makes enough room for the "mpdu" phase of the operation, but forgets about the "msdu" phase. (For TKIP, these two phases require, respectively, 4 and 8 bytes of tailroom, per the "ieee80211_crypt_tkip" structure at the bottom of net/ieee80211/ieee80211_crypt_tkip.c.) Signed-off-by: Brandon Craig Rhodes Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit ef7ab2357ba09e8a795018640a87e93dfa043360 Author: Akinobu Mita Date: Sun May 27 23:26:31 2007 +0900 [PATCH] softmac: alloc_ieee80211() NULL check This patch adds missing NULL check and trims a line longer than 80 columns. Cc: Johannes Berg Cc: Joe Jezak Cc: Daniel Drake Signed-off-by: Akinobu Mita Signed-off-by: John W. Linville commit a76193df7c7b60f9facb4090c5ec082e06582209 Author: Akinobu Mita Date: Sun May 27 23:25:00 2007 +0900 [PATCH] ieee80211: fix incomplete error message Fix error message: Unable to network device. --> Unable to allocate network device. Cc: James Ketrenos Signed-off-by: Akinobu Mita Signed-off-by: John W. Linville commit 20c9d198731f440eaad6fafd00fe7ccfcd443a84 Author: Björn Steinbrink Date: Mon May 28 03:43:39 2007 +0200 [PATCH] prism54: fix monitor mode oops Manually set the device of a skb for prism54 cards that are in monitor mode as we never call eth_type_trans in that case. Signed-off-by: Björn Steinbrink Signed-off-by: John W. Linville commit 91fa558ba28b0014205f2c1a75b1cceb4298aa04 Author: John W. Linville Date: Tue May 15 16:14:40 2007 -0400 [PATCH] mac80211: avoid null ptr deref in ieee80211_ibss_add_sta avoid sdata null pointer dereference in ieee80211_ibss_add_sta. Signed-off-by: John W. Linville commit 52fb24cd83bdd6a1dcbd4cf4b3f5cafb741b5552 Author: Michael Wu Date: Sun May 20 09:44:00 2007 -0700 [PATCH] mac80211: always set carrier status on open ieee80211_open should always set the carrier status since we may have set it to off before. Signed-off-by: Michael Wu Signed-off-by: John W. Linville commit e8fdeca241e17dcc5b8f2465be8e1a6347c62fb9 Author: Hong Liu Date: Thu May 17 11:13:44 2007 +0800 [PATCH] mac80211: fix memory leak when defrag fragments We forget to free all the fragments when defraging them into one packet. Signed-off-by: Hong Liu Signed-off-by: John W. Linville commit f11b0f0eb2ea7562db63a01c60d398ec52d5ea46 Author: Zhu Yi Date: Wed May 9 13:41:52 2007 +0800 [PATCH] mac80211: fail back to use associate from reassociate Some APs have strict checking between associate and reassociate. In a case when an AP is restarted during a connection, it denies the mac80211 reassoc request since this is a new association for the AP. To fix this problem, we need to check the status code against WLAN_STATUS_REASSOC_NO_ASSOC and clear ifsta->prev_bssid_set in handling the association failure response. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 7db35f31cbb8ca1dbaba03d74b7db79ace084358 Author: David S. Miller Date: Tue May 29 02:22:14 2007 -0700 [SPARC64]: Fill holes in hypervisor APIs and fix KTSB registry. Several interfaces were missing and others misnumbered or improperly documented. Also, make sure to check the return value when registering the kernel TSBs with the hypervisor. This helped to find the 4MB kernel TSB alignment bug fixed in a previous changeset. Signed-off-by: David S. Miller commit 2d9e2763c22a4ce41c3cc5f35366a51f1eba38dc Author: David S. Miller Date: Tue May 29 01:58:31 2007 -0700 [SPARC64]: Fix two bugs wrt. kernel 4MB TSB. 1) The TSB lookup was not using the correct hash mask. 2) It was not aligned on a boundary equal to it's size, which is required by the sun4v Hypervisor. wasn't having it's return value checked, and that bug will be fixed up as well in a subsequent changeset. Signed-off-by: David S. Miller commit 5f81941c9d47f783e834028dcfb8548809da5a53 Author: Martin Habets Date: Tue May 29 01:11:57 2007 -0700 [SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM. The DRM code depends on an atomic version of cmpxchg(), which is not available on sparc32. Since other platforms besides sparc32 have this issue a KCONFIG option is added for it. Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 6197fe4d720ea3e2ee94cdc7ef32d6c0151199de Author: Kyle McMartin Date: Tue May 29 02:51:13 2007 -0700 [SPARC]: Emulate cmpxchg like parisc Signed-off-by: Kyle McMartin Signed-off-by: David S. Miller commit 679292993c77c06f7ade4e317c13256b92c2651b Author: David S. Miller Date: Sun May 27 20:24:47 2007 -0700 [SPARC64]: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler. It was using an immediate _PAGE_EXEC_4U value in an 'and' instruction to perform the test. This doesn't work because the immediate field is signed 13-bit, this the mask being tested against the PTE was 0x1000 sign-extended to 32-bits instead of just plain 0x1000. Signed-off-by: David S. Miller commit b00ccd0f0b3fe8776aead63ec96313e84451b337 Author: Jan Engelhardt Date: Sun May 27 14:48:54 2007 -0700 [SPARC]: Linux always started with 9600 8N1 The Linux kernel ignored the PROM's serial settings (115200,n,8,1 in my case). This was because mode_prop remained "ttyX-mode" (expected: "ttya-mode") due to the constness of string literals when used with "char *". Since there is no "ttyX-mode" property in the PROM, Linux always used the default 9600. [ Investigation of the suncore.s assembler reveals that gcc optimizied away the stores, yet did not emit a warning, which is a pretty anti-social thing to do and is the only reason this bug lived for so long -DaveM ] Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 7189859f28b7064a83b6ab4036bb334279f922c2 Author: Horst H. von Brand Date: Sat May 26 17:47:53 2007 -0700 [SPARC64]: arch/sparc64/time.c doesn't compile on Ultra 1 (no PCI) This is bug 8540 on bugzilla.kernel.org arch/sparc64/time.c contains references to assorted bq4802 stuff if CONFIG_PCI is not set, and compile fails. I #ifdef'ed out everything that looks PCI-ish in that file. Signed-off-by: David S. Miller commit 22adb358e816ce6aa0afb231ae9d826b0bddc8b0 Author: David S. Miller Date: Sat May 26 01:14:43 2007 -0700 [SPARC64]: Eliminate NR_CPUS limitations. Cheetah systems can have cpuids as large as 1023, although physical systems don't have that many cpus. Only three limitations existed in the kernel preventing arbitrary NR_CPUS values: 1) dcache dirty cpu state stored in page->flags on D-cache aliasing platforms. With some build time calculations and some build-time BUG checks on page->flags layout, this one was easily solved. 2) The cheetah XCALL delivery code could only handle a cpumask with up to 32 cpus set. Some simple looping logic clears that up too. 3) thread_info->cpu was a u8, easily changed to a u16. There are a few spots in the kernel that still put NR_CPUS sized arrays on the kernel stack, but that's not a sparc64 specific problem. Signed-off-by: David S. Miller commit 5cbc30737398b49f62ae8603129ce43ac7db1a41 Author: David S. Miller Date: Fri May 25 15:49:59 2007 -0700 [SPARC64]: Use machine description and OBP properly for cpu probing. Signed-off-by: David S. Miller commit e01c0d6d8cf29c1c11725837b265598cab687952 Author: David S. Miller Date: Fri May 25 01:04:15 2007 -0700 [SPARC64]: Negotiate hypervisor API for PCI services. Signed-off-by: David S. Miller commit 22d6a1cba3e9ec9baf8ce4d8dd1d088e112a64f1 Author: David S. Miller Date: Fri May 25 00:37:12 2007 -0700 [SPARC64]: Report proper system soft state to the hypervisor. Signed-off-by: David S. Miller commit 36b48973b8f1818d0ae6d16e548081d00162ae39 Author: David S. Miller Date: Fri May 25 00:33:49 2007 -0700 [SPARC64]: Fix typo in sun4v_hvapi_register error handling. Signed-off-by: David S. Miller commit 89a4063e959a4701b998f3f1c3f8a6562ab5ba51 Author: David S. Miller Date: Tue May 22 23:48:10 2007 -0700 [SCSI] ESP: Kill SCSI_ESP_CORE and link directly just like jazz_esp Signed-off-by: David S. Miller commit 5ff263667798946abc15314eae3f341345877d7a Author: Thomas Bogendoerfer Date: Tue May 22 17:03:44 2007 -0700 [SCSI] jazz_esp: Converted to use esp_core. Use new esp_scsi for JAZZ SCSI host adapter driver Signed-off-by: Thomas Bogendoerfer Signed-off-by: David S. Miller commit 5840fc66bb47fa4382bf3229d4979c3fcd375b01 Author: David S. Miller Date: Tue May 22 01:24:14 2007 -0700 [SPARC64]: PCI device scan is way too verbose by default. These messages were very useful when bringing up the OBP based PCI device scan code, but it's just a lot of noise every bootup now especially on big machines. The messages can be re-enabled via 'ofpci_debug=1' on the kernel command line. Signed-off-by: David S. Miller commit 9977e390dd25751fc40e01850da88b37d3c81109 Author: Krzysztof Helt Date: Sat May 19 12:06:02 2007 -0700 [SERIAL] sunzilog: section mismatch fix This patch fixes section mismatch warnings in the sunzilog driver. Signed-off-by: Krzysztof Helt Signed-off-by: David S. Miller commit 42e28264783f1b3b9a99e0fdda263ed9bffcf331 Author: Krzysztof Helt Date: Sat May 19 12:03:24 2007 -0700 [SPARC32]: Removes mismatch section warnigs in sparc time.c file This patch removes mismatch section warnings in the sparc/kernel/time.c file. Signed-off-by: Krzysztof Helt Signed-off-by: David S. Miller commit 59db8102bd0ab7a67d525d086ca08e07d69fadd4 Author: David S. Miller Date: Wed May 23 18:00:46 2007 -0700 [SPARC64]: Don't be picky about virtual-dma values on sun4v. Handle arbitrary base and length values as long as they are multiples of IO_PAGE_SIZE. Bug found by Arun Kumar Rao. Signed-off-by: David S. Miller commit a1aadd55fb43e31407aecc4ebaf0258130a98238 Author: Christoph Hellwig Date: Wed May 23 14:57:49 2007 -0700 [SPARC64]: Kill unused DIE_PAGE_FAULT enum value. sparc64 got rid of the pagefault notifiers, so the enum value for them can go away aswell. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit b68a890fa3cd977365fda2b1f1ec4e8dc58baddf Author: Christoph Hellwig Date: Wed May 23 14:56:45 2007 -0700 [SCSI] pluto: Use wait_for_completion_timeout. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit df3c7244264f1d12562413aa32d56be802486516 Author: David Chinner Date: Thu May 24 15:27:03 2007 +1000 [XFS] Write at EOF may not update filesize correctly. The recent fix for preventing NULL files from being left around does not update the file size corectly in all cases. The missing case is a write extending the file that does not need to allocate a block. In that case we used a read mapping of the extent which forced the use of the read I/O completion handler instead of the write I/O completion handle. Hence the file size was not updated on I/O completion. SGI-PV: 965068 SGI-Modid: xfs-linux-melb:xfs-kern:28657a Signed-off-by: David Chinner Signed-off-by: Nathan Scott Signed-off-by: Tim Shimmin commit b23c9e386cc639aa7c0b7360388b3e3759059e06 Author: Uwe Bugla Date: Mon May 28 23:24:48 2007 -0400 Input: logips2pp - fix typo in Kconfig Signed-off-by: Uwe Bugla Signed-off-by: Dmitry Torokhov commit 0e2a4fd2e8c48ba5eb386d5698846a5ca0c80f39 Author: Dmitry Torokhov Date: Mon May 28 23:24:39 2007 -0400 Input: db9 - do not ignore dev2 module parameter Because of incorrect parameter setup anything passed in dev2=... was always ignored by the driver. See bugzilla #8541. Signed-off-by: Dmitry Torokhov commit 3abc12012f957d1c5b9f35b244256f88ad146564 Author: Alan Cox Date: Wed May 23 14:14:15 2007 -0700 [ARM] enable arbitary speed tty ioctls and split input/output speed Add the ioctls and values needed for this to the ARM26/ARM32 ports. The actual code has been in the base kernel for a while and automatically turns on when a port sets the required defines. [RMK: also added termbits.h changes to avoid build breakage] Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 471e44b26ef84658ee434087413c445bbe14686b Author: Jeff Garzik Date: Mon May 28 09:00:05 2007 -0400 [libata] Add drive to NCQ blacklist Contributed by Simon Griph. Signed-off-by: Jeff Garzik commit 350958f984268dcf0f087aac78c5b9fe2846aeff Author: Jeff Garzik Date: Sun May 27 07:09:18 2007 -0400 firewire: fix return code Fix this warning on x86-64 drivers/firewire/fw-cdev.c:798: warning: initialization from incompatible pointer type by making the return code of ioctl_send_request() the same as all the other ioctl_xxx() return codes. Signed-off-by: Jeff Garzik Signed-off-by: Stefan Richter commit 9a60731d0036a6c6c265acd4248c17fd24fc8e13 Author: Stefan Richter Date: Fri May 25 13:54:49 2007 +0200 firewire: prefix modules with firewire- instead of fw- Of course everybody immediately associates "fw-" with FireWire, not firmware or firewall or whatever. But "firewire-" has a nice ring to it too. Signed-off-by: Stefan Richter Acked-by: Kristian Hoegsberg commit ec839e43fbe1b1ab74264ac510f6cd9c8e8334a4 Author: Kristian Høgsberg Date: Tue May 22 18:55:48 2007 -0400 firewire: Add missing byteswapping for receive DMA programs. Signed-off-by: Kristian Hoegsberg Signed-off-by: Stefan Richter commit 976da96a5d4fe84bd292b950e566325dc3e5904e Author: Petr Vandrovec Date: Sun May 13 22:14:44 2007 -0700 ieee1394: raw1394: Fix async send While playing with libiec61883 I've noticed that async_send is broken because it was doing copy_from_user(...., packet->data_size) before packet->data_size was set to any useful value. It got broken when packet->allocated_data_size got introduced, as hpsb_alloc_packet does not set packet->data_size anymore. (Regression in 2.6.22-rc1) Signed-off-by: Petr Vandrovec Signed-off-by: Stefan Richter commit ef50a6c59dc66f22eba67704e291d709f21e0456 Author: Stefan Richter Date: Mon May 21 01:05:41 2007 +0200 ieee1394: eth1394: bring back a parent device This adds a real parent device to eth1394's ethX device like in Linux 2.6.20 and older. However, due to unfinished conversion of the ieee1394 away from class_device, we now refer to the FireWire controller's PCI device as the parent, not to the ieee1394 driver's fw-host device. Having a real parent device instead of a virtual one allows udev scripts to distinguish eth1394 interfaces from networking bridges, bondings and the likes. Fixes a regression since 2.6.21: https://bugs.gentoo.org/show_bug.cgi?id=177199 Signed-off-by: Stefan Richter commit 7a97bc03e089d1a75dc533f0fe69ec8dac672916 Author: Stefan Richter Date: Sat May 5 17:25:51 2007 +0200 ieee1394: eth1394: handle tlabel exhaustion When eth1394 was unable to acquire a transaction label, it just dropped outgoing packets without attempt to resend them later. The transmit queue is now halted if no tlabel is available to ->hard_start_xmit(). A workqueue job is then scheduled to catch the moment when ieee1394 recycled the next lot of tlabels. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=8402 Signed-off-by: Stefan Richter commit 69c29fa7d142d65b13e366ae51e50944484b65ab Author: Stefan Richter Date: Sat May 5 17:19:09 2007 +0200 ieee1394: eth1394: remove bogus netif_wake_queue When we are within hard_start_xmit, the queue is already awake. Signed-off-by: Stefan Richter commit 20e2008e1f24a6831bf4311f8e2f8692f16a92de Author: Stefan Richter Date: Sat May 5 17:18:12 2007 +0200 ieee1394: sbp2: include workqueue.h Signed-off-by: Stefan Richter commit 6996abf0962bb86b6285987a4698f6d275ff531f Author: Nicolas Boichat Date: Sun May 27 22:17:43 2007 +0200 hwmon/applesmc: Handle name file creation error and deletion The previous patch was incomplete. Signed-off-by: Nicolas Boichat Signed-off-by: Jean Delvare commit 548c343b2ff03488b913440799e83d66d7db8fad Author: Jean Delvare Date: Sun May 27 22:17:43 2007 +0200 hwmon/applesmc: Simplify dependencies The dependency upon HWMON is now handled at menu level. Signed-off-by: Jean Delvare Cc: Nicolas Boichat commit 45f2acc484b31d429eb1359c48ea5cd3acb869cd Author: Jean Delvare Date: Sun May 27 22:17:43 2007 +0200 hwmon-vid: Don't spam the logs when VRM version is missing If we cannot guess which VRM version the CPU uses, we set it to 0 and log it. So we shouldn't spam the log each time vid_from_reg() is later called with vrm 0. Signed-off-by: Jean Delvare Acked-by: Rudolf Marek commit e142e2a30787e9fa1bf0f66aa1d01727ce718cc7 Author: Jean Delvare Date: Sun May 27 22:17:43 2007 +0200 hwmon/w83627hf: Be quiet when no chip is found Signed-off-by: Jean Delvare commit 67f363b1f6a31cf5027a97372f64bcced4f05ba6 Author: Rudolf Marek Date: Sun May 27 22:17:43 2007 +0200 hwmon/coretemp: Add more safety checks Add detection of AE18 Errata of Core processor and warns users that the absolute readings might be wrong for Core2 processor. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare commit 7574d7e937f81754dfd82deac24aea5880107e2d Author: Jean Delvare Date: Sun May 27 22:17:43 2007 +0200 hwmon/ds1621: Fix swapped temperature limits The low temperature limit and the high temperature limit registers have been accidentally swapped, causing alarms to trigger when they shouldn't. Signed-off-by: Jean Delvare Acked-by: Aurelien Jarno commit 43e7f6adf33da1f7816ff738d3725bbde8fd98de Author: Robert P. J. Day Date: Wed May 23 14:14:14 2007 -0700 [ARM] remove unused header file: arch/arm/mach-s3c2410/bast.h Signed-off-by: Robert P. J. Day Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Russell King commit cc50a0df51e4f2a7982ade338b3d74825ca67e08 Author: Michael-Luke Jones Date: Wed May 23 22:41:53 2007 +0100 [ARM] 4406/1: Trivial NSLU2 / NAS-100D header & setup code cleanup This trivial patch updates the nslu2 and nas-100d headers to remove pointless GPIO defines, and updates nslu2-setup.c accordingly. In addition minor style cleanups to some comments are included. Signed-off-by: Michael-Luke Jones Signed-off-by: Russell King commit 435c5da00b9610f9664c5d6f38dfdafce419ef4a Author: Michael-Luke Jones Date: Wed May 23 22:38:45 2007 +0100 [ARM] 4405/1: NSLU2, DSM-G600 frequency fixup code This patch is required as the frequency fixup in nslu2_init does not run sufficiently early in the boot sequence to take effect. In addition the dsmg600 setup code behaviour has been improved such that a 'fixup' routine is avoided. Signed-off-by: Michael-Luke Jones Signed-off-by: Russell King commit e87a8e85e90660183d3ef8e700627689c6292a3f Author: Michael-Luke Jones Date: Wed May 23 22:36:44 2007 +0100 [ARM] 4404/1: Trivial IXP42x Kconfig cleanup Avila and IXDP4xx support were separated in 2.6.21 so this comment isn't correct any more. Signed-off-by: Michael-Luke Jones Signed-off-by: Russell King commit 6776f3d26aec60cb6e0fc770a00993accd09376f Author: Enrico Scholz Date: Mon May 21 12:29:40 2007 +0100 [ARM] 4403/1: Make the PXA-I2C driver work with lockdep validator Using lockdep validator causes warnings like INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. [] (dump_stack+0x0/0x14) from [] (__lock_acquire+0x150/0xc40) [] (__lock_acquire+0x0/0xc40) from [] (lock_acquire+0x5c/0x70) [] (lock_acquire+0x0/0x70) from [] (_spin_lock_irq+0x48/0x58) r7:c07e5144 r6:00000000 r5:c015fb94 r4:c07e50b8 [] (_spin_lock_irq+0x0/0x58) from [] (i2c_pxa_xfer+0x110/0x2e0) r5:c07e50b8 r4:0000001f This is caused by memcpy'ing a statical initialized spin-lock. This patch removes a static pxa_i2c structure which was used only as a source for this memcpy() operation. Instead of, members and the spinlock will be initialized manually. Signed-off-by: Enrico Scholz Signed-off-by: Russell King commit ece97941c378b4a424530585a7c855e466f1bd2c Author: Ben Dooks Date: Mon May 21 09:40:06 2007 +0100 [ARM] 4402/1: S3C2443: Add physical address of HSMMC controller Add physical address of HSMMC to include/asm-arm/arch-s3c2410/map.h Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 8e81725b17b07ed5052bbd826ff0479a4c22a0ea Author: Ben Dooks Date: Mon May 21 09:38:51 2007 +0100 [ARM] 4401/1: S3C2443: Add definitions for port GPIOJ Add definitions for S3C2443 functions in GPIOJ Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c4814f9001a8dd28e39311a919beac34f778f76d Author: Michel Dänzer Date: Sat May 26 04:37:08 2007 +1000 drm: make sure the drawable code doesn't call malloc(0). Signed-off-by: Michel Dänzer Signed-off-by: Dave Airlie commit 777c7738a598c6e8d4b850181a509757fb79cf36 Author: Dave Airlie Date: Sat May 26 04:19:03 2007 +1000 drm/radeon: add more IGP chipset pci ids Add more IGP chipset PCI IDs Signed-off-by: Dave Airlie commit a6399bdd492a3289d39e4b79cbe69ad44a054ee3 Author: Thomas Gleixner Date: Sat May 26 05:56:14 2007 +1000 drm: Spinlock initializer cleanup Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 4d389dcea8543161c3bb1e26f1c2ffb7e0822ff1 Author: Alan Cox Date: Wed May 23 14:43:52 2007 -0700 [WATCHDOG] clean-up watchdog documentation Random sampling of some URLs in the Documentation tree to see how many were stale found that one watchdog driver was now a porn site. In fact if the watchdogs document directory was any older it would be written in latin Clean it up somewhat and add Last reviewed headers, something all the Documentation could do with IMHO. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Wim Van Sebroeck commit 05e9ebbefb379a4da782b21b8427c88ac28a2334 Author: Sumant Patro Date: Thu May 17 05:47:51 2007 -0700 [SCSI] megaraid_sas: intercept cmd timeout and throttle io eh_timed_out call back (megasas_reset_timer) is used to throttle io to the adapter when it is called the first time for a scmd. The MEGASAS_FW_BUSY flag is set and can_queue reduced to 16. The can_queue is restored from completion routine in following two conditions : 5 seconds has elapsed and the # of outstanding cmds in FW is < 17. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit 58da10bb3fe680a197e83d5eccb5265a721c98e2 Author: Kumar Gala Date: Wed May 23 09:51:46 2007 -0500 [POWERPC] Fix Kconfig warning Fix config warning related to select usage: drivers/macintosh/Kconfig:117:warning: 'select' used by config symbol 'PMAC_APM_EMU' refers to undefined symbol 'SYS_SUPPORTS_APM_EMULATION' Signed-off-by: Kumar Gala commit c1c9889a3860028b3578b98c3a56bdf0dd658920 Author: Kumar Gala Date: Wed May 23 07:59:06 2007 -0500 [PPC] Fix modpost warning Mark pte_alloc_one_kernel as __init_refok to fix the following warning: WARNING: arch/ppc/mm/built-in.o(.text+0x1114): Section mismatch: reference to .init.text:early_get_page (between 'pte_alloc_one_kernel' and 'v_mapped_by_tlbcam') Signed-off-by: Kumar Gala commit f1aed92464def83fc3677cade823cad71cf5f0d4 Author: Kumar Gala Date: Wed May 23 07:49:37 2007 -0500 [POWERPC] Fix modpost warning Mark pte_alloc_one_kernel as __init_refok to fix the following warning: WARNING: arch/powerpc/mm/built-in.o(.text+0x1068): Section mismatch: reference to .init.text:early_get_page (between 'pte_alloc_one_kernel' and 'steal_context') Signed-off-by: Kumar Gala commit 405861a0429113f8e426092af09dd05ec6209410 Author: Li Yang Date: Wed May 23 11:28:03 2007 +0800 [POWERPC] Fix Section mismatch warnings This patch fix the following Section mismatch warnings in powerpc code. WARNING: arch/powerpc/platforms/built-in.o - Section mismatch: reference to .init.data:mv643xx_eth_pd_devs from .text between 'mv643xx_eth_add_pds' (at offset 0x9ed2) and 'gg2_read_config' WARNING: arch/powerpc/platforms/built-in.o - Section mismatch: reference to .init.data:mv643xx_eth_pd_devs from .text between 'mv643xx_eth_add_pds' (at offset 0x9ed6) and 'gg2_read_config' WARNING: arch/powerpc/platforms/built-in.o - Section mismatch: reference to .init.text:note_scsi_host from __ksymtab between '__ksymtab_note_scsi_host' (at offset 0x8) and '__ksymtab_sys_ctrler' Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 90c615bc42886f23a6112733a949d0f6fbe343b6 Author: Timur Tabi Date: Wed May 23 07:23:55 2007 -0500 [POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST The UCC_GETH Kconfig option in drivers/net/Kconfig had a line to select the UCC_FAST option is arch/powerpc/sysdev/qe_lib/Kconfig, which is only used on PowerPC builds. On other architectures, this would generated a warning. The fix is to have UCC_FAST depend on UCC_GETH. Signed-off-by: Timur Tabi Signed-off-by: Andrew Morton Signed-off-by: Kumar Gala commit f2fb9eb3482c9ab3cca84cf0c80f646ce9aeb4de Author: Domen Puncer Date: Mon May 21 08:56:00 2007 +0200 [POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic) Unbreak lite5200 dts, which were broken by 5c1992f83304cf2d56934dd6c06709b96e1b0c81 Signed-off-by: Domen Puncer Acked-by: Sylvain Munaut Signed-off-by: Kumar Gala commit c199426eff6c1a144d1123a80dc123562a9ec7d2 Author: Kumar Gala Date: Thu May 17 07:52:42 2007 -0500 [PPC] Remove duplicate export of __div64_32. We now get the export of __div64_32 from lib/div64.c and can drop the one in ppc_ksysm.c Signed-off-by: Kumar Gala commit 9c05e63e9180011e791c6c72ce38b45c1a3fa898 Author: Kumar Gala Date: Mon May 14 17:12:24 2007 -0500 [PPC] Fix COMMON symbol warnings We get the following warnings in various ARCH=ppc builds: WARNING: "ee_restarts" [arch/ppc/kernel/built-in] is COMMON symbol WARNING: "fee_restarts" [arch/ppc/kernel/built-in] is COMMON symbol WARNING: "htab_hash_searches" [arch/ppc/mm/built-in] is COMMON symbol WARNING: "next_slot" [arch/ppc/mm/built-in] is COMMON symbol WARNING: "mmu_hash_lock" [arch/ppc/mm/built-in] is COMMON symbol WARNING: "primary_pteg_full" [arch/ppc/mm/built-in] is COMMON symbol WARNING: "global_dbcr0" [arch/ppc/kernel/built-in] is COMMON symbol Switch to local symbols for ee_restarts, fee_restarts, and global_dbcr0 and global symbols for mmu_hash_lock, next_slot, primary_pteg_full, and htab_hash_searches. (except mmu_hash_lock which is global) and space directive instead. Signed-off-by: Kumar Gala commit ddd43b063d16cdeffbc18f00b72c112f246fae78 Author: Paul Mundt Date: Wed May 23 12:24:32 2007 +0900 sh: section mismatch fixes for system timer. Fix up a couple of section mismatch warnings regarding sys_timer. Signed-off-by: Paul Mundt commit 3d9780b97667fcd63159c0933fdce75465da6c70 Author: Dave Jones Date: Mon May 21 20:59:47 2007 -0400 [SCSI] fusion: Fix |/|| confusion There are several cases where the fusion driver uses the logical || to try to do an arithmetical or ... fix by replacing with |. Signed-off-by: Dave Jones Acked-by: "Moore, Eric" Signed-off-by: James Bottomley commit 8fdcf86af61bfba744f5868ec04dad71637ac33a Author: Darrick J. Wong Date: Wed May 16 14:01:48 2007 -0700 [SCSI] aic94xx: asd_clear_nexus should fail if the cleared task does not complete Every so often, the driver will call asd_clear_nexus to clean out a task. It is supposed to be the case that the CLEAR NEXUS does not go on the done list until after the task itself has been put on the done list, but for some reason this doesn't always happen. Thus, the wait_for_completion_timeout call times out, and we return success. This makes libsas free the task even though the task hasn't completed, leading to a BUG_ON message from aic94xx_hwi.c around line 341. We should return failure from asd_clear_nexus so that libsas tries again; at a bare minimum it shouldn't be freeing active tasks. I _think_ this will fix one of the SCB timeout crash problems (though I've not been able to reproduce it lately...) Signed-off-by: Darrick J. Wong Signed-off-by: James Bottomley commit f45ffaec2e51071ea0067849cbb84df9e0531b35 Author: James Bottomley Date: Tue May 22 09:26:22 2007 -0500 [SCSI] aic7xxx: fix aicasm build failure with gcc-3.4.6 On Tue, 2007-05-22 at 06:51 -0500, Bob Tracy wrote: > Second try: originally reported this back on April 17th. 2.6.X > kernel builds started failing after I upgraded my compiler from > gcc-3.3.X to gcc-3.4.6: > > make -C drivers/scsi/aic7xxx/aicasm > (...) > gcc -I/usr/include -I. aicasm.c aicasm_symbol.c aicasm_gram.c aicasm_macro_gram.c aicasm_scan.c aicasm_macro_scan.c -o aicasm -ldb > aicasm_gram.y:1948: error: conflicting types for 'yyerror' > aicasm_gram.tab.c:3004: error: previous implicit declaration of 'yyerror' was here > aicasm_macro_gram.y:162: error: conflicting types for 'mmerror' > aicasm_macro_gram.tab.c:1196: error: previous implicit declaration of 'mmerror' was here Fix is to add a prototype for yyerror and mmerror to the relevant files. Signed-off-by: James Bottomley commit 1208bab5d07c9a9172f04b76dc107c37507a9bb3 Author: Salyzyn, Mark Date: Tue May 22 09:32:29 2007 -0400 [SCSI] aacraid: apply commit config for reset_devices flag Under some conditions associated with the unclean transition to kdump, the aacraid adapters will view the array as foreign and not export it to prevent access and data manipulation. The solution is to submit a commit configuration to export the devices since this is a expected behavior when transitioning to a kdump kernel. This patch adds the aacraid.reset_devices flag and when either this or the global reset_devices flag is set, ensures that a commit config is issued and extends the startup_timeout if it is set less than 5 minutes. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit 09ff92fea2890c697a36d8b26f5a3ea725ef8fb4 Author: Alan Stern Date: Mon May 21 09:55:04 2007 -0400 [SCSI] sd: fix refcounting regression in suspend/resume routines This patch (as909) fixes a couple of refcounting errors in the sd driver's suspend and resume methods. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 2ad8ee713566671875216ebcec64f2eda47bd19d Author: David Woodhouse Date: Tue May 8 00:12:58 2007 +0100 [JFFS2] Fix potential memory leak of dead xattrs on unmount. An xattr_datum which ends up orphaned should be freed by the GC thread. But if we umount before the GC thread is finished, or if we mount read-only and the GC thread never runs, they might never be freed. Clean them up during unmount, if there are any left. Signed-off-by: David Woodhouse commit 8ae5d31263c746f1680d005b33a82d167cdb9eb6 Author: David Woodhouse Date: Sat May 5 17:50:25 2007 +0100 [JFFS2] Fix BUG() caused by failing to discard xattrs on deleted files. When we cannot mark nodes as obsolete, such as on NAND flash, we end up having to delete inodes with !nlink in jffs2_build_remove_unlinked_inode(). However, jffs2_build_xattr_subsystem() runs later than this, and will attach an xref to the dead inode. Then later when the last nodes of that dead inode are erased we hit a BUG() in jffs2_del_ino_cache() because we're not supposed to get there with an xattr still attached to the inode which is being killed. The simple fix is to refrain from attaching xattrs to inodes with zero nlink, in jffs2_build_xattr_subsystem(). It's it's OK to trust nlink here because the file system isn't actually mounted yet, so there's no chance that a zero-nlink file could actually be alive still because it's open. Signed-off-by: David Woodhouse commit ccb8f430ac4cfd1acd12ff591918b8b67d73c977 Author: Andrew Victor Date: Mon May 14 14:45:25 2007 +0200 [WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver Watchdog driver for the Kendin/Micrel KS8695 processor. Signed-off-by: Andrew Victor Signed-off-by: Wim Van Sebroeck commit cab537d609fb718e9fb09d73e3e3e3062db25743 Author: James Bottomley <[mailto:James.Bottomley@SteelEye.com]> Date: Wed May 16 10:06:39 2007 -0400 [SCSI] aacraid: fix panic on short Inquiry Unable to handle kernel paging request at ffff8101c0000000 RIP: [] :aacraid:aac_internal_transfer+0xd6/0xe3 PGD 8063 PUD 0 Oops: 0000 [1] SMP last sysfs file: /block/sdb/removable CPU 2 Modules linked in: autofs4(U) hidp(U) nfs(U) lockd(U) fscache(U) nfs_acl(U) rfcomm(U) l2cap(U) bluetooth(U) sunrpc(U) ipv6(U) cpufreq_ondemand(U) dm_mirror(U) dm_mod(U) video(U) sbs(U) i2c_ec(U) button(U) battery(U) asus_acpi(U) acpi_memhotplug(U) ac(U) parport_pc(U) lp(U) parport(U) joydev(U) ide_cd(U) i2c_i801(U) i2c_core(U) shpchp(U) cdrom(U) bnx2(U) sg(U) pcspkr(U) ata_piix(U) libata(U) aacraid(U) sd_mod(U) scsi_mod(U) ext3(U) jbd(U) ehci_hcd(U) ohci_hcd(U) uhci_hcd(U) Pid: 2352, comm: syslogd Not tainted 2.6.18-prep #1 RIP: 0010:[] [] :aacraid:aac_internal_transfer+0xd6/0xe3 RSP: 0000:ffff8101bfd1fe68 EFLAGS: 00010083 RAX: 0000000000000063 RBX: 0000000000000008 RCX: 00000000ffd1fea0 RDX: ffffffff802da628 RSI: ffff8101c0000000 RDI: ffff8101b2a08168 RBP: ffff8101b2728010 R08: ffffffff802da628 R09: 0000000000000046 R10: 0000000000000000 R11: 0000000000000080 R12: 0000000000000010 R13: ffff8101bfd1fea8 R14: ffff8101bc74df58 R15: ffff8101bc74df58 FS: 00002aaaab0146f0(0000) GS:ffff8101bfcd2e40(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: ffff8101c0000000 CR3: 00000001bdecd000 CR4: 00000000000006e0 Process syslogd (pid: 2352, threadinfo ffff8101bc74c000, task ffff8101bd979040) Stack: 0000000000000012 0000000000000036 0000000000000000 ffff8101bee9a800 ffff8101be9d3a00 ffff8101be9d3a00 ffff8101be8014f8 ffffffff880b26cc 40212227607e3141 2029282a26252423 0000000000000003 ffff810037e3a000 Call Trace: ] :aacraid:get_container_name_callback+0x8b/0xb5 [] :aacraid:aac_intr_normal+0x1b3/0x1f9 [] :aacraid:aac_rkt_intr+0x37/0x115 [] __rcu_process_callbacks+0xf8/0x1a8 [] handle_IRQ_event+0x29/0x58 [] __do_IRQ+0xa4/0x105 [] __do_softirq+0x5e/0xd5 [] do_IRQ+0xe7/0xf5 [] ret_from_intr+0x0/0xa On digging into it, it turned out that the customer was probing an aacraid device with an INQUIRY of 8 bytes. The way aacraid works, it was blindly trying to use aac_internal_transfer to copy the container name to byte 16 of the inquiry data, resulting in a negative transfer length. It then copies over the whole of kernel memory before dropping off the end. Fix updated and corrected by Mark Salyzyn Signed-off-by: James Bottomley commit 2ab01efd1d2a24db53b4c5d28a2e20cf2b1206c5 Author: Salyzyn, Mark Date: Tue May 15 09:14:21 2007 -0400 [SCSI] aacraid: Correct sa platform support. (Was: [Bug 8469] Bad EIP value on pentium3 SMP kernel-2.6.21.1) http://bugzilla.kernel.org/show_bug.cgi?id=8469 As discussed in the bugzilla outlined below, we have an sa based (Mustang) RAID adapter on the system, a Dell PERC2/QC. Affected controllers are HP NetRAID, Adaptec AAC-364, Dell PERC2/QC or Adaptec 5400S. This problem coincides with the introduction of the adapter_comm and adapter_deliver platform functions (Message [PATCH 1/4] aacraid: rework communication support code, January 23 2007, which initially migrated to 2.6.21) The panic occurs with an uninitialized adapter_deliver platform function pointer. The enclosed patch, unmodified as tested by Rainer, solves the problem. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit ed56047aecaddc0a45bb23b61ce933fb81f67ef9 Author: Christoph Hellwig Date: Sun May 13 22:48:31 2007 +0200 [SCSI] NCR53C9x: correct spelling mistake in deprecation notice On Mon, Apr 30, 2007 at 03:16:39PM +0200, Geert Uytterhoeven wrote: > > +What: old NCR53C9x driver > > +When: October 2007 > > +Why: Replaced by the much better esp_scsi driver. Actual low-level > > + driver can ported over almost trivially. > ^ > be current linus' tree still has my spelling mistake. Here's a patch to update it Signed-off-by: James Bottomley commit bcd4e22540309f2f135f278cffe134c63dbcaee5 Author: FUJITA Tomonori Date: Fri May 11 19:10:45 2007 +0900 [SCSI] tgt: fix a rdma indirect transfer error bug This sets sg_dma_len to a proper value. Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley commit bdd0d7571ac83190ec0caafb86d0d35ba2616fd2 Author: Sumant Patro Date: Thu May 10 07:22:35 2007 -0700 [SCSI] MegaRAID: Update MAINTAINERS email-id Update Maintainer email-id for MegaRAID SCSI drivers. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit c25da0afa753c29cd99fb41dc73a33ed69556965 Author: Ed Lin Date: Wed May 9 20:50:42 2007 -0800 [SCSI] stex: minor cleanup and version update Add debug information into abort and host_reset routine. Change ioremap to ioremap_nocache. Version updated to 3.6.0000.1. Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit d116a7bc6ab4dcf752078daeaf2276f7d7660595 Author: Ed Lin Date: Wed May 9 20:50:40 2007 -0800 [SCSI] stex: fix reset recovery for console device After reset completed, the scsi error handler sends out TEST_UNIT_READY to the device. For 'normal' devices the command will be handled by firmware. However, because the RAID console only interfaces to scsi mid layer, the firmware will not process the command for it. This will make the console to be offlined right after reset. Add the handling in driver to fix this problem. Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit 69f4a513911455670d3322fb5252b437c0485707 Author: Ed Lin Date: Wed May 9 20:50:37 2007 -0800 [SCSI] stex: extend hard reset wait time During hard bus reset of st_shasta controllers, 1 ms is not enough for 16-port controllers, although it's good for 8-port controllers. Extend the wait time to 100 ms to allow bus resets finish successfully. Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit e0b2e597d5dd8c4f3778545f65c29a9c6aba0e3a Author: Ed Lin Date: Wed May 9 20:50:33 2007 -0800 [SCSI] stex: fix id mapping issue The correct internal mapping of stex controllers should be: id:0~15, lun:0~7 (st_shasta) id:0, lun:0~127 (st_yosemite) id:0~127, lun:0 (st_vsc and st_vsc1) This patch reports the internal mapping to scsi mid layer, eliminating the translation between scsi mid layer and firmware. To achieve this goal, we also need to: -- fail the REPORT_LUNS command for st_shasta because the firmware is known to not report all actual luns -- add an entry in scsi_devindo.c to force sequential lun scan (for st_shasta controllers) -- fail the REPORT_LUNS command for console device -- remove special handling of REPORT_LUNS command for st_yosemite, as there is no translation mapping now Signed-off-by: Ed Lin Signed-off-by: James Bottomley commit 5af23d263c33a3f6fc93facfd87d2a091eff2060 Author: Brian King Date: Wed May 9 15:36:35 2007 -0500 [SCSI] ipr: Proper return codes for eh_dev_reset for SATA devices Currently ipr always returns success from eh_dev_reset when called for a SATA device. If ata_do_eh is unable to recover for some reason, this can result in commands that are still outstanding when ata_do_eh returns. Change ipr to verify no commands are outstanding before returning success. Signed-off-by: Brian King Signed-off-by: James Bottomley commit 9f28745a6b554fdd6b0dbc9856077701a55f9569 Author: Michael Loehr Date: Wed May 9 11:01:24 2007 +0200 [SCSI] zfcp: IO stall after deleting and path checker changes after reenabling zfcp devices IO stall after deleting and path checker changes after reenabling zfcp device Setting one zfcp device offline using chccwdev in a multipath environment and waiting will lead to IO stall on all paths. After setting the zfcp device back online using chccwdev, the devices with io stall will have a different path checker. Devices corresponding to the deleted units are never freed. This has the effect that 'slave_destroy' is never called and zfcp still thinks that this unit is registered (ZFCP_STATUS_UNIT_REGISTERED is still set). Hence the erp routine is not called correctly and the unit is not enabled properly. Do not delete rport and the sdev. Just set the host to block on 'offline'. Setting host online again will then remove the blocked status and everything is fine again. Signed-off-by: Michael Loehr Signed-off-by: Swen Schillig Signed-off-by: James Bottomley commit 869b2b444c58302e3233ce0b671fabf28135a37d Author: Martin Peschke Date: Wed May 9 11:01:20 2007 +0200 [SCSI] zfcp: avoid clutter in erp_dbf avoid clutter in erp_dbf cleanup zfcp_fsf_req_dismiss functions: - avoid clutter in erp_dbf (reqs_active is always 0) - fold called three-line function into calling function - add meaningful comment - coding style Signed-off-by: Martin Peschke Signed-off-by: Swen Schillig Signed-off-by: James Bottomley commit acaebfd8a7af0019b2edfcf4045c56c3e18375c5 Author: David Howells Date: Thu May 10 22:51:50 2007 -0700 [MTD] generalise the handling of MTD-specific superblocks Generalise the handling of MTD-specific superblocks so that JFFS2 and ROMFS can both share it. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 33672f72b24191fb17c3666ec1c620f3fa617b50 Author: Mike Frysinger Date: Thu May 10 22:51:53 2007 -0700 [MTD] [MAPS] don't force uclinux mtd map to be root dev The cheesy uclinux mtd maps can be used for more than just the root device, so I think we should drop the forcing. Also, I feel like this is a policy decision that shouldnt be in the kernel in the first place. People who have been lazy and boot with uclinux mtd maps and dont put root= into their commandline can simply add the appropriate root= line either into their bootloader or into the compiled in bootargs. Signed-off-by: Mike Frysinger Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse