AgeCommit message (Collapse)AuthorLines
2007-02-04Linux 2.6.20v2.6.20Linus Torvalds-1/+1
2007-02-04[PATCH] EFI x86: pass firmware call parameters on the stackFrédéric Riss-16/+73
When calling into the EFI firmware, the parameters need to be passed on the stack. The recent change to use -mregparm=3 breaks x86 EFI support. This patch is needed to allow the new Intel-based Macs to suspend to ram (efi.get_time is called during the suspend phase). Signed-off-by: Frederic Riss <> Signed-off-by: Linus Torvalds <>
2007-02-03[PATCH] fix rtl8150Al Viro-1/+2
That code doesn't do what its author apparently thought it would do... Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-02-03Merge Torvalds-70/+100
* [SCSI] sd: udev accessing an uninitialized scsi_disk field results in a crash [SCSI] st: A MTIOCTOP/MTWEOF within the early warning will cause the file number to be incorrect [SCSI] qla4xxx: bug fixes [SCSI] Fix scsi_add_device() for async scanning
2007-02-03[PATCH] x86-64: define dma noncoherent API functionsJeff Garzik-0/+3
x86-64 is missing these: Signed-off-by: Jeff Garzik <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-03[PATCH] Altix: more ACPI PRT supportJohn Keller-0/+3
The SN Altix platform does not conform to the IOSAPIC IRQ routing model. Add code in acpi_unregister_gsi() to check if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) and return. Due to an oversight, this code was not added previously when similar code was added to acpi_register_gsi(). Signed-off-by: John Keller <> Acked-by: Len Brown <> Cc: "Luck, Tony" <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-03[PATCH] revert blockdev direct io back to 2.6.19 versionAndrew Morton-0/+41
Andrew Vasquez is reporting as-iosched oopses and a 65% throughput slowdown due to the recent special-casing of direct-io against blockdevs. We don't know why either of these things are occurring. The patch minimally reverts us back to the 2.6.19 code for a 2.6.20 release. Cc: Andrew Vasquez <> Cc: Ken Chen <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-03[PATCH] alpha: fix epoll syscall enumerationsMike Frysinger-3/+8
We went and named them __NR_sys_foo instead of __NR_foo. It may be too late to change this, but we can at least add the proper names now. Signed-off-by: Mike Frysinger <> Cc: Richard Henderson <> Cc: Ivan Kokshaysky <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-03[PATCH] net/smc911x: match up spin lock/unlockPeter Korsgaard-2/+3
smc911x_phy_configure's error handling unconditionally unlocks the spinlock even if it wasn't locked. Patch fixes it. Signed-off-by: Peter Korsgaard <> Cc: Jeff Garzik <> Cc: <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-03[PATCH] kexec: Avoid migration of already disabled irqs (ia64)Magnus Damm-0/+3
This patch fixes up ia64 kexec support for HP rx2620 hardware. It does this by skipping migration of already disabled irqs. This is most likely a problem on other ia64 platforms as well, but I've only been able to reproduce it on one machine so far. The full story is that handle_bad_irq() gets invoked before starting the new kernel without this patch. This seems to happen when fixup_irqs() calls generic_handle_irq() on already migrated (and disabled) irqs. So by avoiding migration of disabled irqs we stay away of handle_bad_irq(). The code has been tested on three different ia64 machines, all with good results. It is possible to trigger the same bug by offlining a processor using echo 0 > /sys/devices/system/cpu/cpuX/online. More detailed information is available in the following mail thread: Signed-off-by: Magnus Damm <> Acked-by: Simon Horman <> Acked-by: Zou, Nanhai <> Acked-by: Jay Lan <> Acked-by: "Luck, Tony" <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-03[PATCH] aio: fix buggy put_ioctx call in aio_complete - v2Ken Chen-11/+9
An AIO bug was reported that sleeping function is being called in softirq context: BUG: warning at kernel/mutex.c:132/__mutex_lock_common() Call Trace: [<a000000100577b00>] __mutex_lock_slowpath+0x640/0x6c0 [<a000000100577ba0>] mutex_lock+0x20/0x40 [<a0000001000a25b0>] flush_workqueue+0xb0/0x1a0 [<a00000010018c0c0>] __put_ioctx+0xc0/0x240 [<a00000010018d470>] aio_complete+0x2f0/0x420 [<a00000010019cc80>] finished_one_bio+0x200/0x2a0 [<a00000010019d1c0>] dio_bio_complete+0x1c0/0x200 [<a00000010019d260>] dio_bio_end_aio+0x60/0x80 [<a00000010014acd0>] bio_endio+0x110/0x1c0 [<a0000001002770e0>] __end_that_request_first+0x180/0xba0 [<a000000100277b90>] end_that_request_chunk+0x30/0x60 [<a0000002073c0c70>] scsi_end_request+0x50/0x300 [scsi_mod] [<a0000002073c1240>] scsi_io_completion+0x200/0x8a0 [scsi_mod] [<a0000002074729b0>] sd_rw_intr+0x330/0x860 [sd_mod] [<a0000002073b3ac0>] scsi_finish_command+0x100/0x1c0 [scsi_mod] [<a0000002073c2910>] scsi_softirq_done+0x230/0x300 [scsi_mod] [<a000000100277d20>] blk_done_softirq+0x160/0x1c0 [<a000000100083e00>] __do_softirq+0x200/0x240 [<a000000100083eb0>] do_softirq+0x70/0xc0 See report: flush_workqueue() is not allowed to be called in the softirq context. However, aio_complete() called from I/O interrupt can potentially call put_ioctx with last ref count on ioctx and triggers bug. It is simply incorrect to perform ioctx freeing from aio_complete. The bug is trigger-able from a race between io_destroy() and aio_complete(). A possible scenario: cpu0 cpu1 io_destroy aio_complete wait_for_all_aios { __aio_put_req ... ctx->reqs_active--; if (!ctx->reqs_active) return; } ... put_ioctx(ioctx) put_ioctx(ctx); __put_ioctx bam! Bug trigger! The real problem is that the condition check of ctx->reqs_active in wait_for_all_aios() is incorrect that access to reqs_active is not being properly protected by spin lock. This patch adds that protective spin lock, and at the same time removes all duplicate ref counting for each kiocb as reqs_active is already used as a ref count for each active ioctx. This also ensures that buggy call to flush_workqueue() in softirq context is eliminated. Signed-off-by: "Ken Chen" <> Cc: Zach Brown <> Cc: Suparna Bhattacharya <> Cc: Benjamin LaHaise <> Cc: Badari Pulavarty <> Cc: <> Acked-by: Jeff Moyer <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-02[NETFILTER]: nf_conntrack_h323: fix compile error with CONFIG_IPV6=m, ↵Adrian Bunk-1/+1
CONFIG_NF_CONNTRACK_H323=y Fix this by letting NF_CONNTRACK_H323 depend on (IPV6 || IPV6=n). Signed-off-by: Adrian Bunk <> Signed-off-by: David S. Miller <>
2007-02-02[NETFILTER]: ctnetlink: fix compile failure with NF_CONNTRACK_MARK=nPatrick McHardy-0/+4
CC net/netfilter/nf_conntrack_netlink.o net/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_conntrack_event': net/netfilter/nf_conntrack_netlink.c:392: error: 'struct nf_conn' has no member named 'mark' make[3]: *** [net/netfilter/nf_conntrack_netlink.o] Error 1 Signed-off-by: Patrick McHardy <> Signed-off-by: David S. Miller <>
2007-02-02[SCSI] sd: udev accessing an uninitialized scsi_disk field results in a crashNagendra Singh Tomar-10/+10
sd_probe() calls class_device_add() even before initializing the sdkp->device variable. class_device_add() eventually results in the user mode udev program to be called. udev program can read the the allow_restart attribute of the newly created scsi device. This is resulting in a crash as the show function for allow_restart (i.e sd_show_allow_restart) returns the attribute value by reading the sdkp->device->allow_restart variable. As the sdkp->device is not initialized before calling the user mode hotplug helper, this results in a crash. The patch below solves it by calling class_device_add() only after the necessary fields in the scsi_disk structure are initialized properly. Signed-off-by: Nagendra Singh Tomar <> Signed-off-by: James Bottomley <>
2007-02-02Merge branch 'upstream-linus' of ↵Linus Torvalds-18/+21 * 'upstream-linus' of libata: Initialize nbytes for internal sg commands libata: Fix ata_busy_wait() kernel docs pata_via: Correct missing comments pata_atiixp: propogate cable detection hack from drivers/ide to the new driver ahci/pata_jmicron: fix JMicron quirk
2007-02-02libata: Initialize nbytes for internal sg commandsBrian King-0/+1
Some LLDDs, like ipr, use nbytes and pad_len to determine the total data transfer length of a command. Make sure nbytes gets initialized for internally generated commands. Signed-off-by: Brian King <> Signed-off-by: Jeff Garzik <>
2007-02-02libata: Fix ata_busy_wait() kernel docsAlan-0/+2
> Looks like you should use ata_busy_wait() here, rather than reproducing > the same code again. It waits in 10uS chunks while 1uS chunks were used in the workaround. Could indeed do that once I know the fix is right. While I'm at it the ata_busy_wait kerneldoc is borked so here's a fix Signed-off-by: Alan Cox <> Signed-off-by: Jeff Garzik <>
2007-02-02pata_via: Correct missing commentsAlan-1/+2
The 8237S was added to the chipsets but not to the comments. Fix this Signed-off-by: Alan Cox <> Signed-off-by: Jeff Garzik <>
2007-02-02pata_atiixp: propogate cable detection hack from drivers/ide to the new driverAlan-2/+9
Signed-off-by: Alan Cox <> Signed-off-by: Jeff Garzik <>
2007-02-02ahci/pata_jmicron: fix JMicron quirkTejun Heo-15/+7
For all JMicrons except for 361 and 368, AHCI mode enable bits in the Control(1) should be set. This used to be done in both ahci and pata_jmicron but while moving programming to PCI quirk, it was removed from ahci part while still left in pata_jmicron. The implemented JMicron PCI quirk was incorrect in that it didn't program AHCI mode enable bits. If pata_jmicron is loaded first and programs those bits, the ahci ports work; otherwise, ahci device detection fails miserably. This patch makes JMicron PCI quirk clear SATA IDE mode bits and set AHCI mode bits and remove the respective part from pata_jmicron. Tested on JMB361, 363 and 368. Signed-off-by: Tejun Heo <> Signed-off-by: Jeff Garzik <>
2007-02-02Merge branch 'upstream-linus' of ↵Linus Torvalds-218/+199 * 'upstream-linus' of spidernet : fix memory leak in spider_net_stop e100: fix napi ifdefs removing needed code netxen patches
2007-02-02Merge Torvalds-2/+18
* [BNX2]: PHY workaround for 5709 A0.
2007-02-02Merge Torvalds-3/+5
* [NET_SCHED]: act_ipt: fix regression in ipt action
2007-02-02Merge Torvalds-1/+1
* [SPARC32]: Fix over-optimization by GCC near ip_fast_csum.
2007-02-02[PATCH] MAINTAINERS: ufs entryEvgeniy Dushistov-0/+6
Mark ufs file system as maintainable, and add me as maintainer, to help people find appropriate person to assign bugs. Signed-off-by: Evgeniy Dushistov <> Signed-off-by: Linus Torvalds <>
2007-02-02Revert "[PATCH] fix typo in geode_configre()@cyrix.c"Linus Torvalds-1/+1
This reverts commit e4f0ae0ea63caceff37a13f281a72652b7ea71ba. It's not wrong, but it's not right either, and everybody seems to agree that the right fix is probably to do the ccr3 write after the ccr4 one (and that we also should clean it up a bit). And after that we need to really validate that all the bits that we write to ccr4 actually do work. The old 2.6.19 code was insane, and basically didn't change ccr4 at all (even though it certainly looks like it was the *intent* to do so). So let's revert the change that may fix things, just because it's not what was actually ever tested when the code was written, even if it _was_ the intent. There's a discussion on that was started by the patch that now gets reverted, and that discussion may well contain the proper long-term fix. Suggested-by: Adrian Bunk <> Acked-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-02spidernet : fix memory leak in spider_net_stopJens Osterkamp-0/+2
We forget to call spider_net_free_rx_chain_contents which does the actual dev_kfree_skb. New skbs are allocated from skbuff_head_cache on each "ifconfig up" letting the cache grow infinitely. This patch fixes it. Signed-off-by: Jens Osterkamp <> Signed-off-by: Jeff Garzik <>
2007-02-02e100: fix napi ifdefs removing needed codeAuke Kok-6/+1
e100: fix napi ifdefs removing needed code From: Auke Kok <> The e100 driver is NAPI mode only. We need to netif_poll_disable during suspend and shutdown. The non-NAPI driver code was removed and is only avaiable in the out-of-tree e100 kernel driver. Signed-off-by: Auke Kok <> Signed-off-by: Jeff Garzik <>
2007-02-02Merge ../linux-2.6Jeff Garzik-104/+154
2007-02-02[BNX2]: PHY workaround for 5709 A0.Michael Chan-2/+18
5709 A0 copper devices will not link up with some link partners without this workaround. Update driver to 1.5.5. Signed-off-by: Michael Chan <> Signed-off-by: David S. Miller <>
2007-02-02[NET_SCHED]: act_ipt: fix regression in ipt actionPatrick McHardy-3/+5
The x_tables patch broke target module autoloading in the ipt action by replacing the ipt_find_target call (which does autoloading) by xt_find_target (which doesn't do autoloading). Additionally xt_find_target may return ERR_PTR values in case of an error, which are not handled. Use xt_request_find_target, which does both autoloading and ERR_PTR handling properly. Also don't forget to drop the target module reference again when xt_check_target fails. Signed-off-by: Patrick McHardy <> Signed-off-by: David S. Miller <>
2007-02-01[SPARC32]: Fix over-optimization by GCC near ip_fast_csum.Bob Breuer-1/+1
In some cases such as: iph->check = 0; iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); GCC may optimize out the previous store. Observed as a failure of NFS over udp (bad checksums on ip fragments) when compiled with GCC 3.4.2. Signed-off-by: Bob Breuer <> Signed-off-by: David S. Miller <>
2007-02-01[PATCH] Remove from MAINTAINERSHaavard Skinnemoen-6/+0 is a technical support address and is not really appropriate for sending patches. Lots of annoying automatics getting in the way. I'm still the maintainer of all the entries touched by this patch, so nothing changes with regard to the "Supported" status of the AVR32 architecture or the macb driver. Signed-off-by: Haavard Skinnemoen <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] via82cxxx: fix typo ("cx7000" should be corrected to "cx700")Bartlomiej Zolnierkiewicz-1/+1
Noticed by Signed-off-by: Bartlomiej Zolnierkiewicz <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] sysrq: showBlockedTasks is sysrq-WRandy Dunlap-40/+46
Change SysRq showBlockedTasks from sysrq-X to sysrq-W and show that in the Help message. It was previously done via X, but X is already used for Xmon on ppc & powerpc platforms and this collision needs to be avoided. All callers of register_sysrq_key() are now marked in the sysrq op/key table. I didn't mark 'h' as Help because Help is just printed for any unknown key, such as '?'. Added some omitted sysrq key entries in the sysrq.txt file. Signed-off-by: Randy Dunlap <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] procfs: Fix listing of /proc/NOT_A_TGID/taskGuillaume Chazarain-1/+11
Listing /proc/PID/task were PID is not a TGID should not result in duplicated entries. [g ~]$ pidof thunderbird-bin 2751 [g ~]$ ls /proc/2751/task 2751 2770 2771 2824 2826 2834 2835 2851 2853 [g ~]$ ls /proc/2770/task 2751 2770 2771 2824 2826 2834 2835 2851 2853 2770 2771 2824 2826 2834 2835 2851 2853 [g ~]$ Signed-off-by: Guillaume Chazarain <> Acked-by: "Eric W. Biederman" <> Cc: Oleg Nesterov <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] KVM: fix lockup on 32-bit intel hosts with nx disabled in the biosAvi Kivity-0/+2
Intel hosts, without long mode, and with nx support disabled in the bios have an efer that is readable but not writable. This causes a lockup on switch to guest mode (even though it should exit with reason 34 according to the documentation). Signed-off-by: Avi Kivity <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] pci: remove warning messagesAndrew Morton-8/+2
Remove these recently-added warnings. They don't tell us anythng very interesting and Kumar says "On an embedded PPC reference system I see this message 6 times when I've got no cards in the PCI slots." Acked-by: Kumar Gala <> Acked-by: Greg KH <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] via quirk updateJean Delvare-3/+5
Add special handling for the VT82C686. Signed-off-by: Jean Delvare <> Cc: Alan Cox <> Cc: Nick Piggin <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] uml-i386: fix build breakage with CONFIG_HIGHMEMAl Viro-0/+9
missing helper used by arch/i386/mm/highmem.c, which is pulled into build on that configuration. Signed-off-by: Al Viro <> Acked-by: Jeff Dike <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] radio modems sitting on serial port are not for s390Al Viro-3/+3
Won't build (request_irq()/free_irq()), even if you manage to find an s390 box with 8250-compatible UART they are expecting. Signed-off-by: Al Viro <> Acked-by: Martin Schwidefsky <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] sanitize sections for sparc32 smpAl Viro-5/+5
a) sun4d_boot_one_cpu() should be __cpuinit (called only from __cpuinit __cpu_up(), for one thing, leads to calls of __cpuinit functions for another). b) got externs in arch/sparc/kernel/smp.c to match reality. Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] efi_set_rtc_mmss() is not __initAl Viro-1/+1
fix the extern in efi.h Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] __crc_... is intended to be absoluteAl Viro-0/+2
i386 boot/compressed/relocs checks for absolute symbols and warns about unexpected ones. If you build with modversions, you get ~2500 warnings about __crc_<symbol>. These suckers are really absolute symbols - we do _not_ want to modify them on relocation. They are generated by genksyms - EXPORT_... generates a weak alias, then genksyms produces an ld script with __crc_<symbol> = <checksum> and it's fed to ld to produce the final object file. Their only use is to match kernel and module at modprobe time; they _must_ be absolute. boot/compressed/relocs has a whitelist of known absolute symbols, but it doesn't know about __crc_... stuff. As the result, we get shitloads of false positives on any ld(1) version. Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] fork_idle() should be __cpuinit, not __devinitAl Viro-1/+1
Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] endianness bug: ntohl() misspelled as >> 24 in fh_verify().Al Viro-1/+1
Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] ide section fixesAl Viro-4/+4
a) cleanup_module() should be __exit b) externs should match reality Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] mca_nmi_hook() can be called at any pointAl Viro-1/+1
... and having it __init is a bad idea. Signed-off-by: Al Viro <> Signed-off-by: Linus Torvalds <>
2007-02-01[PATCH] fix frv headers_checkAl Viro-2/+14
a) registers.h is really needed there b) include of asm-generic/termios should be under __KERNEL__ c) includes of asm-generic/{memory_model,page} should be under __KERNEL (nothing in there that would work in userland) d) a lot of stuff in ptrace.h should be under __KERNEL__. Signed-off-by: Al Viro <> Acked-by: David Howells <> Signed-off-by: Linus Torvalds <>
2007-01-31Merge Torvalds-25/+45
* [NETFILTER]: xt_hashlimit: fix ip6tables dependency [SCTP]: Force update of the rto when processing HB-ACK [IPV6]: fix BUG of ndisc_send_redirect() [IPV6]: Fix up some CONFIG typos [NETFILTER]: SIP conntrack: fix out of bounds memory access [NETFILTER]: SIP conntrack: fix skipping over user info in SIP headers [NETFILTER]: xt_connbytes: fix division by zero [MAINTAINERS]: netfilter@ is subscribers-only