commit 62d0cfcb27cf755cebdc93ca95dabc83608007cd Author: Linus Torvalds Date: Sun Feb 4 10:44:54 2007 -0800 Linux 2.6.20 commit 40c373cc3af9720d1cec0e32c3da26b1d220a95b Author: Frédéric Riss Date: Tue Jan 30 21:41:17 2007 +0100 [PATCH] EFI x86: pass firmware call parameters on the stack 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 commit 886ae1fa1380309d91cdb7e67bd4bf71e053c1d5 Author: Al Viro Date: Sun Feb 4 03:02:17 2007 +0000 [PATCH] fix rtl8150 That code doesn't do what its author apparently thought it would do... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 259886a7c4e4eb0089181e800d1f477cb3786875 Author: Jeff Garzik Date: Sat Feb 3 01:14:03 2007 -0800 [PATCH] x86-64: define dma noncoherent API functions x86-64 is missing these: Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72253943f7281fc5c6249d9cafd63e7de3266fe9 Author: John Keller Date: Sat Feb 3 01:14:02 2007 -0800 [PATCH] Altix: more ACPI PRT support 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(). http://marc.theaimsgroup.com/?l=linux-acpi&m=116680983430121&w=2 Signed-off-by: John Keller Acked-by: Len Brown Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2e895dbd80c420bfc0937c3729b4afe073b3848 Author: Andrew Morton Date: Sat Feb 3 01:14:01 2007 -0800 [PATCH] revert blockdev direct io back to 2.6.19 version 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 commit 8560a10e16faccafdc2e26c4873bf4edfbbf651e Author: Mike Frysinger Date: Sat Feb 3 01:13:55 2007 -0800 [PATCH] alpha: fix epoll syscall enumerations 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 commit 24d8f6aded45aca87dec6d9c037b75b189e3d731 Author: Peter Korsgaard Date: Sat Feb 3 01:13:50 2007 -0800 [PATCH] net/smc911x: match up spin lock/unlock 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 commit 29a002776ba5ef170446910b1f93c480cdd43706 Author: Magnus Damm Date: Sat Feb 3 01:13:48 2007 -0800 [PATCH] kexec: Avoid migration of already disabled irqs (ia64) 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: http://lists.osdl.org/pipermail/fastboot/2007-January/thread.html#5774 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 commit dee11c2364f51cac53df17d742a0c69097e29a4e Author: Ken Chen Date: Sat Feb 3 01:13:45 2007 -0800 [PATCH] aio: fix buggy put_ioctx call in aio_complete - v2 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: [] __mutex_lock_slowpath+0x640/0x6c0 [] mutex_lock+0x20/0x40 [] flush_workqueue+0xb0/0x1a0 [] __put_ioctx+0xc0/0x240 [] aio_complete+0x2f0/0x420 [] finished_one_bio+0x200/0x2a0 [] dio_bio_complete+0x1c0/0x200 [] dio_bio_end_aio+0x60/0x80 [] bio_endio+0x110/0x1c0 [] __end_that_request_first+0x180/0xba0 [] end_that_request_chunk+0x30/0x60 [] scsi_end_request+0x50/0x300 [scsi_mod] [] scsi_io_completion+0x200/0x8a0 [scsi_mod] [] sd_rw_intr+0x330/0x860 [sd_mod] [] scsi_finish_command+0x100/0x1c0 [scsi_mod] [] scsi_softirq_done+0x230/0x300 [scsi_mod] [] blk_done_softirq+0x160/0x1c0 [] __do_softirq+0x200/0x240 [] do_softirq+0x70/0xc0 See report: http://marc.theaimsgroup.com/?l=linux-kernel&m=116599593200888&w=2 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 commit 3e8219806c33b64a00b0013f96f735451f30c64c Author: Adrian Bunk Date: Fri Feb 2 19:33:52 2007 -0800 [NETFILTER]: nf_conntrack_h323: fix compile error with CONFIG_IPV6=m, 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 commit 40e0cb004a6d4a7ad577724e451e8dbd6cba5a89 Author: Patrick McHardy Date: Fri Feb 2 19:33:11 2007 -0800 [NETFILTER]: ctnetlink: fix compile failure with NF_CONNTRACK_MARK=n 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 commit 017f2e37ae19ccd28e5edd965741fc374194c5dd Author: Nagendra Singh Tomar Date: Fri Feb 2 17:34:56 2007 +0530 [SCSI] sd: udev accessing an uninitialized scsi_disk field results in a crash 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 commit 49c8042996c84f0df6c49ea2e28a7ef38cd7d773 Author: Brian King Date: Tue Jan 30 11:32:26 2007 -0600 libata: Initialize nbytes for internal sg commands 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 commit 0777721c9b270f087bf967369c9acbee3f1a12ae Author: Alan Date: Wed Jan 31 17:47:24 2007 +0000 libata: Fix ata_busy_wait() kernel docs > 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 commit 05c39e502e964ae66336ca8e6960b200cff26f94 Author: Alan Date: Wed Jan 31 17:14:38 2007 +0000 pata_via: Correct missing comments The 8237S was added to the chipsets but not to the comments. Fix this Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 54494f3a8339baad5e8f9d9b87d3ea6a3aa4f540 Author: Alan Date: Wed Jan 31 17:10:46 2007 +0000 pata_atiixp: propogate cable detection hack from drivers/ide to the new driver Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 77280989673ee1ef736a92617f52e2be45651833 Author: Tejun Heo Date: Fri Feb 2 14:51:09 2007 +0900 ahci/pata_jmicron: fix JMicron quirk 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 commit 719d96991ac8d96ea318c6d56500e7ed690a4ac0 Author: Evgeniy Dushistov Date: Fri Feb 2 11:36:34 2007 +0300 [PATCH] MAINTAINERS: ufs entry 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 commit 435f8a605d3b56bb96212f4d70b62ecbd0629340 Author: Linus Torvalds Date: Fri Feb 2 08:07:42 2007 -0800 Revert "[PATCH] fix typo in geode_configre()@cyrix.c" 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 http://lkml.org/lkml/2007/1/9/63 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 commit a55eb05a57a981f16325d035ee3a3ad10485ea0d Author: Jens Osterkamp Date: Thu Feb 1 12:07:47 2007 +0100 spidernet : fix memory leak in spider_net_stop 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 commit a53a33da864a81a238ee84055c8ced775ee25350 Author: Auke Kok Date: Wed Jan 31 11:02:46 2007 -0800 e100: fix napi ifdefs removing needed code 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 commit b659f44e4e144bae02c5beaba78a37db60783ba2 Author: Michael Chan Date: Fri Feb 2 00:46:35 2007 -0800 [BNX2]: PHY workaround for 5709 A0. 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 commit 239a87c87660d3b97a467a661eec927f0dfa9891 Author: Patrick McHardy Date: Fri Feb 2 00:40:36 2007 -0800 [NET_SCHED]: act_ipt: fix regression in ipt action 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 commit 51bcf092917bfaa88d762879d0bbfe7619e8c16c Author: Bob Breuer Date: Thu Feb 1 20:24:35 2007 -0800 [SPARC32]: Fix over-optimization by GCC near ip_fast_csum. 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 commit e34efe3b100d0fbdf053128956c3dd0bc68754d6 Author: Haavard Skinnemoen Date: Thu Feb 1 16:49:31 2007 +0100 [PATCH] Remove avr32@atmel.com from MAINTAINERS avr32@atmel.com 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 commit fb594d31aa2d133ea89d4ead964c51262b331407 Author: Bartlomiej Zolnierkiewicz Date: Thu Feb 1 14:12:27 2007 +0100 [PATCH] via82cxxx: fix typo ("cx7000" should be corrected to "cx700") Noticed by JosephChan@via.com.tw. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Linus Torvalds commit d346cce308f7fc99c7ffdb62060ed404fa340a1c Author: Randy Dunlap Date: Wed Jan 31 23:48:17 2007 -0800 [PATCH] sysrq: showBlockedTasks is sysrq-W 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 commit 7d8952440f4090522b740257f1c6b2cf96413969 Author: Guillaume Chazarain Date: Wed Jan 31 23:48:14 2007 -0800 [PATCH] procfs: Fix listing of /proc/NOT_A_TGID/task 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 commit 432bd6cbf9f016f5480153b1cdfbd046f8d4fb1e Author: Avi Kivity Date: Wed Jan 31 23:48:13 2007 -0800 [PATCH] KVM: fix lockup on 32-bit intel hosts with nx disabled in the bios 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 commit 6a4c24ec52128c1f57b7d2d24cf4dd13fc23f474 Author: Andrew Morton Date: Wed Jan 31 23:48:13 2007 -0800 [PATCH] pci: remove warning messages 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 commit cb7468ef4cce8f240604b80b82ac157fa9930e94 Author: Jean Delvare Date: Wed Jan 31 23:48:12 2007 -0800 [PATCH] via quirk update 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 commit 04add672cf98a788e9e0d753b2ccfa4a3a0caf56 Author: Al Viro Date: Thu Feb 1 13:53:04 2007 +0000 [PATCH] uml-i386: fix build breakage with CONFIG_HIGHMEM 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 commit 9d6ed92196f7acdd1052b0828bb1e2f1a7241815 Author: Al Viro Date: Thu Feb 1 13:52:59 2007 +0000 [PATCH] radio modems sitting on serial port are not for s390 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 commit b4cff8464b12b71fd6573c9b9dd762d2d390ef6c Author: Al Viro Date: Thu Feb 1 13:52:33 2007 +0000 [PATCH] sanitize sections for sparc32 smp 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 commit 472ba91dd9ce76b586d4d513f7e3448330eec7eb Author: Al Viro Date: Thu Feb 1 13:52:54 2007 +0000 [PATCH] efi_set_rtc_mmss() is not __init fix the extern in efi.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2a3d4f1f1f839e354ebd7d40b2d5d8ac8481a930 Author: Al Viro Date: Thu Feb 1 13:52:23 2007 +0000 [PATCH] __crc_... is intended to be absolute i386 boot/compressed/relocs checks for absolute symbols and warns about unexpected ones. If you build with modversions, you get ~2500 warnings about __crc_. 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_ = 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 commit 9abcf40b1d1443e6f0ef86e6a822193142a34abc Author: Al Viro Date: Thu Feb 1 13:52:48 2007 +0000 [PATCH] fork_idle() should be __cpuinit, not __devinit Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fc2dd2e51a1940acac665696e6a70a1a73dc90a4 Author: Al Viro Date: Thu Feb 1 13:52:43 2007 +0000 [PATCH] endianness bug: ntohl() misspelled as >> 24 in fh_verify(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit eb7972271720bfc64dc8bacc5b15f874c0bcc859 Author: Al Viro Date: Thu Feb 1 13:52:38 2007 +0000 [PATCH] ide section fixes a) cleanup_module() should be __exit b) externs should match reality Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit aaba6d4bf6f2a52a0c30ad1da4374ba24bd7163b Author: Al Viro Date: Thu Feb 1 13:52:28 2007 +0000 [PATCH] mca_nmi_hook() can be called at any point ... and having it __init is a bad idea. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e7bc537db9e13adee1f294aa370f16d80f40b73d Author: Al Viro Date: Thu Feb 1 13:08:45 2007 +0000 [PATCH] fix frv headers_check 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 commit 6fd6b17c6d9713f56b5f20903ec3e00fa6cc435e Author: Linus Torvalds Date: Wed Jan 31 16:43:36 2007 -0800 Revert "[PATCH] mm: micro optimise zone_watermark_ok" This reverts commit e80ee884ae0e3794ef2b65a18a767d502ad712ee. Pawel Sikora had a boot-time oops due to it - because the sign change invalidates the following comparisons, since 'free_pages' can be negative. The micro-optimization just isn't worth it. Bisected-by: Pawel Sikora Acked-by: Andrew Morton Cc: Nick Piggin Signed-off-by: Linus Torvalds commit a608ab9cb6a5050394498b2520c6e7c162f4e2cf Author: Al Viro Date: Tue Jan 2 10:39:10 2007 +0000 netxen patches Have fun. >From 24f4a1a77431575a9cdfaae25adda85842099f70 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 1 Jan 2007 15:22:56 -0500 Subject: [PATCH] netxen trivial annotations Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 2e5530236645a042e1481aa19879b819c3e8f5c9 Author: Patrick McHardy Date: Tue Jan 30 21:36:09 2007 -0800 [NETFILTER]: xt_hashlimit: fix ip6tables dependency IP6_NF_IPTABLES=m, CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y results in a linker error since ipv6_find_hdr is defined in ip6_tables.c. Fix similar to Adrian Bunk's H.323 conntrack patch: selecting ip6_tables to be build as module requires hashlimit to be built as module as well. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f56df2f4db6e4af87fb8e941cff69f4501a111df Author: Linus Torvalds Date: Tue Jan 30 19:42:57 2007 -0800 Linux 2.6.20-rc7 Ok, so I said there wouldn't be another -rc. I lied. Signed-off-by: Linus Torvalds commit 41c57a87183a7c458d86f78966d69d4bf18ea0b7 Author: David Barksdale Date: Tue Jan 30 14:36:25 2007 -0800 [PATCH] IPMI: fix timeout list handling Fix a dangling pointer bug in ipmi_timeout_handler. A list of timedout messages is not re-initialized before reuse, causing the head of the list to point to freed memory. Signed-off-by: David Barksdale Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa8609da993b04dc2dd762173a6d0ab1a192e256 Author: Andrew Morton Date: Tue Jan 30 14:36:24 2007 -0800 [PATCH] ntfs: kmap_atomic() atomicity fix The KM_BIO_SRC_IRQ kmap slot requires local irq protection. Acked-by: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3896625d0badd53dbc34d584861a36ba7eb4613f Author: Jeff Dike Date: Tue Jan 30 14:36:17 2007 -0800 [PATCH] uml: fix signal frame alignment Use the same signal frame alignment calculations as the underlying architecture. x86_64 appeared to do this, but the "- 8" was really subtracting 8 * sizeof(struct rt_sigframe) rather than 8 bytes. UML/i386 might have been OK, but I changed the calculation to match i386 just to be sure. Signed-off-by: Jeff Dike Cc: Cc: Adrian Bunk Cc: Paolo 'Blaisorblade' Giarrusso Acked-by: Antoine Martin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99abaf51e25f7d4ac2081e5cdc1f01baa0543514 Author: ethanhsiao@jmicron.com Date: Tue Jan 30 14:36:13 2007 -0800 [PATCH] jmicron: 40/80pin primary detection jmicron module detects all JMB36x as JMB361 and PATA0 has wrong pin status of XICBLID. Cc: Jeff Garzik Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c06bb5d49d8b240876c7c5019197e6a7bd33bcf7 Author: Jean Delvare Date: Tue Jan 30 14:36:09 2007 -0800 [PATCH] Fix VIA quirks Fix VIA quirks that were recently broken by Alan Cox in the upstream kernel (commit 1597cacbe39802d86656d1f2e6329895bd2ef531). My understanding is that pci_find_present() doesn't work yet at the time the quirks are run. So I used a two-step quirk as is done for some other quirks already. First we detect the VIA south bridges and set the right low and high device limits, then we are ready to actually run the quirks on the affected devices. Signed-off-by: Jean Delvare Acked-by: Alan Cox Acked-by: Nick Piggin Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab40c5c6b6861ee71fd97f2611027b01e9ec4da0 Author: Masami Hiramatsu Date: Tue Jan 30 14:36:06 2007 -0800 [PATCH] kprobes: replace magic numbers with enum Replace the magic numbers with an enum, and gets rid of a warning on the specific architectures (ex. powerpc) on which the compiler considers 'char' as 'unsigned char'. Signed-off-by: Masami Hiramatsu Cc: Prasanna S Panchamukhi Cc: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46bae1a9a767f3ae8e636d96f9b95703df34b398 Author: Neil Brown Date: Tue Jan 30 14:36:01 2007 -0800 [PATCH] Remove warning: VFS is out of sync with lock manager But keep it as a dprintk The message can be generated in a quite normal situation: If a 'lock' request is interrupted, then the lock client needs to record that the server has the lock, incase it does. When we come the unlock, the server might say it doesn't, even though we think it does (or might) and this generates the message. Signed-off-by: Neil Brown Acked-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec268be36e79d99443efc4be3a617d6efc6f719b Author: Mike Frysinger Date: Tue Jan 30 14:35:55 2007 -0800 [PATCH] translate dashes in filenames for headers install The current filename->define translation does not scrub dashes so when creating stub defines for like asm-x86_64/ptrace-abi.h, we get: #define __ASM_STUB_PTRACE-ABI_H gcc just hates that sort of thing :) trivial attached patch adds - to the tr list to scrub it to _ Signed-off-by: Mike Frysinger Cc: David Woodhouse Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d59a01bc461bbab4017ff449b8401151ef44cf6 Author: Adam Litke Date: Tue Jan 30 14:35:39 2007 -0800 [PATCH] Don't allow the stack to grow into hugetlb reserved regions When expanding the stack, we don't currently check if the VMA will cross into an area of the address space that is reserved for hugetlb pages. Subsequent faults on the expanded portion of such a VMA will confuse the low-level MMU code, resulting in an OOPS. Check for this. Signed-off-by: Adam Litke Cc: David Gibson Cc: William Lee Irwin III Cc: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e533ca16f31f9e5abfaf5d8c7dbe7095f01474b6 Author: Vlad Yasevich Date: Tue Jan 30 14:36:14 2007 -0800 [SCTP]: Force update of the rto when processing HB-ACK When processing a HEARTBEAT-ACK it's possible that the transport rto timers will not be updated because a prior T3-RTX processing would have cleared the rto_pending flag on the transport. However, if we received a valid HEARTBEAT-ACK, we want to force update the rto variables, so re-set the rto_pending flag before calling sctp_transport_update_rto(). Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 29556526b970c2e7d4ca808b6082c33981adfdff Author: Li Yewang Date: Tue Jan 30 14:33:20 2007 -0800 [IPV6]: fix BUG of ndisc_send_redirect() When I tested IPv6 redirect function about kernel 2.6.19.1, and found that the kernel can send redirect packets whose target address is global address, and the target is not the actual endpoint of communication. But the criteria conform to RFC2461, the target address defines as following: Target Address An IP address that is a better first hop to use for he ICMP Destination Address. When the target is the actual endpoint of communication, i.e., the destination is a neighbor, the Target Address field MUST contain the same value as the ICMP Destination Address field. Otherwise the target is a better first-hop router and the Target Address MUST be the router's link-local address so that hosts can uniquely identify routers. According to this definition, when a router redirect to a host, the target address either the better first-hop router's link-local address or the same as the ICMP destination address field. But the function of ndisc_send_redirect() in net/ipv6/ndisc.c, does not check the target address correctly. There is another definition about receive Redirect message in RFC2461: 8.1. Validation of Redirect Messages A host MUST silently discard any received Redirect message that does not satisfy all of the following validity checks: ...... - The ICMP Target Address is either a link-local address (when redirected to a router) or the same as the ICMP Destination Address (when redirected to the on-link destination). ...... And the receive redirect function of ndisc_redirect_rcv() implemented this definition, checks the target address correctly. if (ipv6_addr_equal(dest, target)) { on_link = 1; } else if (!(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) { ND_PRINTK2(KERN_WARNING "ICMPv6 Redirect: target address is not link-local.\n"); return; } So, I think the send redirect function must check the target address also. Signed-off-by: Li Yewang Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit fa03ef38e1516c1f35f6a189100186dded0f8f8c Author: Neil Horman Date: Tue Jan 30 14:30:10 2007 -0800 [IPV6]: Fix up some CONFIG typos Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit adcb4711101dfef89d473f64a913089d303962ae Author: Patrick McHardy Date: Tue Jan 30 14:25:24 2007 -0800 [NETFILTER]: SIP conntrack: fix out of bounds memory access When checking for an @-sign in skp_epaddr_len, make sure not to run over the packet boundaries. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7da5bfbb12e327b3a347ee3e076957cd6564eb56 Author: Lars Immisch Date: Tue Jan 30 14:24:57 2007 -0800 [NETFILTER]: SIP conntrack: fix skipping over user info in SIP headers When trying to skip over the username in the Contact header, stop at the end of the line if no @ is found to avoid mangling following headers. We don't need to worry about continuation lines because we search inside a SIP URI. Fixes Netfilter Bugzilla #532. Signed-off-by: Lars Immisch Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit fb74a8416022c033e1a950689c264c453f8f98d8 Author: Patrick McHardy Date: Tue Jan 30 14:24:29 2007 -0800 [NETFILTER]: xt_connbytes: fix division by zero When the packet counter of a connection is zero a division by zero occurs in div64_64(). Fix that by using zero as average value, which is correct as long as the packet counter didn't overflow, at which point we have lost anyway. Additionally we're probably going to go back to 64 bit counters in 2.6.21. Based on patch from Jonas Berlin , with suggestions from KOVACS Krisztian . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 24a1dec55073000264f2da6278baef759929a14f Author: Randy Dunlap Date: Sun Jan 28 15:54:42 2007 -0800 [MAINTAINERS]: netfilter@ is subscribers-only netfilter mailing list is subscribers-only. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit bcdddfb66cc998252d34758ce4109cedc0d24a5c Author: Linus Torvalds Date: Tue Jan 30 14:11:12 2007 -0800 Revert "net: ifb error path loop fix" This reverts commit 0c0b3ae68ec93b1db5c637d294647d1cca0df763. Quoth David: "Jeff, please revert It's wrong. We had a lengthy analysis of this piece of code several months ago, and it is correct. Consider, if we run the loop and we get an error the following happens: 1) attempt of ifb_init_one(i) fails, therefore we should not try to "ifb_free_one()" on "i" since it failed 2) the loop iteration first increments "i", then it check for error Therefore we must decrement "i" twice before the first free during the cleanup. One to "undo" the for() loop increment, and one to "skip" the ifb_init_one() case which failed." Reported-by: David Miller Acked-by: Jeff Garzik Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 0f2452855d86901ba3766826ccb5606ea4e15ab9 Author: Serge E. Hallyn Date: Tue Jan 30 15:28:23 2007 -0600 [PATCH] namespaces: fix task exit disaster This is based on a patch by Eric W. Biederman, who pointed out that pid namespaces are still fake, and we only have one ever active. So for the time being, we can modify any code which could access tsk->nsproxy->pid_ns during task exit to just use &init_pid_ns instead, and move the exit_task_namespaces call in do_exit() back above exit_notify(), so that an exiting nfs server has a valid tsk->sighand to work with. Long term, pulling pid_ns out of nsproxy might be the cleanest solution. Signed-off-by: Eric W. Biederman [ Eric's patch fixed to take care of free_pid() too ] Signed-off-by: Serge E. Hallyn Signed-off-by: Linus Torvalds commit 444f378b237a0f728f5c4aba752c08d13c209344 Author: Linus Torvalds Date: Tue Jan 30 13:35:18 2007 -0800 Revert "[PATCH] namespaces: fix exit race by splitting exit" This reverts commit 7a238fcba0629b6f2edbcd37458bae56fcf36be5 in preparation for a better and simpler fix proposed by Eric Biederman (and fixed up by Serge Hallyn) Acked-by: Serge E. Hallyn Signed-off-by: Linus Torvalds commit b20c8453a7d6e8d63c0f05ba3e38d9428c8091b1 Author: Al Viro Date: Tue Jan 30 13:23:40 2007 +0000 [PATCH] fix indentation-related breakage in Kconfig.i386 Kconfig recognizes the end of help text by receding indentation depth. Recent patch had broken HOST_VMSPLIT_... choice in arch/um/Kconfig.i386 - all alternatives are interpreted as part of help text now. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 774ba59c950926abd27421fa146f1916de89e6f6 Author: Al Viro Date: Tue Jan 30 13:23:50 2007 +0000 [PATCH] b44: src_desc->addr is little-endian Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6a13f66043cd755fc7e19f8e0fbb5bfcdf470e74 Author: Al Viro Date: Tue Jan 30 13:24:00 2007 +0000 [PATCH] dma-mapping.h stubs fix do { } while(0) is not a good imitation of function returning void; use ((void)0) instead. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d0a23398eeaa374eb0c0435c5a259ffde77c8af0 Author: Al Viro Date: Tue Jan 30 13:23:55 2007 +0000 [PATCH] missing dma_sync_single_range_for{cpu,device} on alpha no-op as all dma_sync_... there. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 161c888b0b4d28775dfe35274ee90c16a91b4365 Author: Al Viro Date: Tue Jan 30 13:23:45 2007 +0000 [PATCH] pata_platform: fallout from set_mode() change Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9a696b4f3c5664c2c4815cc8e37256e51a3425e1 Author: Al Viro Date: Tue Jan 30 13:23:35 2007 +0000 [PATCH] sym53c500_cs: remove bogus call fo free_dma() What DMA for 16bit pcmcia card, anyway? We never do request_dma() there and ->dma_channel never changes since initialization to -1. IOW, that call is dead code. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a12743026ceb34388b9b983801ba99240cb0a199 Author: Al Viro Date: Tue Jan 30 13:23:30 2007 +0000 [PATCH] mtd/nand/cafe.c missing include of dma-mapping.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 89eb1693f975eddafd475782ee857d98f411d10d Author: Al Viro Date: Tue Jan 30 13:23:25 2007 +0000 [PATCH] missing exports of pm_power_off() on alpha and sparc32 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 701dfbc1cbdd42b814dd76a885c4b73f97011d08 Author: Hugh Dickins Date: Mon Jan 29 21:24:08 2007 +0000 [PATCH] mm: mremap correct rmap accounting Nick Piggin points out that page accounting on MIPS multiple ZERO_PAGEs is not maintained by its move_pte, and could lead to freeing a ZERO_PAGE. Instead of complicating that move_pte, just forget the minor optimization when mremapping, and change the one thing which needed it for correctness - filemap_xip use ZERO_PAGE(0) throughout instead of according to address. [ "There is no block device driver one could use for XIP on mips platforms" - Carsten Otte ] Signed-off-by: Hugh Dickins Cc: Nick Piggin Cc: Andrew Morton Cc: Ralf Baechle Cc: Carsten Otte Signed-off-by: Linus Torvalds commit 8339f0008c47cdd921c73f6d53d5588b5484f93c Author: Eric W. Biederman Date: Mon Jan 29 13:19:05 2007 -0700 [PATCH] i386: In assign_irq_vector look at all vectors before giving up When the world was a simple and static place setting up irqs was easy. It sufficed to allocate a linux irq number and a find a free cpu vector we could receive that linux irq on. In those days it was a safe assumption that any allocated vector was actually in use so after one global pass through all of the vectors we would have none left. These days things are much more dynamic with interrupt controllers (in the form of MSI or MSI-X) appearing on plug in cards and linux irqs appearing and disappearing. As these irqs come and go vectors are allocated and freed, invalidating the ancient assumption that all allocated vectors stayed in use forever. So this patch modifies the vector allocator to walk through every possible vector before giving up, and to check to see if a vector is in use before assigning it. With these changes we stop leaking freed vectors and it becomes possible to allocate and free irq vectors all day long. This changed was modeled after the vector allocator on x86_64 where this limitation has already been removed. In essence we don't update the static variables that hold the position of the last vector we allocated until have successfully allocated another vector. This allows us to detect if we have completed one complete scan through all of the possible vectors. Acked-by: Auke Kok Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 59df3230fc57fa8900bebf3d2d68221d549f3c7c Author: Geert Uytterhoeven Date: Mon Jan 29 13:47:01 2007 +0100 [PATCH] `make help' in build tree doesn't show headers_* targets `make help' in the build tree doesn't show the help texts about the `headers_install' and `headers_check' targets because it looks for include/asm-$(ARCH)/Kbuild in the wrong place. Add the missing `$(srctree)' prefixes to fix this. Also move the printing of the default install path for the headers inside the `if/fi', where it belongs. Signed-off-by: Geert Uytterhoeven Acked-by: Oleg Verych Signed-off-by: Linus Torvalds commit 3d8b3036f5260b366ec0982aa2f862d841d058c2 Author: Jan Engelhardt Date: Mon Jan 29 13:19:56 2007 -0800 [PATCH] cdev.h: forward declarations Apparently this broke due to missing `struct inode' declaration. Signed-off-by: Jan Engelhardt Cc: Noah Watkins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efee2b812645d10824bf6cb247789910bcb66881 Author: Evgeniy Dushistov Date: Mon Jan 29 13:19:56 2007 -0800 [PATCH] ufs: reallocation fix In blocks reallocation function sometimes does not update some of buffer_head::b_blocknr, which may and cause data damage. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8682164a66325cab07620082eb7f413b547f4b4a Author: Evgeniy Dushistov Date: Mon Jan 29 13:19:55 2007 -0800 [PATCH] ufs: truncate negative to unsigned fix During ufs_trunc_direct which is subroutine of ufs::truncate, we try the first of all free parts of block and then whole blocks. But we calculate size of block's part to free in the wrong way. This may cause bad update of used blocks and fragments statistic, and you can got report that you have free 32T on 1Gb partition. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a685e26fff387db350966f88eaad515bf41c4705 Author: Evgeniy Dushistov Date: Mon Jan 29 13:19:54 2007 -0800 [PATCH] ufs: alloc metadata null page fix These series of patches result of UFS1 write support stress testing, like running fsx-linux, untar and build linux kernel etc We pass from ufs::get_block_t to levels below: pointer to the current page, to make possible things like reallocation of blocks on the fly, and we also uses this pointer for indication, what actually we allocate data block or meta data block, but currently we make decision about what we allocate on the wrong level, this may and cause oops if we allocate blocks in some special order. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff79544754631cf3d237ff47b7d0e7ab2d211fcf Author: Miklos Szeredi Date: Mon Jan 29 13:19:54 2007 -0800 [PATCH] fuse: fix bug in control filesystem mount The BUG in fuse_ctl_add_dentry() could be triggered if the control filesystem was unmounted and mounted again while one or more fuse filesystems were present. The fix is to reset the dentry counter in fuse_ctl_kill_sb(). Bug reported by Florent Mertens. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 436d1654b341e55a73cada13cce3142b619f23bb Author: Mike Frysinger Date: Mon Jan 29 13:19:53 2007 -0800 [PATCH] use __u8 rather than u8 in userspace SIZE defines in hdreg.h Use __u8 rather than u8 in SIZE defines exported to userspace. Signed-off-by: Mike Frysinger Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34e9a63b4f3e169b583f6ba2e26356ecbf932fba Author: NeilBrown Date: Mon Jan 29 13:19:52 2007 -0800 [PATCH] knfsd: ratelimit some nfsd messages that are triggered by external events Also remove {NFSD,RPC}_PARANOIA as having the defines doesn't really add anything. The printks covered by RPC_PARANOIA were triggered by badly formatted packets and so should be ratelimited. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d019bcf0eb9a55c51f1c57659f923d356b4675e1 Author: Adrian Bunk Date: Mon Jan 29 13:19:51 2007 -0800 [PATCH] fs/lockd/clntlock.c: add missing newlines to dprintk's This patch adds missing newlines to dprintk's. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0f7b67ae470f3afed3f03d017fd1c29fd1b58b8 Author: Andrew Morton Date: Mon Jan 29 13:19:50 2007 -0800 [PATCH] m68k: uaccess.h needs sched.h In file included from include/linux/crypto.h:26, from crypto/cipher.c:17: include/linux/uaccess.h: In function 'pagefault_disable': include/linux/uaccess.h:18: error: dereferencing pointer to incomplete type include/linux/uaccess.h: In function 'pagefault_enable': include/linux/uaccess.h:33: error: dereferencing pointer to incomplete type video_buf need PCI. Acked-by: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49b14f24cc5aa962446515c9df501192eda99bd4 Author: Robert P. J. Day Date: Mon Jan 29 13:19:50 2007 -0800 [PATCH] Fix "CONFIG_X86_64_" typo in drivers/kvm/svm.c Fix what looks like an obvious typo in the file drivers/kvm/svm.c. Signed-off-by: Robert P. J. Day Acked-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04611f98ce34f8911740ccd7e2bf0c22f818f622 Author: Mike Frysinger Date: Mon Jan 29 13:19:49 2007 -0800 [PATCH] use __u8/__u32 in userspace ioctl defines for I2O Make sure exported I2O ioctls utilize userspace safe types. Signed-off-by: Mike Frysinger Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88f6cd0c3bb5db2619103f834d4167b7d0d9899c Author: Johannes Stezenbach Date: Mon Jan 29 13:19:44 2007 -0800 [PATCH] uml: fix mknod Fix UML hostfs mknod(): userspace has differernt dev_t size and encoding than kernel, so extract major/minor and reencode using glibc makedev() macro. Signed-off-by: Johannes Stezenbach Acked-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a238fcba0629b6f2edbcd37458bae56fcf36be5 Author: Serge E. Hallyn Date: Mon Jan 29 13:19:40 2007 -0800 [PATCH] namespaces: fix exit race by splitting exit Fix exit race by splitting the nsproxy putting into two pieces. First piece reduces the nsproxy refcount. If we dropped the last reference, then it puts the mnt_ns, and returns the nsproxy as a hint to the caller. Else it returns NULL. The second piece of exiting task namespaces sets tsk->nsproxy to NULL, and drops the references to other namespaces and frees the nsproxy only if an nsproxy was passed in. A little awkward and should probably be reworked, but hopefully it fixes the NFS oops. Signed-off-by: Serge E. Hallyn Cc: Herbert Poetzl Cc: Oleg Nesterov Cc: "Eric W. Biederman" Cc: Cedric Le Goater Cc: Daniel Hokka Zakrisson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90afd0e574a1a739aeb62e30d556ebf0289389e5 Author: Dmitriy Monakhov Date: Sat Jan 27 00:00:03 2007 -0800 Broadcom 4400 resume small fix Some issues in b44_resume(). - Return value of pci_enable_device() was ignored. - If request_irq() has failed we have to just disable device and exit. Signed-off-by: Dmitriy Monakhov Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 00576e93805bd4f2dd2649e354726dee872d1e8a Author: Al Viro Date: Tue Jan 30 13:23:50 2007 +0000 b44: src_desc->addr is little-endian Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit 518d83382568964ca9657511140398ebac925ecd Author: Auke Kok Date: Mon Jan 29 14:31:16 2007 -0800 e100: fix irq leak on suspend/resume e100: fix irq leak on suspend/resume From: Frederik Deweerdt The e100_resume() function should be calling netif_device_detach and free_irq. This fixes multiple irq's being allocated after resume. Signed-off-by: Frederik Deweerdt Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit f8a8ccd56d82bd4f4b5c7c2e7eb758c7764d98e1 Author: Andy Gospodarek Date: Mon Jan 29 12:08:38 2007 -0800 bonding: ARP monitoring broken on x86_64 While working with the latest bonding code I noticed a nasty problem that will prevent arp monitoring from always functioning correctly on x86_64 systems. Comparing ints to longs and expecting reliable results on x86_64 is a bad idea. With this patch, arp monitoring works correctly again. Signed-off-by: Andy Gospodarek Cc: "David S. Miller" Cc: Stephen Hemminger Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit d4150a2731615de5cd4527a23435aaa7396c63c6 Author: Thomas Klein Date: Mon Jan 29 18:44:41 2007 +0100 ehea: Fixed missing tasklet_kill() call NEQ-Tasklet wasn't killed when module is removed. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 9c750b7d14301b710c13247f7cc28abd614d9f5c Author: Thomas Klein Date: Mon Jan 29 18:44:01 2007 +0100 ehea: Fixed wrong jumbo frames status query This patch fixes the wrong query and logging of the per interface jumbo frames enabled/disabled status. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 9e8e83d1ba0b248de34062a61f4f5d378a5dbd53 Author: Andrew Morton Date: Sat Jan 27 00:00:04 2007 -0800 82596 warning fixes drivers/net/82596.c: In function 'i596_start_xmit': drivers/net/82596.c:1069: warning: cast from pointer to integer of different size drivers/net/82596.c: In function 'i82596_probe': drivers/net/82596.c:1249: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int' Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b1f54ba34f9e036ab515bbac0c01d17300e1c79a Author: Vitaly Bordug Date: Sat Jan 27 00:00:04 2007 -0800 FS_ENET: OF-related fixup for FEC and SCC MAC's Updated direct resource pass with ioremap call, make it grant proper IRQ mapping, stuff incompatible with the new approach were respectively put under #ifndef CONFIG_PPC_MERGE. It is required so that both ppc and powerpc could utilize fs_enet effectively. Signed-off-by: Vitaly Bordug Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 0c0b3ae68ec93b1db5c637d294647d1cca0df763 Author: Mariusz Kozlowski Date: Sat Jan 27 00:00:01 2007 -0800 net: ifb error path loop fix On error we should start freeing resources at [i-1] not [i-2]. Signed-off-by: Mariusz Kozlowski Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5fc7d61aee1a7f7d3448f8fbccaa93371ebeecb0 Author: Michael Chan Date: Fri Jan 26 23:59:57 2007 -0800 b44: Fix frequent link changes This fixes the issue of frequent link changes under heavy traffic reported below: http://bugzilla.kernel.org/show_bug.cgi?id=7696 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=216338 The b44 chip occasionally needs to be reset when ISTAT_ERRORS are encountered. The reset sequence includes a PHY reset that will take many seconds to complete and cause the link to go down and up. By skipping the PHY reset, it will greatly reduce the interruption when ISTAT_ERRORS are encountered. Change the full_reset parameter to reset_kind parameter in b44_init_hw(). This will allow PHY reset to be skipped when ISTAT_ERRORS are encountered. Signed-off-by: Michael Chan Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 78981a7c6c34bddbb90da72cf6ce10953e84aad8 Author: Robert Hancock Date: Tue Jan 30 00:59:18 2007 -0800 libata: fix translation for START STOP UNIT libata's SCSI translation for the SCSI START STOP UNIT command with the START bit clear (i.e. stopping the drive) appears to be incorrect. It sends an ATA STANDBY command with the time period set to 0, which the code comment says means "now", but the ATA standard says this means disable the standby timer, which effectively does nothing. Change this to issue a STANDBY IMMEDIATE command which will actually spin the drive down. The SAT (SCSI/ATA Translation) standard revision 9 concurs with this choice. Signed-off-by: Robert Hancock Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit af068bd1debcc76c1bc265aa01401901bf0067ed Author: David Milburn Date: Tue Jan 30 00:59:15 2007 -0800 libata-scsi: ata_task_ioctl should return ATA registers from sense data User applications using the HDIO_DRIVE_TASK ioctl through libata expect specific ATA registers to be returned to userspace. Verified that ata_task_ioctl correctly returns register values to the smartctl application. Signed-off-by: David Milburn Acked-by: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 2ca6611b1fc1f913f5370b3c50a0a35d817491b3 Author: Andrew Morton Date: Tue Jan 30 00:59:14 2007 -0800 pata_platform: set_mode fix drivers/ata/pata_platform.c:85: warning: initialization from incompatible pointer type Cc: Jeff Garzik Cc: Tejun Heo Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 7a0f1c8a4b1052da7efc7715e2e557255b632712 Author: Lennert Buytenhek Date: Mon Jan 29 13:28:47 2007 +0100 ata_if_xfermask() word 51 fix If word 53 bit 1 isn't set, the maximum PIO mode is indicated by the upper 8 bits of word 51, not the lower 8 bits. Fixes PIO mode detection on old Compact Flash cards. Signed-off-by: Lennert Buytenhek Signed-off-by: Jeff Garzik commit 5dcade90db19205b9ebb8241a22664560973f81a Author: Sergei Shtylyov Date: Sun Jan 28 21:33:44 2007 +0300 pata_sil680: PIO1 taskfile transfers overclocking fix (repost) Fix PIO mode 1 overclocked taskfile transfers -- probably a typo carried over from drivers/ide/pci/siimage.c where I've found it by documentation check... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 76398f9667e8369023ed5f4847fb59e9da8b6968 Author: Jiri Kosina Date: Mon Jan 29 12:44:41 2007 +0100 HID: fix pb_fnmode and move it to generic HID The apple powerbook people are used to switch the pb_fnmode setting at runtime through writing to sysfs, altering the module parameter value. This was broken for them in 2.6.20-rc1 when generic HID layer was introduced, as the pb_fnmode flag was made per-hiddevice, instead of global variable. This patch moves the pb_fnmode module parameter from usbhid module to hid module, but apart from that retains backward compatibility with respect to changing the mode through sysfs. Signed-off-by: Jiri Kosina commit 9616d54fffa4c9ae78136cc6d01209de2d92b75d Author: Robert P. J. Day Date: Thu Jan 25 18:41:35 2007 -0500 [MIPS] Fix typo of "CONFIG_MT_SMP". Signed-off-by: Robert P. J. Day Signed-off-by: Ralf Baechle commit 1ca5cb5ddd500fdf2096ebe9d4131ee9f1eabf43 Author: Ralf Baechle Date: Thu Jan 25 23:55:17 2007 +0000 [MIPS] Ocelot G: Fix a few misspellings of CONFIG_GALILEO_GT64240_ETH Reported by Robert P. J. Day . Signed-off-by: Ralf Baechle commit bf2326e7525404576ab2bdf890e903ca4a249093 Author: Jan Altenberg Date: Thu Jan 25 16:25:56 2007 +0100 [PATCH] Malta: Fix build if CONFIG_MTD is diabled. Signed-off-by: Jan Altenberg Signed-off-by: Ralf Baechle commit c0d4d573feed199b16094c072e7cb07afb01c598 Author: Mike Christie Date: Mon Jan 29 21:18:38 2007 -0500 [PATCH] Fix SG_IO timeout jiffy conversion Commit 85e04e371b5a321b5df2bc3f8e0099a64fb087d7 cleaned up the timeout conversion, but did it exactly the wrong way. We get msecs from user space, and should convert them into jiffies. Not the other way around. Here is a fix with the overflow check sg.c has added in. This fixes DVD burnign with Nero. Signed-off-by: Mike Christie [ "you'll be wanting a comma there" - Andrew ] Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 87df7241bd547da5d4d4a4e5397866dfe422e439 Author: Nick Piggin Date: Tue Jan 30 14:36:27 2007 +1100 [PATCH] Fix try_to_free_buffer() locking Fix commit ecdfc9787fe527491baefc22dce8b2dbd5b2908d Not to put too fine a point on it, but in a nutshell... __set_page_dirty_buffers() | try_to_free_buffers() ---------------------------+--------------------------- | spin_lock(private_lock); | drop_bufers() | spin_unlock(private_lock); spin_lock(private_lock) | !page_has_buffers() | spin_unlock(private_lock) | SetPageDirty() | | cancel_dirty_page() oops! Signed-off-by: Nick Piggin Acked-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4cbf2aa35e1c189db234190fefc6c83b139ef963 Author: Stephen Hemminger Date: Mon Jan 29 16:38:07 2007 -0800 [PATCH] sky2: revert IRQ dance on suspend/resume Let's just backout the IRQ hack, and for those crap machines (like some Sony VAIO's) can just disable MSI with the module parameter. This reverts 44ade178249fe53d055fd92113eaa271e06acddd. Signed-off-by: Stephen Hemminger Cc: Jeff Garzik Cc: Thomas Gleixner Cc: Frédéric Riss Signed-off-by: Linus Torvalds commit dc6e29da9162fa8fa2a9e798569c0f6e87975614 Author: Linus Torvalds Date: Mon Jan 29 16:37:38 2007 -0800 Fix balance_dirty_page() calculations with CONFIG_HIGHMEM This makes balance_dirty_page() always base its calculations on the amount of non-highmem memory in the machine, rather than try to base it on total memory and then falling back on non-highmem memory if the mapping it was writing wasn't highmem capable. This not only fixes a situation where two different writers can have wildly different notions about what is a "balanced" dirty state, but it also means that people with highmem machines don't run into an OOM situation when regular memory fills up with dirty pages. We used to try to handle the latter case by scaling down the dirty_ratio if the machine had a lot of highmem pages in page_writeback_init(), but it wasn't aggressive enough for some situations, and since basing the dirty ratio on highmem memory was broken in the first place, let's just stop doing so. (A variation of this theme fixed Justin Piszcz's OOM problem when copying an 18GB file on a RAID setup). Acked-by: Nick Piggin Cc: Justin Piszcz Cc: Andrew Morton Cc: Neil Brown Cc: Ingo Molnar Cc: Randy Dunlap Cc: Christoph Lameter Cc: Jens Axboe Cc: Peter Zijlstra Cc: Adrian Bunk Signed-off-by: Linus Torvalds commit 7d2aae1e88660cf09be913e9754e45189dc33412 Author: Takashi Iwai Date: Fri Jan 26 12:40:31 2007 +0100 [PATCH] ALSA: Fix sysfs breakage The recent change for a new sysfs tree with card* object breaks the /sys/class/sound tree if CONFIG_SYSFS_DEPRECATED is enabled. The device in each entry doesn't point the correct device object: /sys/class/sound ... |-- pcmC0D0c | |-- dev | |-- device -> ../../../class/sound/card0 | |-- pcm_class | |-- power | | `-- wakeup | |-- subsystem -> ../../../class/sound | `-- uevent Also, this change breaks some drivers (like sound/arm/*) referring card->dev directly to obtain the device object for memory handling. This patch reverts the semantics of card->dev to the former version, which points to a real device object. The card* object is stored in a new card->card_dev field, instead. The device parent is chosen either card->dev or card->card_dev according to CONFIG_SYSFS_DEPRECATED to keep the tree compatibility. Also, card* isn't created if CONFIG_SYSFS_DEPRECATED is enabled. The reason of card* object is a root of all beloing devices, and it makes little sense if each sound device points to the real device object directly. Signed-off-by: Takashi Iwai Acked-by: Monty Montgomery Signed-off-by: Greg Kroah-Hartman commit b9d1902cd281d9b829fb3d6ee9148d28c8c63382 Author: Ben Dooks Date: Mon Jan 29 00:11:29 2007 +0100 [ARM] 4117/1: S3C2412: Fix writel() usage in selection code The S3C2412 DMA selection code has the arguments to writel() the wrong way around. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 3453c8478a228d9b374956ea99256163f1a0c88c Author: Dave Jones Date: Mon Jan 29 00:07:04 2007 -0500 [CPUFREQ] Remove unneeded errata workaround from p4-clockmod. This workaround unnecessarily cripples functionality to work around an errata that doesn't seem possible to hit due to us using the automatic clock throttling in the p4 mcheck code. See http://lkml.org/lkml/2006/10/28/148 for complete reasoning and lack of disconsent. Signed-off-by: Dave Jones commit 0142f9dce8425da031d72dc3b70ee7161fcaaea2 Author: Ahmed S. Darwish Date: Fri Jan 5 05:44:54 2007 +0200 [CPUFREQ] check sysfs_create_link return value Trivial patch to check sysfs_create_link return values. Fail gracefully if needed. Signed-off-by: Ahmed Darwish Signed-off-by: Dave Jones commit 43ed41f648554c9fecaf7597d25e05da63ec7290 Author: Dave Jones Date: Sun Jan 28 17:58:33 2007 -0500 [AGPGART] Add new IDs to VIA AGP. Culled from the VIA codedrop. Also fixes up one ID used in amd64-agp to use the VIA part number instead of the board name in its ID. Signed-off-by: Dave Jones commit 7707ea3b784195315366e6e4b5c73ca6933ff9b0 Author: Dave Jones Date: Sun Jan 28 17:50:17 2007 -0500 [AGPGART] Remove pointless assignment. No point in clearing local pointers then returning. Also fix up some CodingStyle nits. Signed-off-by: Dave Jones commit 87a17f31a3bc9bf0c7e7493add19ef200e741248 Author: Dave Jones Date: Sun Jan 28 17:41:37 2007 -0500 [AGPGART] Remove pointless typedef in ati-agp This seems to exist just to save people typing 'struct' a few times, and doesn't provide any additional value. Signed-off-by: Dave Jones commit c30efbaeaa9297fb1a35ef952350e0c2bb7a3d47 Author: Dave Jones Date: Sun Jan 28 17:39:19 2007 -0500 [AGPGART] Prevent (unlikely) memory leak in amd_create_gatt_pages() If we fail an alloc, unwind the previous allocs that succeeded. Spotted-by: Alan Grimes Signed-off-by: Dave Jones commit 545da94f924d52f80e2bbea99a8652f454889a2b Author: Benjamin Herrenschmidt Date: Sun Jan 28 07:45:53 2007 +1100 [POWERPC] Fix sys_pciconfig_iobase bus matching A stupid bug has been plaguing the sys_pciconfig_iobase on ppc64. It wasn't noticed until recently as it seems to not affect G5s but it's been causing problems running X servers on some other machines recently. The bus number matching was bogus. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 05916eec9f4d4370ef9a6cbb699f637302f6e157 Author: Geoff Levand Date: Thu Jan 25 18:07:14 2007 -0800 [POWERPC] PS3: add not complete comment to kconfig Add a comment to the PS3 config option to inform users that the current implementation is not yet complete. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 91614c054c9ffc26b47a5cb3135113aa0f6e6ff0 Author: Kai Makisara Date: Fri Jan 26 00:38:39 2007 +0200 [SCSI] st: A MTIOCTOP/MTWEOF within the early warning will cause the file number to be incorrect On Wed, 24 Jan 2007, Andrew Morton wrote: > On Mon, 22 Jan 2007 13:07:20 -0800 > bugme-daemon@bugzilla.kernel.org wrote: > > > http://bugzilla.kernel.org/show_bug.cgi?id=7864 > > > > Summary: A MTIOCTOP/MTWEOF within the early warning will cause > > the file number to be incorrect > > Kernel Version: 2.6.19.2 > > Status: NEW > > Severity: low > > Owner: io_scsi@kernel-bugs.osdl.org > > Submitter: ce_reisinger@yahoo.com > > > > > > Write records to a SCSI tape until a write fails with a ENOSPC (you have reached > > early warning. > > Now perform a: > > struct mtget before, after; > > ioctl(fd, MTIOCGET, &before); > > struct mtop mtop = { MTWEOF, 1 }; > > ioctl(fd, MTIOCTOP, &mtop); > > ioctl(fd, MTIOCGET, &after); > > > > Check the value of mt_fileno in the before and after structures. Notice the > > after is 2 greater then the before. > > > > The problem appears to be in the block of code starting at line 2817 in st.c. > > This block is entered because the drive did return a CHECK CONDITION with NO > > SENSE and the SENSE_EOM bit set. At lines 2824/5 the fileno is incremented. But > > it has already been increased by the number of filemarks requested by the > > MTIOCTOP. I believe that the residue count in the sense data should be > > subtracted from fileno, not a increment as is done. > > > > Thanks. Could you please send us a tested patch to fix these things, as > per http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt ? > The analysis is basically correct and explains the bug. According to the SCSI standards, the sense code is NO SENSE or RECOVERED ERROR in case writing filemark(s) succeeds. If it fails (partly or completely) the sense code is VOLUME OVERFLOW. The patch below is tested to fix the case when one filemark is successfully written after the EOM early warning. It should also fix the case at real EOM but this has not been tested. Carl, thanks for reporting the bug and providing the analysis for the fix. Signed-off-by: Kai Makisara Signed-off-by: James Bottomley commit 477ffb9d8732f30e7ab2d20f6ed0c22bad37a4a5 Author: David C Somayajulu Date: Mon Jan 22 12:26:11 2007 -0800 [SCSI] qla4xxx: bug fixes The included patch fixes the following issues: 1. qla3xxx/qla4xxx co-existence issue which can result in a lockup when qla3xxx driver is unloaded, or when ifdown; ifup is performed on one of the interfaces correponding to qla3xxx. This is because qla4xxx HBA supports one ethernet and iscsi interfaces per port. Both iscsi and ethernet interfaces share the same state machine. The problem has to do with synchronizing access to the state machine in the event of a reset 2. mutex_lock() is sometimes not followed by mutex_unlock() prior to invoking a msleep() in qla4xxx_mailbox_command() Signed-off-by: James Bottomley commit 938e2ac0b7ac72d264783b0b548eb6078c295294 Author: Matthew Wilcox Date: Mon Jan 15 18:07:09 2007 -0700 [SCSI] Fix scsi_add_device() for async scanning I had thought that all drivers which didn't call scsi_scan_host() called scsi_scan_target(). Some, such as sbp2, mptsas and libata-scsi, call scsi_add_device() or __scsi_add_device(). We just need to wait for the currently executing async scans to complete first. This is the same code that's in scsi_scan_target(), except that we have to return an error instead of void when we're declining to scan at all. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit e0b874df14052489e6408125903dba96b4dd7baa Author: Josepch Chan Date: Sat Jan 27 13:47:08 2007 +0100 via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S This patch: * Corrects the wrong device ID of PCI_DEVICE_ID_VIA_SATA_EIDE from 0x0581 to 0x5324. * Adds VIA CX700 and VT8237S support in drivers/ide/pci/via82cxxx.c * Adds VIA VT8237S support in drivers/ata/pata_via.c Signed-off-by: Josepch Chan Signed-off-by: Bartlomiej Zolnierkiewicz commit 6855036aa035913bc2bfb31c41576a49f42ecd5f Author: Tejun Heo Date: Sat Jan 27 13:47:02 2007 +0100 ide: unregister idepnp driver on unload idepnp driver is registered as a pnp driver on ide init but doesn't get unregistered on ide unload causing driver list corruption and eventually oops. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Bartlomiej Zolnierkiewicz commit 82ab1eeceba6705cd5a8815c48eb03af1dada744 Author: Bartlomiej Zolnierkiewicz Date: Sat Jan 27 13:46:56 2007 +0100 ide: add missing __init tags to IDE PCI host drivers also change __devinit tag for sgiioc4.c:ioc4_ide_init() to __init Signed-off-by: Bartlomiej Zolnierkiewicz commit 677c0a78f6bf7aa87c90c4e015e014a17132c634 Author: Bartlomiej Zolnierkiewicz Date: Sat Jan 27 13:46:54 2007 +0100 ia64: add pci_get_legacy_ide_irq() Add pci_get_legacy_ide_irq() identical to the one used by i386/x86_64. Fixes amd74xx driver build on ia64 (bugzilla bug #6644). Signed-off-by: Bartlomiej Zolnierkiewicz commit 3e9e4c8606127592cda22159cc2440ea48963ae4 Author: Alan Cox Date: Sat Jan 27 13:46:45 2007 +0100 ide/generic: Jmicron has its own drivers now Drop ide-generic support for Jmicron identifiers as we now trust Jmicron.c for this with drivers/ide. The code check remains for the all-generic-ide case. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit e5c073ff24604d4dbb2fbcedb17da6df768468d3 Author: Conke Hu Date: Sat Jan 27 13:46:40 2007 +0100 atiixp.c: add cable detection support for ATI IDE IDE HDD does not work if it uses a 40-pin PATA cable on ATI chipset. This patch fixes the bug. Signed-off-by: Conke Hu Cc: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit b25168dfdc162b4198fa6395cd191a20dddc6d34 Author: Conke Hu Date: Sat Jan 27 13:46:30 2007 +0100 atiixp.c: sb600 ide only has one channel AMD/ATI SB600 IDE/PATA controller only has one channel. Signed-off-by: Conke Hu Cc: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 737153298023342073ccaa006144dd254b298e2b Author: Conke Hu Date: Sat Jan 27 13:46:28 2007 +0100 atiixp.c: remove unused code A previous patch to atiixp.c was removed but some code has not been cleaned. Now we remove these code sine they are no use any longer. Signed-off-by: Conke Hu Cc: Alan Cox Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit a51545ab2523b9cfd426737495f877821006371a Author: Andrew Morton Date: Sat Jan 27 13:46:21 2007 +0100 jmicron: fix warning Signed-off-by: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 1e7106fc7ea6af9c365afe2bfcde57cb1fdd1093 Author: Bartlomiej Zolnierkiewicz Date: Sat Jan 27 13:46:14 2007 +0100 ide: update MAINTAINERS entry Signed-off-by: Bartlomiej Zolnierkiewicz commit 03ee5b1cdd09ed1ee2e75d0bc647fc5db66b9d07 Author: Tejun Heo Date: Fri Jan 26 20:10:25 2007 +0900 libata: fix ata_eh_suspend() return value ata_eh_suspend() was returning 0 regardless of failure. This bug has potential to lose data on suspend. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a718728f9e40ec79c0879ec6509a54fee214f5b2 Author: Tejun Heo Date: Sat Jan 27 11:04:26 2007 +0900 ahci: port_no should be used when clearing IRQ in ahci_thaw() ap->id is logcial port ID which is unique among all ATA ports and doesn't have anything to do with hardware port index. ap->port_no is the hardware port index and thus should be used when clearing IRQ mask in ahci_thaw(). This problem has been spotted by Jeff Garzik . Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 095b8501e4168ae5a879fcb9420ac48cbd43f95a Author: Robert Olsson Date: Fri Jan 26 19:06:01 2007 -0800 [IPV4]: Fix single-entry /proc/net/fib_trie output. When main table is just a single leaf this gets printed as belonging to the local table in /proc/net/fib_trie. A fix is below. Signed-off-by: Robert Olsson Acked-by: Eric W. Biederman Signed-off-by: David S. Miller commit 342a0cff0ad5fba6b591cfa37db3c65c4d9913f8 Author: Venkat Yekkirala Date: Fri Jan 26 19:03:48 2007 -0800 [SELINUX]: Fix 2.6.20-rc6 build when no xfrm This patch is an incremental fix to the flow_cache_genid patch for selinux that breaks the build of 2.6.20-rc6 when xfrm is not configured. Signed-off-by: Venkat Yekkirala Signed-off-by: David S. Miller commit 86d43258bcad2068744c85181b97bb35ab27a74d Author: David S. Miller Date: Fri Jan 26 18:48:16 2007 -0800 [SPARC64]: Set g4/g5 properly in sun4v dtlb-prot handling. Mirror the logic in the sun4u handler, we have to update both registers even when we branch out to window fault fixup handling. The way it works is that if we are in etrap processing a fault already, g4/g5 holds the original fault information. If we take a window spill fault while doing etrap, then we put the window spill fault info into g4/g5 and this is what the top-level fault handler ends up processing first. Then we retry the originally faulting instruction, and process the original fault at that time. This is all necessary because of how constrained the trap registers are in these code paths. These cases trigger very rarely, so even if there is some performance implication it's doesn't happen very often. In fact the rarity is why it took so long to trigger and find this particular bug. Signed-off-by: David S. Miller commit c229ec5dae58b218cab0bc1b36a7647b0ec4900f Author: H. Peter Anvin Date: Fri Jan 26 09:15:47 2007 -0800 [PATCH] Boot loader ID for Gujin Add an official boot loader ID for Gujin. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds commit a8a75a20e9a854685ac3e7af2e0e32f9b0be436b Author: Mark Fasheh Date: Fri Jan 26 10:46:59 2007 -0800 [PATCH] ocfs2: fix thinko in ocfs2_backup_super_blkno() Fix a bug which was introduced when I synced up ocfs2_fs.h with ocfs2-tools. We can't do u64/u32 in kernel. Signed-off-by: Mark Fasheh Signed-off-by: Linus Torvalds commit 8cdf92a98fa0f91068615443f2a8597b7f2c34ca Author: David Woodhouse Date: Mon Jan 1 19:31:15 2007 +0000 Fix Maple PATA IRQ assignment. On the Maple board, the AMD8111 IDE is in legacy mode... except that it appears on IRQ 20 instead of IRQ 15. For drivers/ide this was handled by the architecture's "pci_get_legacy_ide_irq()" function, but in libata we just hard-code the numbers 14 and 15. This patch provides asm-powerpc/libata-portmap.h which maps the IRQ as appropriate, having added a pci_dev argument to the ATA_{PRIM,SECOND}ARY_IRQ macros. There's probably a better way to do this -- especially if we observe that the _only_ case in which this seemingly-generic "pci_get_legacy_ide_irq()" function returns anything other than 14 and 15 for primary and secondary respectively is the case of the AMD8111 on the Maple board -- couldn't we handle that with a special case in the pata_amd driver, or perhaps with a PCI quirk for Maple to switch it into native mode during early boot and assign resources properly? Signed-off-by: David Woodhouse Signed-off-by: Jeff Garzik commit dfd7a3db3898e299bdc25f0c77081a8632b3a73c Author: Tejun Heo Date: Fri Jan 26 15:37:20 2007 +0900 ahci: use 0x80 as wait stat value instead of 0xff Before hardreset, ahci initialized stat part of received FIS area to 0xff to wait for the first D2H Reg FIS which would change the value to device ready state. This used to work but now libata considers status value of 0xff as device not present making this wait prone to failure. This patch makes ahci use 0x80 for the wait stat value instead of 0xff to fix the above problem. Signed-off-by: Tejun Heo drivers/ata/ahci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit d02598721706ab62a574823479b1f6c26c8980d2 Author: Tejun Heo Date: Fri Jan 26 14:57:31 2007 +0900 sata_via: style clean up, no indirect method call in LLD Call ata_bmdma_irq_clear() directly instead of through ap->ops->irq_clear() according to libata style guideline. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6096b63e2584796341baf7e7735f98d387f489f2 Author: Tejun Heo Date: Fri Jan 26 14:47:38 2007 +0900 ahci: fix endianness in spurious interrupt message Fix endianness in spurious interrupt message. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 496a0fc8c5572a626de41d56d7c7ed005a2c1b48 Author: Matt Domsch Date: Fri Jan 26 00:57:18 2007 -0800 [PATCH] Fix race in efi variable delete code Fix race when deleting an EFI variable and issuing another EFI command on the same variable. The removal of the variable from the efivars_list should be done in efivar_delete and not delayed until the kobject release. Furthermore, remove the item from the list at module unload time, and use list_for_each_entry_safe() rather than list_for_each_safe() for readability. Tested on ia64. Signed-off-by: Prarit Bhargava Signed-off-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01f2073411e01777e3c6f45a4bf05ea76493f326 Author: Francois Romieu Date: Fri Jan 26 00:57:17 2007 -0800 [PATCH] netdev: add a MAINTAINERS entry for via-velocity and update my address Signed-off-by: Francois Romieu Cc: "David S. Miller" Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fb844961818ce94e782acf6a96b92dc2303553b Author: Alexey Dobriyan Date: Fri Jan 26 00:57:16 2007 -0800 [PATCH] core-dumping unreadable binaries via PT_INTERP Proposed patch to fix #5 in http://www.isec.pl/vulnerabilities/isec-0017-binfmt_elf.txt aka http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2004-1073 To reproduce, do * grab poc at the end of advisory. * add line "eph.p_memsz = 4096;" after "eph.p_filesz = 4096;" where first "4096" is something equal to or greater than 4096. * ./poc /usr/bin/sudo && ls -l Here I get with 2.6.20-rc5: -rw------- 1 ad ad 102400 2007-01-15 19:17 core ---s--x--x 2 root root 101820 2007-01-15 19:15 /usr/bin/sudo Check for MAY_READ like binfmt_misc.c does. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c20086de9319ac406f1e96ad459763c9f9965b18 Author: NeilBrown Date: Fri Jan 26 00:57:14 2007 -0800 [PATCH] md: remove unnecessary printk when raid5 gets an unaligned read. raid5_mergeable_bvec tries to ensure that raid5 never sees a read request that does not fit within just one chunk. However as we must always accept a single-page read, that is not always possible. So when "in_chunk_boundary" fails, it might be unusual, but it is not a problem and printing a message every time is a bad idea. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe33f6f1525113ab0bae416966209438e7a31987 Author: Jeff Dike Date: Fri Jan 26 00:57:12 2007 -0800 [PATCH] Fix UML on non-standard VM split hosts This fixes UML on hosts with non-standard VM splits. We had changed the config variable that controls UML behavior on such hosts, but not propogated the change everywhere. In particular, the values of STUB_CODE and STUB_DATA relied on the old variable. I also reformatted the HOST_VMSPLIT_3G help to make it more standard. Spotted by uml@flonatel.org. Signed-off-by: Jeff Dike Cc: Blaisorblade Cc: Pravin Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 569d3287c1f2c5d5e9264e89bd2c0f632e7b7dbb Author: Trond Myklebust Date: Fri Jan 26 00:57:11 2007 -0800 [PATCH] MM: Remove [PATCH] invalidate_inode_pages2_range() debug NFS can handle the case where invalidate_inode_pages2_range() fails, so the premise behind commit 8258d4a574d3a8c01f0ef68aa26b969398a0e140 is now gone. Remove the WARN_ON_ONCE() which is causing users grief as we can see from http://bugzilla.kernel.org/show_bug.cgi?id=7826 Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a2275d630b982e5f90206f9bc497f6695a3ec5d Author: NeilBrown Date: Fri Jan 26 00:57:11 2007 -0800 [PATCH] md: fix potential memalloc deadlock in md If a GFP_KERNEL allocation is attempted in md while the mddev_lock is held, it is possible for a deadlock to eventuate. This happens if the array was marked 'clean', and the memalloc triggers a write-out to the md device. For the writeout to succeed, the array must be marked 'dirty', and that requires getting the mddev_lock. So, before attempting a GFP_KERNEL allocation while holding the lock, make sure the array is marked 'dirty' (unless it is currently read-only). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0ad13ef643a5829d63c456ab6143bbda60b44a9 Author: NeilBrown Date: Fri Jan 26 00:57:10 2007 -0800 [PATCH] knfsd: Fix type mismatch with filldir_t used by nfsd nfsd defines a type 'encode_dent_fn' which is much like 'filldir_t' except that the first pointer is 'struct readdir_cd *' rather than 'void *'. It then casts encode_dent_fn points to 'filldir_t' as needed. This hides any other type mismatches between the two such as the fact that the 'ino' arg recently changed from ino_t to u64. So: get rid of 'encode_dent_fn', get rid of the cast of the function type, change the first arg of various functions from 'struct readdir_cd *' to 'void *', and live with the fact that we have a little less type checking on the calling of these functions now. Less internal (to nfsd) checking offset by more external checking, which is more important. Thanks to Gabriel Paubert for discovering this and providing an initial patch. Signed-off-by: Gabriel Paubert Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45f8bde0d0d6deb168b45998c72b4fbeb2f57efb Author: Robert P. J. Day Date: Fri Jan 26 00:57:09 2007 -0800 [PATCH] fix various kernel-doc in header files Fix a number of kernel-doc entries for header files in include/linux by making sure they begin with the appropriate '/**' notation and use @var notation. Signed-off-by: Robert P. J. Day Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8d814b5dd7a1bc5c19ae32d35b8bd4d8a510eae Author: Mike Frysinger Date: Fri Jan 26 00:57:08 2007 -0800 [PATCH] remove __devinit markings from rtc_sysfs_add_device() rtc_sysfs_add_device is needed even after dev initialization, so drop __devinit. Signed-off-by: Mike Frysinger Acked-by: Alessandro Zummo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfa152fa5e4d328fe3ebf15908ee8ec20a0ce6dc Author: Jun'ichi Nomura Date: Fri Jan 26 00:57:07 2007 -0800 [PATCH] dm-multipath: fix stall on noflush suspend/resume Allow noflush suspend/resume of device-mapper device only for the case where the device size is unchanged. Otherwise, dm-multipath devices can stall when resumed if noflush was used when suspending them, all paths have failed and queue_if_no_path is set. Explanation: 1. Something is doing fsync() on the block dev, holding inode->i_sem 2. The fsync write is blocked by all-paths-down and queue_if_no_path 3. Someone requests to suspend the dm device with noflush. Pending writes are left in queue. 4. In the middle of dm_resume(), __bind() tries to get inode->i_sem to do __set_size() and waits forever. 'noflush suspend' is a new device-mapper feature introduced in early 2.6.20. So I hope the fix being included before 2.6.20 is released. Example of reproducer: 1. Create a multipath device by dmsetup 2. Fail all paths during mkfs 3. Do dmsetup suspend --noflush and load new map with healthy paths 4. Do dmsetup resume Signed-off-by: Jun'ichi Nomura Acked-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e540eb45a5254873245fd377f2fe3afc47bd33c1 Author: Eric Van Hensbergen Date: Fri Jan 26 00:57:06 2007 -0800 [PATCH] 9p: null terminate error strings for debug print We weren't properly NULL terminating protocol error strings for our debug printk resulting in garbage being included in the output when debug was enabled. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da977b2c7eb4d6312f063a7b486f2aad99809710 Author: Eric Van Hensbergen Date: Fri Jan 26 00:57:06 2007 -0800 [PATCH] 9p: fix segfault caused by race condition in meta-data operations Running dbench multithreaded exposed a race condition where fid structures were removed while in use. This patch adds semaphores to meta-data operations to protect the fid structure. Some cleanup of error-case handling in the inode operations is also included. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff76e1dfc8728278ee231feeb93146f9c57c3ec3 Author: Eric Van Hensbergen Date: Fri Jan 26 00:57:05 2007 -0800 [PATCH] 9p: update documentation regarding server applications Update the documentation to cover using Inferno as a server for 9p and to include information about spfs (a stable single-threaded stand-alone 9p server). Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 621997cd392a541bbe964e7521e2e4b2a7a03c4e Author: Eric Van Hensbergen Date: Fri Jan 26 00:57:04 2007 -0800 [PATCH] 9p: fix rename return code 9p doesn't handle renames between directories -- however, we were returning EPERM instead of EXDEV when we detected this case. Signed-off-by: Eric Van Hensbergren Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f94b347059809aecd97af53a084fe5f3db045d92 Author: Eric Van Hensbergen Date: Fri Jan 26 00:57:04 2007 -0800 [PATCH] 9p: fix bogus return code checks during initialization There is a simple logic error in init_v9fs - the return code checks are reversed. This patch fixes the return code and adds some messages to prevent module initialization from failing silently. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f49d5e62d9352d33b30c9befbaf0fd9c88265ec1 Author: NeilBrown Date: Fri Jan 26 00:57:03 2007 -0800 [PATCH] md: avoid reading past the end of a bitmap file In most cases we check the size of the bitmap file before reading data from it. However when reading the superblock, we always read the first PAGE_SIZE bytes, which might not always be appropriate. So limit that read to the size of the file if appropriate. Also, we get the count of available bytes wrong in one place, so that too can read past the end of the file. Cc: "yang yin" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1031be7a5fafd3a858dfaabb74d98f9ca20744a8 Author: NeilBrown Date: Fri Jan 26 00:57:02 2007 -0800 [PATCH] md: make sure the events count in an md array never returns to zero Now that we sometimes step the array events count backwards (when transitioning dirty->clean where nothing else interesting has happened - so that we don't need to write to spares all the time), it is possible for the event count to return to zero, which is potentially confusing and triggers and MD_BUG. We could possibly remove the MD_BUG, but is just as easy, and probably safer, to make sure we never return to zero. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3eda22d19b76b15ef3420b251bd47a0ba0127589 Author: NeilBrown Date: Fri Jan 26 00:57:01 2007 -0800 [PATCH] md: make 'repair' actually work for raid1 When 'repair' finds a block that is different one the various parts of the mirror. it is meant to write a chosen good version to the others. However it currently writes out the original data to each. The memcpy to make all the data the same is missing. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 524418bb8ecd3dfd2975bc0aa3c2cc7e8e081f24 Author: NeilBrown Date: Fri Jan 26 00:57:01 2007 -0800 [PATCH] md: update email address and status for MD in MAINTAINERS Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c397852c3ddad582ead8c57fbc48bdeccd995a30 Author: Peter Staubach Date: Fri Jan 26 00:57:00 2007 -0800 [PATCH] knfsd: Don't mess with the 'mode' when storing a exclusive-create cookie NFS V3 (and V4) support exclusive create by passing a 'cookie' which can get stored with the file. If the file exists but has exactly the right cookie stored, then we assume this is a retransmit and the exclusive create was successful. The cookie is 64bits and is traditionally stored in the mtime and atime fields. This causes a problem with Solaris7 as negative mtime or atime confuse it. So we moved two bits into the mode word instead. But inherited ACLs sometimes overwrite the mode word on create, so this is a problem. So we give up and just store 62 of the 64 bits and assume that is close enough. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2df0c8644db3d01e3c6fc5f7670fdd7b4c2b234 Author: NeilBrown Date: Fri Jan 26 00:56:59 2007 -0800 [PATCH] knfsd: replace some warning ins nfsfh.h with BUG_ON or WARN_ON A couple of the warnings will be followed by an Oops if they ever fire, so may as well be BUG_ON. Another isn't obviously fatal but has never been known to fire, so make it a WARN_ON. Cc: Adrian Bunk Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 250f3915183d377d36e012bac9caa7345ce465b8 Author: NeilBrown Date: Fri Jan 26 00:56:59 2007 -0800 [PATCH] knfsd: fix an NFSD bug with full sized, non-page-aligned reads NFSd assumes that largest number of pages that will be needed for a request+response is 2+N where N pages is the size of the largest permitted read/write request. The '2' are 1 for the non-data part of the request, and 1 for the non-data part of the reply. However, when a read request is not page-aligned, and we choose to use ->sendfile to send it directly from the page cache, we may need N+1 pages to hold the whole reply. This can overflow and array and cause an Oops. This patch increases size of the array for holding pages by one and makes sure that entry is NULL when it is not in use. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a8eff6d977c28162c61c9532ca58634e7090b69 Author: NeilBrown Date: Fri Jan 26 00:56:58 2007 -0800 [PATCH] knfsd: fix setting of ACL server versions Due to silly typos, if the nfs versions are explicitly set, no NFSACL versions get enabled. Also improve an error message that would have made this bug a little easier to find. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98fac23f332da2dea96f6bec4890eb35fdd50606 Author: NeilBrown Date: Fri Jan 26 00:56:57 2007 -0800 [PATCH] knfsd: update email address and status for NFSD in MAINTAINERS Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e702ff0ba6f7b52021f26e0e14237eb6ca8a1b6f Author: Tilman Schmidt Date: Fri Jan 26 00:56:56 2007 -0800 [PATCH] Gigaset ISDN driver error handling fixes Fix several flaws in the error handling of the Siemens Gigaset ISDN driver, including one that would cause an Oops when connecting more than one device of the same type. Signed-off-by: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4233dec749a3519069d9390561b5636a75c7579 Author: Ingo Molnar Date: Fri Jan 26 00:56:55 2007 -0800 [PATCH] ACPI: fix cpufreq regression Recently cpufreq support on my laptop (Lenovo T60) broke completely: when it's plugged into AC it would never go higher than 1 GHz - neither 1.3 GHz nor 1.83 GHz is possible - no matter which governor (userspace, speed or ondemand) is used. After some cpufreq debugging i tracked the regression back to the following (totally correct) bug-fix commit: commit 0916bd3ebb7cefdd0f432e8491abe24f4b5a101e Author: Dave Jones Date: Wed Nov 22 20:42:01 2006 -0500 [PATCH] Correct bound checking from the value returned from _PPC method. This bugfix, which makes other laptops work, made a previously hidden (BIOS) bug visible on my laptop. The bug is the following: if the _PPC (Performance Present Capabilities) optional ACPI object is queried /after/ bootup then the BIOS reports an incorrect value of '2'. My laptop (Lenovo T60) has the following performance states supported: 0: 1833000 1: 1333000 2: 1000000 Per ACPI specification, a _PPC value of '0' means that all 3 performance states are usable. A _PPC value of '1' means states 1 .. 2 are usable, a value of '2' means only state '2' (slowest) is usable. now, the _PPC object is optional, and it also comes with notification. Furthermore, when a CPU object is initialized, the _PPC object is initialized as well. So the following evaluation of the _PPC object is superfluous: [] acpi_processor_get_platform_limit+0xa1/0xaf [] acpi_processor_register_performance+0x3b9/0x3ef [] acpi_cpufreq_cpu_init+0xb7/0x596 [] cpufreq_add_dev+0x160/0x4a8 [] sysdev_driver_register+0x5a/0xa0 [] cpufreq_register_driver+0xb4/0x176 [] acpi_cpufreq_init+0xe5/0xeb [] init+0x14f/0x3dd And this is the point where my laptop's BIOS returns the incorrect value of '2'. Note that it has not sent any notification event, so the value is probably not really intentional (possibly spurious), and Windows likely doesnt query it after bootup either. Maybe the value is kept at '2' normally, and is only set to the real value when a true asynchronous event (such as AC plug event, battery switch, etc.) occurs. So i /think/ this is a grey area of the ACPI spec: per the letter of the spec the _PPC value only changes when notified, so there's no reason to query it after the system has booted up. So in my opinion the best (and most compatible) strategy would be to do the change below, and to not evaluate the _PPC object in the acpi_processor_get_performance_info() call, but only evaluate it if _PPC is present during CPU object init, or if it's notified during an asynchronous event. This change is more permissive than the previous logic, so it definitely shouldnt break any existing system. This also happens to fix my laptop, which is merrily chugging along at 1.83 GHz now. Yay! Signed-off-by: Ingo Molnar Cc: Dave Jones Acked-by: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e9a51dca19dc1d8807c63cb3bd4413d3f95aaf5 Author: Atsushi Nemoto Date: Fri Jan 26 00:56:54 2007 -0800 [PATCH] SPI: alternative fix for spi_busnum_to_master If a SPI master device exists, udev (udevtrigger) causes kernel crash, due to wrong kobj pointer in kobject_uevent_env(). This problem was not in 2.6.19. The backtrace (on MIPS) was: [<8024db6c>] kobject_uevent_env+0x54c/0x5e8 [<802a8264>] store_uevent+0x1c/0x3c (in drivers/class.c) [<801cb14c>] subsys_attr_store+0x2c/0x50 [<801cb80c>] flush_write_buffer+0x38/0x5c [<801cb900>] sysfs_write_file+0xd0/0x190 [<80181444>] vfs_write+0xc4/0x1a0 [<80181cdc>] sys_write+0x54/0xa0 [<8010dae4>] stack_done+0x20/0x3c flush_write_buffer() passes kobject of spi_master_class.subsys to subsys_addr_store(), then subsys_addr_store() passes a pointer to a struct subsystem to store_uevent() which expects a pointer to a struct class_device. The problem seems subsys_attr_store() called instead of class_device_attr_store(). This mismatch was caused by commit 3bd0f6943520e459659d10f3282285e43d3990f1, which overrides kset of master class. This made spi_master_class.subsys.kset.ktype NULL so subsys_sysfs_ops is used instead of class_dev_sysfs_ops. The commit was to fix spi_busnum_to_master(). Here is a patch fixes this function in other way, just searching children list of class_device. Signed-off-by: Atsushi Nemoto Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 863c47028eb469c9e6c4e4287b01bea2bbf78766 Author: Alexey Dobriyan Date: Fri Jan 26 00:56:53 2007 -0800 [PATCH] Fix NULL ->nsproxy dereference in /proc/*/mounts /proc/*/mounstats was fixed, all right, but... To reproduce: while true; do find /proc -type f 2>/dev/null | xargs cat 1>/dev/null 2>/dev/null; done BUG: unable to handle kernel NULL pointer dereference at virtual address 0000000c printing eip: c01754df *pde = 00000000 Oops: 0000 [#28] Modules linked in: af_packet ohci_hcd e1000 ehci_hcd uhci_hcd usbcore xfs CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00010286 (2.6.20-rc5 #1) EIP is at mounts_open+0x1c/0xac eax: 00000000 ebx: d5898ac0 ecx: d1d27b18 edx: d1d27a50 esi: e6083e10 edi: d3c87f38 ebp: d5898ac0 esp: d3c87ef0 ds: 007b es: 007b ss: 0068 Process cat (pid: 18071, ti=d3c86000 task=f7d5f070 task.ti=d3c86000) Stack: d5898ac0 e6083e10 d3c87f38 c01754c3 c0147c91 c18c52c0 d343f314 d5898ac0 00008000 d3c87f38 ffffff9c c0147e09 d5898ac0 00000000 00000000 c0147e4b 00000000 d3c87f38 d343f314 c18c52c0 c015e53e 00001000 08051000 00000101 Call Trace: [] mounts_open+0x0/0xac [] __dentry_open+0xa1/0x18c [] nameidata_to_filp+0x31/0x3a [] do_filp_open+0x39/0x40 [] seq_read+0x128/0x2aa [] do_sys_open+0x3a/0x6d [] sys_open+0x1c/0x20 [] sysenter_past_esp+0x5f/0x85 [] unix_stream_recvmsg+0x3bf/0x4bf ======================= Code: 5d c3 89 d8 e8 06 e0 f9 ff eb bd 0f 0b eb fe 55 57 56 53 89 d5 8b 40 f0 31 d2 e8 02 c1 fa ff 89 c2 85 c0 74 5c 8b 80 48 04 00 00 <8b> 58 0c 85 db 74 02 ff 03 ff 4a 08 0f 94 c0 84 c0 75 74 85 db EIP: [] mounts_open+0x1c/0xac SS:ESP 0068:d3c87ef0 A race with do_exit()'s call to exit_namespaces(). Signed-off-by: Alexey Dobriyan Acked-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c633090e3105e779c97d4978e5e3d7d66b291cfb Author: Roland McGrath Date: Fri Jan 26 00:56:52 2007 -0800 [PATCH] x86_64 ia32 vDSO: define arch_vma_name This patch makes x86_64 define arch_vma_name for CONFIG_IA32_EMULATION. This makes the ia32 vDSO mapping appear in /proc/PID/maps with "[vdso]" for ia32 processes, as it does on native i386. Signed-off-by: Roland McGrath Cc: Ingo Molnar Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a0cfadb42e0a6dd221aa49232a65d2771063285 Author: Roland McGrath Date: Fri Jan 26 00:56:51 2007 -0800 [PATCH] powerpc vDSO: use VM_ALWAYSDUMP This patch fixes core dumps to include the vDSO vma, which is left out now. Signed-off-by: Roland McGrath Cc: Ingo Molnar Cc: Paul Mackerras Acked-by: Benjamin Herrenschmidt Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e03f0ca11645ce69a4defcd4f60a5cb2d5e30507 Author: Roland McGrath Date: Fri Jan 26 00:56:50 2007 -0800 [PATCH] x86_64 ia32 vDSO: use VM_ALWAYSDUMP This patch fixes ia32 core dumps on x86_64 to include just one phdr for the vDSO vma. Currently it writes a confused format with two phdrs for the address, one without contents and one with. This patch removes the special-case core writing macros for the ia32 vDSO. Instead, it uses VM_ALWAYSDUMP in the vma. This changes core dumps so they no longer include the non-PT_LOAD phdrs from the vDSO, consistent with fixed native i386 core dumps. Signed-off-by: Roland McGrath Cc: Ingo Molnar Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f47aef55d9a18945fcdd7fd6bf01121ce973b91b Author: Roland McGrath Date: Fri Jan 26 00:56:49 2007 -0800 [PATCH] i386 vDSO: use VM_ALWAYSDUMP This patch fixes core dumps to include the vDSO vma, which is left out now. It removes the special-case core writing macros, which were not doing the right thing for the vDSO vma anyway. Instead, it uses VM_ALWAYSDUMP in the vma; there is no need for the fixmap page to be installed. It handles the CONFIG_COMPAT_VDSO case by making elf_core_dump use the fake vma from get_gate_vma after real vmas in the same way the /proc/PID/maps code does. This changes core dumps so they no longer include the non-PT_LOAD phdrs from the vDSO. I made the change to add them in the first place, but in turned out that nothing ever wanted them there since the advent of NT_AUXV. It's cleaner to leave them out, and just let the phdrs inside the vDSO image speak for themselves. Signed-off-by: Roland McGrath Cc: Ingo Molnar Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5b97dde514f9bd43f9e525451d0a863c4fc8a9a Author: Roland McGrath Date: Fri Jan 26 00:56:48 2007 -0800 [PATCH] Add VM_ALWAYSDUMP This patch adds the VM_ALWAYSDUMP flag for vm_flags in vm_area_struct. This provides a clean explicit way to have a vma always included in core dumps, as is needed for vDSO's. Signed-off-by: Roland McGrath Cc: Ingo Molnar Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6558c4a2378af06f2beca6c8a3304e21d1cf135 Author: Roland McGrath Date: Fri Jan 26 00:56:47 2007 -0800 [PATCH] Fix gate_vma.vm_flags This patch fixes the initialization of gate_vma.vm_flags and gate_vma.vm_page_prot to reflect reality. This makes the "[vdso]" line in /proc/PID/maps correctly show r-xp instead of ---p, when gate_vma is used (CONFIG_COMPAT_VDSO on i386). Signed-off-by: Roland McGrath Cc: Ingo Molnar Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1f3bb9ae4497a2ed3eac773fd7798ac33a0371f Author: Roland McGrath Date: Fri Jan 26 00:56:46 2007 -0800 [PATCH] Fix CONFIG_COMPAT_VDSO I wouldn't mind if CONFIG_COMPAT_VDSO went away entirely. But if it's there, it should work properly. Currently it's quite haphazard: both real vma and fixmap are mapped, both are put in the two different AT_* slots, sysenter returns to the vma address rather than the fixmap address, and core dumps yet are another story. This patch makes CONFIG_COMPAT_VDSO disable the real vma and use the fixmap area consistently. This makes it actually compatible with what the old vdso implementation did. Signed-off-by: Roland McGrath Cc: Ingo Molnar Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f6ee1adc75bf31d1b76814338f76a88e653cb60 Author: Justin Clacherty Date: Fri Jan 26 00:56:44 2007 -0800 [PATCH] spi: fix error setting the spi mode in pxa2xx_spi.c Currently the spi mode can be set to the wrong mode if you are switching from any mode other than mode 0. This is because the mode is set using a bitwise or on uncleared bits. The following patch clears the mode bits before setting the new mode. I've also modified it to use the appropriate defines from pxa-regs.h for readability. Signed-off-by: Justin Clacherty Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8736b9270c2f8993ca44c30f64d4c6d25e379687 Author: Ben Dooks Date: Fri Jan 26 00:56:43 2007 -0800 [PATCH] S3C24XX: fix passing spi chipselect to select routine It turns out that the spi chipselect was not being passed to the set_cs routine if one was specified in the platform data. As part of the fix, change to using a set_cs field in the controller state, and put a default gpio routine in if the data passed does not specify it. Also remove the //#define DEBUG Signed-off-by: Ben Dooks Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46fe4ddd9dbb15305ab9b458e6cfa4dd47ac3e47 Author: Joerg Roedel Date: Fri Jan 26 00:56:42 2007 -0800 [PATCH] KVM: SVM: Propagate cpu shutdown events to userspace This patch implements forwarding of SHUTDOWN intercepts from the guest on to userspace on AMD SVM. A SHUTDOWN event occurs when the guest produces a triple fault (e.g. on reboot). This also fixes the bug that a guest reboot actually causes a host reboot under some circumstances. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73b1087e6176a34c01eea3db269848f72fad72c1 Author: Avi Kivity Date: Fri Jan 26 00:56:41 2007 -0800 [PATCH] KVM: MMU: Report nx faults to the guest With the recent guest page fault change, we perform access checks on our own instead of relying on the cpu. This means we have to perform the nx checks as well. Software like the google toolbar on windows appears to rely on this somehow. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7993ba43db1c07245ada067791f91dbf018095ac Author: Avi Kivity Date: Fri Jan 26 00:56:41 2007 -0800 [PATCH] KVM: MMU: Perform access checks in walk_addr() Check pte permission bits in walk_addr(), instead of scattering the checks all over the code. This has the following benefits: 1. We no longer set the accessed bit for accessed which fail permission checks. 2. Setting the accessed bit is simplified. 3. Under some circumstances, we used to pretend a page fault was fixed when it would actually fail the access checks. This caused an unnecessary vmexit. 4. The error code for guest page faults is now correct. The fix helps netbsd further along booting, and allows kvm to pass the new mmu testsuite. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f00e68f210c0407dd666743ce61ae543cfd509d Author: Avi Kivity Date: Fri Jan 26 00:56:40 2007 -0800 [PATCH] KVM: Emulate IA32_MISC_ENABLE msr This allows netbsd 3.1 i386 to get further along installing. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bce66ca4a2f695509e1b021311eb4de1e4fdf3e4 Author: Leonard Norrgard Date: Fri Jan 26 00:56:38 2007 -0800 [PATCH] KVM: SVM: Fix SVM idt confusion There's an obvious typo in svm_{get,set}_idt, causing it to access the ldt instead. Because these functions are only called for save/load on AMD, the bug does not impact normal operation. With the fix, save/load works as expected on AMD hosts. Signed-off-by: Uri Lublin Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b89eed93e0fa40a63e3d7b1796ec1337ea7a3aa Author: Linus Torvalds Date: Fri Jan 26 12:53:20 2007 -0800 Write back inode data pages even when the inode itself is locked In __writeback_single_inode(), when we find a locked inode and we're not doing a data-integrity sync, we used to just skip writing entirely, since we didn't want to wait for the inode to unlock. However, there's really no reason to skip writing the data pages, which are likely to be the the bulk of the dirty state anyway (and the main reason why writeback was started for the non-data-integrity case, of course!) Acked-by: Nick Piggin Cc: Andrew Morton , Cc: Peter Zijlstra Cc: Hugh Dickins Cc: David Howells Signed-off-by: Linus Torvalds commit ecdfc9787fe527491baefc22dce8b2dbd5b2908d Author: Linus Torvalds Date: Fri Jan 26 12:47:06 2007 -0800 Resurrect 'try_to_free_buffers()' VM hackery It's not pretty, but it appears that ext3 with data=journal will clean pages without ever actually telling the VM that they are clean. This, in turn, will result in the VM (and balance_dirty_pages() in particular) to never realize that the pages got cleaned, and wait forever for an event that already happened. Technically, this seems to be a problem with ext3 itself, but it used to be hidden by 'try_to_free_buffers()' noticing this situation on its own, and just working around the filesystem problem. This commit re-instates that hack, in order to avoid a regression for the 2.6.20 release. This fixes bugzilla 7844: http://bugzilla.kernel.org/show_bug.cgi?id=7844 Peter Zijlstra points out that we should probably retain the debugging code that this removes from cancel_dirty_page(), and I agree, but for the imminent release we might as well just silence the warning too (since it's not a new bug: anything that triggers that warning has been around forever). Acked-by: Randy Dunlap Acked-by: Jens Axboe Acked-by: Peter Zijlstra Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 4fe4f4ace5a667122f8dd04302e19e46d99e3594 Author: Haavard Skinnemoen Date: Fri Jan 26 13:19:48 2007 +0100 [AVR32] Update ATSTK1000 defconfig: Enable macb by default Enable the Atmel MACB ethernet driver by default on ATSTK1000. Signed-off-by: Haavard Skinnemoen commit 0cd78989a2d98a62017a5842f81b61e1b425cd0d Author: Haavard Skinnemoen Date: Fri Jan 26 13:12:25 2007 +0100 [AVR32] Export clear_page symbol Add missing EXPORT_SYMBOL(clear_page), allowing ext3 to be compiled as a module. Signed-off-by: Haavard Skinnemoen commit 7399072a7348d025e7bcb5eb5d5e9be941d490b7 Author: Patrick McHardy Date: Fri Jan 26 01:07:59 2007 -0800 [NETFILTER]: nf_conntrack_pptp: fix NAT setup of expected GRE connections When an expected connection arrives, the NAT helper should be called to set up NAT similar to the master connection. The PPTP conntrack helper incorrectly checks whether the _expected_ connection has NAT setup before calling the NAT helper (which is never the case), instead of checkeing whether the _master_ connection is NATed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a46bf7d5a81b350cd204b82bd25ee6ffbc2967d4 Author: Patrick McHardy Date: Fri Jan 26 01:07:30 2007 -0800 [NETFILTER]: nf_nat_pptp: fix expectation removal When removing the expectation for the opposite direction, the PPTP NAT helper initializes the tuple for lookup with the addresses of the opposite direction, which makes the lookup fail. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c72c6b2a291bb6c61b1546d116784a79e15a6c29 Author: Patrick McHardy Date: Fri Jan 26 01:06:47 2007 -0800 [NETFILTER]: nf_nat: fix ICMP translation with statically linked conntrack When nf_nat/nf_conntrack_ipv4 are linked statically, nf_nat is initialized before nf_conntrack_ipv4, which makes the nf_ct_l3proto_find_get(AF_INET) call during nf_nat initialization return the generic l3proto instead of the AF_INET specific one. This breaks ICMP error translation since the generic protocol always initializes the IPs in the tuple to 0. Change the linking order and put nf_conntrack_ipv4 first. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e89862f4c5b3c4ac9afcd8cb1365d2f1e16ddc3b Author: David S. Miller Date: Fri Jan 26 01:04:55 2007 -0800 [TCP]: Restore SKB socket owner setting in tcp_transmit_skb(). Revert 931731123a103cfb3f70ac4b7abfc71d94ba1f03 We can't elide the skb_set_owner_w() here because things like certain netfilter targets (such as owner MATCH) need a socket to be set on the SKB for correct operation. Thanks to Jan Engelhardt and other netfilter list members for pointing this out. Signed-off-by: David S. Miller commit d5e76b0a280f71b20bdd20d1c1b4d6812ceb8c3a Author: David S. Miller Date: Thu Jan 25 19:30:36 2007 -0800 [AF_PACKET]: Check device down state before hard header callbacks. If the device is down, invoking the device hard header callbacks is not legal, so check it early. Based upon a shaper OOPS report from Frederik Deweerdt. Signed-off-by: David S. Miller commit 5ad0d383ddbf0d2fce43b8aac267a6c299fd2dff Author: Roland McGrath Date: Thu Jan 25 17:19:51 2007 -0800 [PATCH] x86_64: fix put_user for 64-bit constant On x86-64, a put_user call using a 64-bit pointer and a constant value that is > 0xffffffff will produce code that doesn't assemble. This patch fixes the asm construct to use the Z constraint for 32-bit constants. Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 95743deb34de29defbb98ad477700aaf344f93f3 Author: Eric W. Biederman Date: Thu Jan 25 15:51:51 2007 -0800 [DECNET]: Handle a failure in neigh_parms_alloc (take 2) While enhancing the neighbour code to handle multiple network namespaces I noticed that decnet is assuming neigh_parms_alloc will allways succeed, which is clearly wrong. So handle the failure. Signed-off-by: Eric W. Biederman Acked-by: Steven Whitehouse Signed-off-by: David S. Miller commit 24cb230b587cf3aad8794b150682d8d8303a2120 Author: Michael Chan Date: Thu Jan 25 15:49:56 2007 -0800 [BNX2]: Fix 2nd port's MAC address. On the 5709, we need to add the proper offset to calculate the shared memory base address of the 2nd port correctly. Otherwise, the 2nd port's MAC address and other information will be the same as the 1st port. Update version to 1.5.4. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 61dd08c6c8d2b4ede530e43c01fa72f789ef65b1 Author: Alan Date: Thu Jan 25 15:09:05 2007 +0000 libata-sff: Don't call bmdma_stop on non DMA capable controllers Fixes bogus accesses to ports 0-15 with a non DMA capable controller. This I think should go in for 2.6.20 Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit b2a8bbe67d73631c71492fd60b757fc50a87f182 Author: Tejun Heo Date: Thu Jan 25 19:40:05 2007 +0900 libata: implement ATA_FLAG_IGN_SIMPLEX and use it in sata_uli Some uli controllers have stuck SIMPLEX bit which can't be cleared with ata_pci_clear_simplex(), but the controller is capable of doing DMAs on both channels simultaneously. Implement ATA_FLAG_IGN_SIMPLEX which makes libata ignore the simplex bit and use it in sata_uli. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0291f95fdb5fcd91cc077aafabea2c5b109fa8a8 Author: Tejun Heo Date: Thu Jan 25 19:16:28 2007 +0900 ahci: improve and limit spurious interrupt messages, take#3 We're still seeing a lot of issues with NCQ implementation in drive firmwares. Sprious FISes during NCQ command phase occur on many drives and some of them seem potentially dangerous (at least to me). Until we find the solution, spurious messages can give us more info. Improve and limit them such that more info can be reported while not disturbing users too much. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 17234246eb82898cf98e3c29e81d941c738e0587 Author: Tejun Heo Date: Thu Jan 25 20:46:59 2007 +0900 sata_via: don't diddle with ATA_NIEN in ->freeze vt6420 completely loses its ability to raise IRQ for ATAPI devices if ATA_NIEN is diddled with in ->freeze. Further investigation is necessary to determine whether this problem is shared on other controllers but it doesn't seem to be at this point. Make vt6420's ->freeze only clear IRQ to fix this problem. This makes vt6420 relatively more prone to IRQ storms but the controller is way too braindamaged to worry about that anyway. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit db3ccdac261e015023cfd922840170f14c9cdc09 Author: Baruch Even Date: Thu Jan 25 13:35:06 2007 -0800 [TCP]: Fix sorting of SACK blocks. The sorting of SACK blocks actually munges them rather than sort, causing the TCP stack to ignore some SACK information and breaking the assumption of ordered SACK blocks after sorting. The sort takes the data from a second buffer which isn't moved causing subsequent data moves to occur from the wrong location. The fix is to use a temporary buffer as a normal sort does. Signed-off-By: Baruch Even Signed-off-by: David S. Miller commit 8eda232e226b97c8f2fcbc5f672135247c1ee348 Author: Simon Bennett Date: Wed Jan 24 10:27:20 2007 +0100 HID: fix hid-input mapping for Firefly Mini Remote Control Patch adds entries to the HID consumer page for the Firefly Mini IR remote control Signed-off-by: Simon Bennett Signed-off-by: Jiri Kosina commit ad2905f06512c70c44a7efd178536ad197c48528 Author: Jiri Kosina Date: Tue Jan 23 14:02:53 2007 +0100 USB HID: fix hid_blacklist clash for 0x08ca/0x0010 commit d8c8a393166d6283003fb111d0b4a40931c0eda4 introduced a clash in hid_blacklist for 0x08ca/0x0010 (GTCO vs. AIPTEK). As the vendor of GTCO device doesn't seem to be interested in supporting their legacy HW with this conflicting ids, it is OK to remove it. Signed-off-by: Jiri Kosina commit 767fe7877c2928b5633992ee60a49ad4516dc2af Author: Jiri Kosina Date: Wed Jan 24 23:05:07 2007 +0100 HID: fix memleaking of collection hid_free_device() doesn't free device->collection (but it does free device->rdesc and device itself). This imposes memory leak. Fix it. Signed-off-by: Jiri Kosina commit c6428464894889e110418928e6b37dc2eb4cee56 Author: Catalin Marinas Date: Wed Jan 24 18:47:08 2007 +0100 [ARM] 4111/1: Allow VFP to work with thread migration on SMP The current lazy saving of the VFP registers is no longer possible with thread migration on SMP. This patch implements a per-CPU vfp-state pointer and the saving of the VFP registers at every context switch. The registers restoring is still performed in a lazy way. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 412489af76b5c0e4029d4406d93554c22a88fc73 Author: Catalin Marinas Date: Thu Jan 25 14:16:47 2007 +0100 [ARM] 4112/1: Only ioremap to supersections if DOMAIN_IO is zero Supersections do not have a field for the domain and it is always 0. This patch prevents the creation of supersections during ioremap when DOMAIN_IO is not zero (i.e. !defined(CONFIG_IO_36)). Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 99abfeafb5f2eea1bb481330ff37343e1133c924 Author: Linus Torvalds Date: Wed Jan 24 18:19:28 2007 -0800 Linux 2.6.20-rc6 commit b229a7b0aed808f2ef6a5e9dbf78b0f17cefb4d0 Author: Alan Date: Wed Jan 24 11:47:07 2007 +0000 libata: set_mode, Fix the FIXME When set_mode() changed ->set_mode didn't adapt. This makes the needed changes and removes the relevant FIXME case. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit a52865c239b1bc4f62e387509b1ad3415e476ee5 Author: Alan Date: Wed Jan 24 11:51:38 2007 +0000 libata hpt3xn: Hopefully sort out the DPLL logic versus the vendor code Rather than ending up with two layers of negation jut rename the variable and lose one. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 6a40da02be1e1d74eee653c6d181934d35cbca7d Author: Alan Date: Wed Jan 24 11:49:03 2007 +0000 libata cmd64x: whack into a shape that looks like the documentation Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit dbcb5855d108b7fa20ab42567a5412ce9dcd776a Author: David S. Miller Date: Wed Jan 24 15:21:02 2007 -0800 [AF_PACKET]: Fix BPF handling. This fixes a bug introduced by: commit fda9ef5d679b07c9d9097aaf6ef7f069d794a8f9 Author: Dmitry Mishin Date: Thu Aug 31 15:28:39 2006 -0700 [NET]: Fix sk->sk_filter field access sk_run_filter() returns either 0 or an unsigned 32-bit length which says how much of the packet to retain. If that 32-bit unsigned integer is larger than the packet, this is fine we just leave the packet unchanged. The above commit caused all filter return values which were negative when interpreted as a signed integer to indicate a packet drop, which is wrong. Based upon a report and initial patch by Raivis Bucis. Signed-off-by: David S. Miller commit 6640e69731b42fd5e3d2b26201c8b34fc897a0ee Author: Eric W. Biederman Date: Wed Jan 24 14:42:04 2007 -0800 [IPV4]: Fix the fib trie iterator to work with a single entry routing tables In a kernel with trie routing enabled I had a simple routing setup with only a single route to the outside world and no default route. "ip route table list main" showed my the route just fine but /proc/net/route was an empty file. What was going on? Thinking it was a bug in something I did and I looked deeper. Eventually I setup a second route and everything looked correct, huh? Finally I realized that the it was just the iterator pair in fib_trie_get_first, fib_trie_get_next just could not handle a routing table with a single entry. So to save myself and others further confusion, here is a simple fix for the fib proc iterator so it works even when there is only a single route in a routing table. Signed-off-by: Eric W. Biederman Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 717d44e849219781ced028a40fcc59d3e1f49e4c Author: Trond Myklebust Date: Wed Jan 24 11:54:55 2007 -0800 [PATCH] NFS: Fix races in nfs_revalidate_mapping() Prevent the call to invalidate_inode_pages2() from racing with file writes by taking the inode->i_mutex across the page cache flush and invalidate. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit bde8f00ce64d9824a4f227c8594e335a1a10d044 Author: Trond Myklebust Date: Wed Jan 24 11:54:53 2007 -0800 [PATCH] NFS: Fix Oops in rpc_call_sync() Fix the Oops in http://bugzilla.linux-nfs.org/show_bug.cgi?id=138 We shouldn't be calling rpc_release_task() for tasks that are not active. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit 66218da212bf141532d678a699f5789c78145ab1 Author: Atsushi Nemoto Date: Wed Jan 24 15:43:34 2007 +0900 [MIPS] Fix wrong checksum calculation on 64-bit MIPS The commit 8e3d8433d8c22ca6c42cba4a67d300c39aae7822 ([NET]: MIPS checksum annotations and cleanups) broke 64-bit MIPS. The problem is the commit replaces some unsigned long with __be32. On 64bit MIPS, a __be32 (i.e. unsigned int) value is represented as a sign-extented 32-bit value in a 64-bit argument register. So the address 192.168.0.1 (0xc0a80001) is passed as 0xffffffffc0a80001 to csum_tcpudp_nofold() but the asm code in the function expects 0x00000000c0a80001, therefore it returns a wrong checksum. Explicit cast to unsigned long is needed to drop high 32bit. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 9cfdf6f15a2a462b6b328b4c60b252cfc04ec03e Author: Ralf Baechle Date: Wed Jan 24 19:13:08 2007 +0000 [MIPS] VPE loader: Initialize lists before they're actually being used ... kspd which due to makefile order happens to be initialized before the vpe loader causes references to vpecontrol lists before they're actually been initialized. Signed-off-by: Ralf Baechle commit 80aac59ed5b3e5ae2132bc620ff5607929c6a304 Author: Thiemo Seufer Date: Wed Jan 24 01:29:15 2007 +0000 [MIPS] Fix reported amount of freed memory - it's in kB not bytes While at it, change message on DEC for consistency. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 3f3183709feb35c30ca5f649224d01921870f81c Author: Yoichi Yuasa Date: Wed Jan 24 22:22:06 2007 +0900 [MIPS] vr41xx: need one more nop with mtc0_tlbw_hazard() NEC VR4111 and VR4121 need one more nop with mtc0_tlbw_hazard(). Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit ec43c01420fc1da8bf0b19f0ceb24d7d3c7f47f3 Author: Ralf Baechle Date: Wed Jan 24 19:23:21 2007 +0000 [MIPS] SMTC: Fix module build by exporting symbol Signed-off-by: Ralf Baechle commit a0b6218037b5cf50737a7dc0fc5464ea3f8781cd Author: Ralf Baechle Date: Fri Jan 19 14:35:14 2007 +0000 [MIPS] SMTC: Fix TLB sizing bug for TLB of 64 >= entries Signed-off-by: Ralf Baechle commit 89c07fd14fe857c223b042a857a08c3ea46b92eb Author: Ralf Baechle Date: Wed Jan 24 12:31:47 2007 +0000 [MIPS] Fix APM build Definitions for TIF_FREEZE and _TIF_FREEZE were missing. Signed-off-by: Ralf Baechle commit 48c35b2d245fffedadce62769aafea8ecf493d19 Author: Alexey Dobriyan Date: Tue Jan 23 21:30:14 2007 +0300 [MIPS] There is no __GNUC_MAJOR__ Gcc major version number is in __GNUC__. As side effect fix checking with sparse if sparse was built with gcc 4.1 and mips cross-compiler is 3.4. Sparse will inherit version 4.1, __GNUC__ won't be filtered from "-dM -E -xc" output, sparse will pick only new major, effectively becoming gcc version 3.1 which is unsupported. Signed-off-by: Alexey Dobriyan Signed-off-by: Ralf Baechle commit 7baced8a5923ce13d3d42d50a042a869092ab4e5 Author: Matt Reimer Date: Wed Jan 24 01:30:37 2007 +0100 [ARM] 4106/1: S3C2410: typo fixes in register definitions The Trcd* bits of the S3C24xx BANKCON6 and BANKCON7 registers are misspelled in include/asm-arm/arch-s3c2410/regs-mem.h as Trdc*. Signed-off-by: Matt Reimer Acked-by: Ben Dooks Signed-off-by: Russell King commit d4e1c889c1ec547371227558e1da5f2f50c7dd5e Author: Linus Walleij Date: Sun Jan 21 20:08:33 2007 +0100 [ARM] 4102/1: Allow for PHYS_OFFSET on any valid 2MiB address This patchs allows the offset to the first page of physical memory to be on any 2MB boundary whereas the previous code could only handle psysical offset to any 16MB boundary (0xNN000000) or any 1MB boundary below 0x01000000 (e.g. 0x00N00000). The problem is a consequence of the orr one-byte syntax, so we fix this and we can place the first bank of memory at 0x28e00000. I have also included an explicit check that disallow compilation when PHYS_OFFSET is not on a 2MiB boundary. head.S would be the proper place to have this at since this is the first file that attempts to use PHYS_OFFSET during compile. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit d28122a5877cc40350fa801353fd5a9350563ec3 Author: Russell King Date: Mon Jan 22 18:59:42 2007 +0000 [ARM] Fix AMBA serial drivers for non-first serial ports Using console=ttyAM1 or console=ttyAMA1 resulted in an oops during boot due to trying to drive the console before that port had been registered. Fix this by checking whether the port is present before allowing console setup to proceed. Signed-off-by: Russell King commit 7f215abc69302dc027f024fe656e4841063e8fe8 Author: Dan Williams Date: Thu Jan 18 20:36:00 2007 +0100 [ARM] 4100/1: iop3xx: fix cpu mask for iop333 cosmetic fix so iop333 is not reported as ixp46x iop333 cpuid = 0x69054210 Signed-off-by: Dan Williams Signed-off-by: Russell King commit 87b865776d2510fc98cdf789c59b8980432ef93a Author: Russell King Date: Tue Jan 16 16:53:41 2007 +0000 [ARM] Update mach-types Signed-off-by: Russell King commit 204ecae4e10c235e6987cb7b2809a665511ab174 Author: Russell King Date: Tue Jan 16 14:01:47 2007 +0000 [ARM] Fix show_mem() for discontigmem show_mem() was assuming incorrectly that the mem_map for any node started at PFN 0. This is obviously wrong; fix it to take account of node_start_pfn. Signed-off-by: Russell King commit 30f0e0f4153918a22d802b415980974514139389 Author: Ben Dooks Date: Tue Jan 16 12:56:58 2007 +0100 [ARM] 4096/1: S3C24XX: change return code form s3c2410_gpio_getcfg() The s3c2410_gpio_getcfg() currently returns a value which is dependant on the GPIO no passed in. Now we have more generic constants it is sensible to use those as return codes so that any function dealing with >1 GPIO does not need to do it's own number processing. Since this function is only currently used in pm.c, it is easy to fixup (and correct pm.c to use the generic constants) Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 6c3c5bb3c68b932ece9f92b9d201196d537cb99c Author: Ben Dooks Date: Tue Jan 16 12:33:35 2007 +0100 [ARM] 4095/1: S3C24XX: Fix GPIO set for Bank A GPIO bank A can only be output or a special function, and the regs-gpio.h header has mistakenly got this as input or output. The mistake is carried on into the gpio.c s3c2410_gpio_cfgpin() call which will set the wrong value if S3C2410_GPIO_OUTPUT is passed. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5225cd8079484ed27cd52040e8584616d1ef1e2c Author: Pavel Pisa Date: Fri Jan 12 09:57:22 2007 +0100 [ARM] 4092/1: i.MX/MX1 CPU Frequency scaling latency definition The transition latency has to be defined and reasonably small to allow on-demand and conservative governors. The value has been defined according to manual. The imx_set_target() protected against seen out of range requests now. Signed-off-by: Pavel Pisa Acked-by: Sascha Hauer Signed-off-by: Russell King commit 3ea163e44c041b9e1d7314998dfbfd4fbc6eea20 Author: Andrew Victor Date: Tue Jan 9 13:47:29 2007 +0100 [ARM] 4089/1: AT91: GPIO wake IRQ cleanup Cleanup of at91 platform level gpio wake and suspend/resume logic. The GPIO core now delegates wakeups to the parent AIC by refcounting, and delegates clock management to the clock API. This makes these system modules more independent of each other, which is cleaner and will also help with the AT91SAM9263 (where some GPIO controllers share the same irq and clock). Original patch by David Brownell. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 9b938166907558e664d8fa413e6233a36669e0c0 Author: Andrew Victor Date: Tue Jan 9 13:20:54 2007 +0100 [ARM] 4088/1: AT91: Unbalanced IRQ in serial driver suspend/resume This patch fixes the unbalanced calls to enable_irq_wake() and disable_irq_wake() in the AT91 (and AVR32) serial driver. It should resolve these kernel messages: Unbalanced IRQ x wake disable BUG: warning at kernel/irq/manage.c:167/set_irq_wake() Original patch from Marc Pignat. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit e9d10a16ea76f42ea9ce58508e4af7c52acf1e40 Author: Andrew Victor Date: Tue Jan 9 12:47:51 2007 +0100 [ARM] 4087/1: AT91: CPU reset for SAM9x processors This patch implements CPU and peripheral reset on AT91SAM9260 and AT91SAM9261. Original patch from Wojtek Kaniewski. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit a14d527306dc7dbc38e4607c3cc3a50a600fc98b Author: Andrew Victor Date: Tue Jan 9 09:03:42 2007 +0100 [ARM] 4086/1: AT91: Whitespace cleanup A couple of whitespace cleanups, mainly in the AT91 header files. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 410f4eae4b33631ace70d84470218f3db302afac Author: Andrew Victor Date: Tue Jan 9 08:51:43 2007 +0100 [ARM] 4085/1: AT91: Header fixes. Fix two typo's where AT01_* was used instead of AT91_*. [Patch from Wojtek Kaniewski] Fix definition of AT91_SMC_EXNWMODE for the SAM9 processors. [Patch from Wu Xuan] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit fb1d50418ef09a6a43b3928ff78d433914ea954d Author: Andrew Victor Date: Tue Jan 9 08:44:41 2007 +0100 [ARM] 4084/1: Remove CONFIG_DEBUG_WAITQ Remove the legacy CONFIG_DEBUG_WAITQ from the SAM9260-EK and SAM9261-EK default configuration files. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit ded84bcb246780137ecaa3f6d137ac1b0f06fd08 Author: Geert Uytterhoeven Date: Thu Dec 21 13:57:16 2006 +0100 [POWERPC] ps3_free_io_irq: Fix inverted error check ps3_free_io_irq: Fix inverted error check after calling lv1_destruct_io_irq_outlet(). Signed-off-by: Geert Uytterhoeven Signed-off-by: Paul Mackerras commit 63ea9c1710f05a7309c272750bbf40134c628f36 Author: Geert Uytterhoeven Date: Wed Dec 20 16:11:57 2006 +0100 [POWERPC] PS3: Fix uniprocessor kernel build Allow to build a uniprocessor kernel for PS3. Signed-off-by: Geert Uytterhoeven Signed-off-by: Paul Mackerras commit d0f29485686d9d1c4f31240953a742d5dd4fdb72 Author: Brian King Date: Wed Jan 17 12:32:28 2007 -0600 libata: Initialize qc->pad_len Initialize qc->pad_len for each new command. This ensures that pad_len is not set to a stale value for zero data length commands. Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit 7a801184fa480e11e6431f184a5bdf31f63326fb Author: Brian King Date: Wed Jan 17 12:32:12 2007 -0600 libata: Fixup n_elem initialization Fixup the inialization of qc->n_elem. It currently gets initialized to 1 for commands that do not transfer any data. Fix this by initializing n_elem to 0 and only setting to 1 in ata_scsi_qc_new when there is data to transfer. This fixes some problems seen with SATA devices attached to ipr adapters. Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit 07c53dac4904206a50dd7c87adabbb1acff903fb Author: Tejun Heo Date: Sun Jan 21 02:10:11 2007 +0900 ahci: don't enter slumber on power down Some ATA/ATAPI devices act weirdly after the link is put into slumber mode. Some hang completely requiring physical power removal while others fail to wake up till the link is hardreset a couple of times. The addition of slumber on power down was never driven by real need. It just followed what ahci spec said literally. The spec itself seems faulty in that it doesn't consider devices (not controllers) which don't support link powersaving mode. Theory never matches reality when it comes to dark allys of cheap ATA/ATAPI world. It's just unrealistic to expect vendors to test rarely used link powersaving feature rigorously. This patch makes ahci more friendly to the coldness of reality. This shouldn't have any negative effect - when suspend operation succeeds, we power off the whole machine; otherwise, we wake up everything. I can't see any reason to be so elaborate with powering down the link in the first place. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f740d1689d91415cfc749d17138a11ed03b7d38b Author: Robert Hancock Date: Tue Jan 23 20:09:02 2007 -0600 sata_nv: don't rely on NV_INT_DEV indication with ADMA Several people reported issues with certain drive commands timing out on sata_nv controllers running in ADMA mode. The commands in question were non-DMA-mapped commands, usually FLUSH CACHE or FLUSH CACHE EXT. From experimentation it appears that the NV_INT_DEV indication isn't always set when a legitimate command completion interrupt is received on a legacy-mode command, at least not on these controllers in ADMA mode. When a command is pending on the port, force the flag on always in the irq_stat value before calling nv_host_intr so that the drive busy state is always checked by ata_host_intr. This also fixes some questionable code in nv_host_intr which called ata_check_status when a command was pending and ata_host_intr returned "unhandled". If the device interrupted at just the wrong time this could cause interrupts to be lost. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 82490c0937cb455e7e4150455ff52e89a9fc5ab8 Author: Tejun Heo Date: Tue Jan 23 15:13:39 2007 +0900 ahci: make ULi M5288 ignore interface fatal error bit As with JMicron controllers, ULi M5288 sets interface fatal error bit on device error including ATAPI CC. This makes libata hardreset the port on ATAPI CC thus making it impossible to use. Ignore interface fatal error bit on ULi M5288. This fixes bugzilla bug #7837. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1e5c11fc89ef6663aaa14db1e9e27477f07c24e0 Author: Brian Haley Date: Tue Jan 23 22:32:23 2007 -0800 [SCTP]: Fix compiler warning. > --- a/net/sctp/sm_statefuns.c > +++ b/net/sctp/sm_statefuns.c > @@ -462,24 +461,6 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(const struct sctp_endpoint *ep, > - if (!init_tag) { > - struct sctp_chunk *reply = sctp_make_abort(asoc, chunk, 0); > - if (!reply) > - goto nomem; This introduced a compiler warning, easily fixed. Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit 6fd8bb881509c6bdc3469b3ed16ec25a3b7cad0e Author: Masahide NAKAMURA Date: Tue Jan 23 22:17:23 2007 -0800 [IP] TUNNEL: Fix to be built with user application. include/linux/if_tunnel.h is broken for user application because it was changed to use __be32 which is required to include linux/types.h in advance but didn't. (This issue is found when building MIPL2 daemon. We are not sure this is the last header to be fixed about __be32.) Signed-off-by: Masahide NAKAMURA Signed-off-by: TAKAMIYA Noriaki Signed-off-by: David S. Miller commit 6a2b9ce0a383059492c93682bc094cce0f705fff Author: Noriaki TAKAMIYA Date: Tue Jan 23 22:09:41 2007 -0800 [IPV6]: Fixed the size of the netlink message notified by inet6_rt_notify(). I think the return value of rt6_nlmsg_size() should includes the amount of RTA_METRICS. Signed-off-by: Noriaki TAKAMIYA Acked-by: Thomas Graf Signed-off-by: David S. Miller commit 52d570aabe921663a987b2e4bae2bdc411cee480 Author: Jarek Poplawski Date: Tue Jan 23 22:07:12 2007 -0800 [TCP]: rare bad TCP checksum with 2.6.19 The patch "Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE" changed to unconditional copying of ip_summed field from collapsed skb. This patch reverts this change. The majority of substantial work including heavy testing and diagnosing by: Michael Tokarev Possible reasons pointed by: Herbert Xu and Patrick McHardy. Signed-off-by: Jarek Poplawski Acked-by: Herbert Xu Signed-off-by: David S. Miller commit bf1c1ee88008fd639ebb5c74f0555fd414369bdc Author: Adrian Bunk Date: Tue Jan 23 22:04:35 2007 -0800 [NET]: Process include/linux/if_{addr,link}.h with unifdef After commit d3dcc077bf88806201093f86325ec656e4dbfbce, include/linux/if_{addr,link}.h should be processed with unifdef. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 2748e5dec7ca8a3804852c7c4171f9156384d15c Author: Patrick McHardy Date: Tue Jan 23 22:00:13 2007 -0800 [NETFILTER]: Fix iptables ABI breakage on (at least) CRIS With the introduction of x_tables we accidentally broke compatibility by defining IPT_TABLE_MAXNAMELEN to XT_FUNCTION_MAXNAMELEN instead of XT_TABLE_MAXNAMELEN, which is two bytes larger. On most architectures it doesn't really matter since we don't have any tables with names that long in the kernel and the structure layout didn't change because of alignment requirements of following members. On CRIS however (and other architectures that don't align data) this changed the structure layout and thus broke compatibility with old iptables binaries. Changing it back will break compatibility with binaries compiled against recent kernels again, but since the breakage has only been there for three releases this seems like the better choice. Spotted by Jonas Berlin . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 778a43fd626b710faca32038afc7460f314ba82a Author: Adrian Bunk Date: Tue Jan 23 21:16:40 2007 -0800 [IRDA] vlsi_ir.{h,c}: remove kernel 2.4 code This patch removes kernel 2.4 compatibility code. Signed-off-by: Adrian Bunk Acked-by: Samuel Ortiz Signed-off-by: David S. Miller commit fb7e2399ec17f1004c0e0ccfd17439f8759ede01 Author: Masayuki Nakagawa Date: Tue Jan 23 20:15:06 2007 -0800 [TCP]: skb is unexpectedly freed. I encountered a kernel panic with my test program, which is a very simple IPv6 client-server program. The server side sets IPV6_RECVPKTINFO on a listening socket, and the client side just sends a message to the server. Then the kernel panic occurs on the server. (If you need the test program, please let me know. I can provide it.) This problem happens because a skb is forcibly freed in tcp_rcv_state_process(). When a socket in listening state(TCP_LISTEN) receives a syn packet, then tcp_v6_conn_request() will be called from tcp_rcv_state_process(). If the tcp_v6_conn_request() successfully returns, the skb would be discarded by __kfree_skb(). However, in case of a listening socket which was already set IPV6_RECVPKTINFO, an address of the skb will be stored in treq->pktopts and a ref count of the skb will be incremented in tcp_v6_conn_request(). But, even if the skb is still in use, the skb will be freed. Then someone still using the freed skb will cause the kernel panic. I suggest to use kfree_skb() instead of __kfree_skb(). Signed-off-by: Masayuki Nakagawa Signed-off-by: David S. Miller commit a6c7ab55dda3e16ab5a3cf6f39585aee5876ac3a Author: Herbert Xu Date: Tue Jan 16 16:52:02 2007 -0800 [IPSEC]: Policy list disorder The recent hashing introduced an off-by-one bug in policy list insertion. Instead of adding after the last entry with a lesser or equal priority, we're adding after the successor of that entry. This patch fixes this and also adds a warning if we detect a duplicate entry in the policy list. This should never happen due to this if clause. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8f1adb5f27d352c776ac34648cc277d1f8199dba Author: Samuel Ortiz Date: Mon Jan 15 19:40:34 2007 -0800 [IrDA]: Removed incorrect IRDA_ASSERT() With USB2.0 bulk out MTU can be 512 bytes, so checking it only for 64 bytes is incorrect. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 3958fb34ef18529c1e4a3eca44b7aaf94d4f4697 Author: Samuel Ortiz Date: Mon Jan 15 19:37:25 2007 -0800 [IrDA]: irda-usb TX path optimization (was Re: IrDA spams logfiles - since 2.6.19) Since we stop using dev_alloc_skb on the IrDA TX frame, we constantly run into the case of the skb headroom being 0, and thus we call skb_cow for every IrDA TX frame. This patch uses a local buffer and memcpy the skb to it, saving us a kmalloc for each of those IrDA TX frames. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 9d0f7d29f38d4f7bf66d38d448a7d23e0bed9074 Author: Andrew Hendry Date: Mon Jan 15 19:29:31 2007 -0800 [X.25]: Add missing sock_put in x25_receive_data __x25_find_socket does a sock_hold. This adds a missing sock_put in x25_receive_data. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 732ba35e759112be5cecd79d4351084edf88dba7 Author: Vlad Yasevich Date: Mon Jan 15 19:20:21 2007 -0800 [SCTP]: Fix SACK sequence during shutdown Currently, when association enters SHUTDOWN state,the implementation will SACK any DATA first and then transmit the SHUTDOWN chunk. This is against the order required by 2960bis spec. SHUTDOWN must always be first, followed by SACK. This change forces this order and also enables bundling. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 610ab73ac4cc8912fc253bbdc6d1f74bad3c8e3a Author: Vlad Yasevich Date: Mon Jan 15 19:18:30 2007 -0800 [SCTP]: Correctly handle unexpected INIT-ACK chunk. Consider the chunk as Out-of-the-Blue if we don't have an endpoint. Otherwise discard it as before. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit d023f629451ace6f37eb5d2cf29ddd24497c91dc Author: Vlad Yasevich Date: Mon Jan 15 19:15:45 2007 -0800 [SCTP]: Verify some mandatory parameters. Verify init_tag and a_rwnd mandatory parameters in INIT and INIT-ACK chunks. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit ebdfcad4dc2a6851f75fac0a3315046cbd9c4410 Author: Vlad Yasevich Date: Mon Jan 15 19:12:31 2007 -0800 [SCTP]: Set correct error cause value for missing parameters sctp_process_missing_param() needs to use the SCTP_ERROR_MISS_PARAM error cause value. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 16d807988ffaf9b7cbb1966955aa8f738c32e740 Author: Mikael Pettersson Date: Mon Jan 15 17:17:31 2007 -0800 [NETFILTER]: fix xt_state compile failure In file included from net/netfilter/xt_state.c:13: include/net/netfilter/nf_conntrack_compat.h: In function 'nf_ct_l3proto_try_module_get': include/net/netfilter/nf_conntrack_compat.h:70: error: 'PF_INET' undeclared (first use in this function) include/net/netfilter/nf_conntrack_compat.h:70: error: (Each undeclared identifier is reported only once include/net/netfilter/nf_conntrack_compat.h:70: error: for each function it appears in.) include/net/netfilter/nf_conntrack_compat.h:71: warning: control reaches end of non-void function make[2]: *** [net/netfilter/xt_state.o] Error 1 make[1]: *** [net/netfilter] Error 2 make: *** [net] Error 2 A simple fix is to have nf_conntrack_compat.h #include . Signed-off-by: Mikael Pettersson Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c54ea3b95ac504ed81e0ec3acfaa26d0f55bdfa4 Author: Patrick McHardy Date: Mon Jan 15 17:16:03 2007 -0800 [NETFILTER]: ctnetlink: fix leak in ctnetlink_create_conntrack error path Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 334c85569b8adeaa820c0f2fab3c8f0a9dc8b92e Author: Venkat Yekkirala Date: Mon Jan 15 16:38:45 2007 -0800 [SELINUX]: increment flow cache genid Currently, old flow cache entries remain valid even after a reload of SELinux policy. This patch increments the flow cache generation id on policy (re)loads so that flow cache entries are revalidated as needed. Thanks to Herbet Xu for pointing this out. See: http://marc.theaimsgroup.com/?l=linux-netdev&m=116841378704536&w=2 There's also a general issue as well as a solution proposed by David Miller for when flow_cache_genid wraps. I might be submitting a separate patch for that later. I request that this be applied to 2.6.20 since it's a security relevant fix. Signed-off-by: Venkat Yekkirala Signed-off-by: David S. Miller commit d88ae4cc97b24783ee4480697fbdcc02ab4133a6 Author: YOSHIFUJI Hideaki Date: Sun Jan 14 21:48:40 2007 -0800 [IPV6] MCAST: Fix joining all-node multicast group on device initialization. Join all-node multicast group after assignment of dev->ip6_ptr because it must be assigned when ipv6_dev_mc_inc() is called. This fixes Bug#7817, reported by . Closes: 7817 Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit e0e8f1c8220c43bdf25cfb5622f6ab6947027fb1 Author: Herbert Xu Date: Wed Jan 10 22:06:32 2007 -0800 [IPSEC] flow: Fix potential memory leak When old flow cache entries that are not at the head of their chain trigger a transient security error they get unlinked along with all the entries preceding them in the chain. The preceding entries are not freed correctly. This patch fixes this by simply leaving the entry around. It's based on a suggestion by Venkat Yekkirala. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 419dd8378dfa32985672ab7927b4bc827f33b332 Author: Oleg Nesterov Date: Tue Jan 23 20:04:13 2007 -0300 V4L/DVB (5123): Buf_qbuf: fix: videobuf_queue->stream corruption and lockup We are doing ->buf_prepare(buf) before adding buf to q->stream list. This means that videobuf_qbuf() should not try to re-add a STATE_PREPARED buffer. Signed-off-by: Oleg Nesterov Signed-off-by: Mauro Carvalho Chehab commit 99ddcc7edbb6b1d35a542f6bf0383f1f5a1aa0b0 Author: Linus Torvalds Date: Tue Jan 23 14:22:35 2007 -0800 Change Linus' email address too This changes a few mentions of my email address to point to the new one, leaving things like old copyright messages alone. Signed-off-by: Linus Torvalds commit 65ebe63420eae40fba73d3b4f79f99adc8e148b3 Author: Stephen Hemminger Date: Tue Jan 23 11:38:57 2007 -0800 [PATCH] email change for shemminger@osdl.org Change my email address to reflect OSDL merger. Signed-off-by: Stephen Hemminger [ The irony. Somebody still has his sign-off message hardcoded in a script or his brainstem ;^] Signed-off-by: Linus Torvalds commit 8528b0f1de1101c6002036fd53638fb21111d0ea Author: Linus Torvalds Date: Tue Jan 23 14:16:31 2007 -0800 Clear spurious irq stat information when adding irq handler Any newly added irq handler may obviously make any old spurious irq status invalid, since the new handler may well be the thing that is supposed to handle any interrupts that came in. So just clear the statistics when adding handlers. Pointed-out-by: Alan Cox Acked-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit d344bff9c36db17dc4765215495aaa7212c1eb6c Author: Dale Farnsworth Date: Tue Jan 23 09:52:25 2007 -0700 mv643xx_eth: Fix race condition in mv643xx_eth_free_tx_descs mv643xx_eth: Fix race condition in mv643xx_eth_free_tx_descs This bug was found and isolated by Thibaut VARENE and Jarek Poplawski . This patch is a modification of their fixes. We acquire and release the lock for each descriptor that is freed to minimize the time the lock is held. Signed-off-by: Jeff Garzik commit 3196265e97c661d9e9be04d5d64ca8ff3186536d Author: Al Viro Date: Tue Jan 23 12:25:08 2007 +0000 s2io bogus memset memset() after kmalloc() on size * 8 would better be on size * 8, not just size; fixed by switching to kcalloc() - it's more idiomatic anyway. Signed-off-by: Al Viro Signed-off-by: Jeff Garzik commit f66d45e99eb7ca91822c3e3f6d7a98843c9626cb Author: Guy Streeter Date: Tue Jan 23 12:20:04 2007 -0600 [PATCH] correct sys_shmget allocation check As written, sys_shmget will return ENOSPC when one page is still available for allocation. This patch corrects the test. Signed-off-by: Guy Streeter Signed-off-by: Linus Torvalds -- commit 73f66ace34e3d935d1ad01208234f8871ac1f500 Author: Al Viro Date: Tue Jan 23 12:27:04 2007 +0000 [PATCH] fix prototype of csum_ipv6_magic() (ia64) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4384247b6910df91049f8d0bbd5c1075898ac290 Author: Al Viro Date: Tue Jan 23 12:25:08 2007 +0000 [PATCH] s2io bogus memset memset() after kmalloc() on size * 8 would better be on size * 8, not just size; fixed by switching to kcalloc() - it's more idiomatic anyway. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0a3c4bdc1b197a7d37fc75643a68daf45fe0a7cc Author: Al Viro Date: Tue Jan 23 12:25:08 2007 +0000 [PATCH] horizon.c: missing __devinit Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c3ea6729feb304e0c3be74e8eca001215e78d1bc Author: Al Viro Date: Tue Jan 23 12:25:08 2007 +0000 [PATCH] funsoft: ktermios fix Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1b5180b65122666a36a1a232b7b9b38b21a9dcdd Author: Ingo Molnar Date: Tue Jan 23 10:45:50 2007 +0100 [PATCH] notifiers: fix blocking_notifier_call_chain() scalability while lock-profiling the -rt kernel i noticed weird contention during mmap-intense workloads, and the tracer showed the following gem, in one of our MM hotpaths: threaded-2771 1.... 65us : sys_munmap (sysenter_do_call) threaded-2771 1.... 66us : profile_munmap (sys_munmap) threaded-2771 1.... 66us : blocking_notifier_call_chain (profile_munmap) threaded-2771 1.... 66us : rt_down_read (blocking_notifier_call_chain) ouch! a global rw-semaphore taken in one of the most performance- sensitive codepaths of the kernel. And i dont even have oprofile enabled! All distro kernels have CONFIG_PROFILING enabled, so this scalability problem affects the majority of Linux users. The fix is to enhance blocking_notifier_call_chain() to only take the lock if there appears to be work on the call-chain. With this patch applied i get nicely saturated system, and much higher munmap performance, on SMP systems. And as a bonus this also fixes a similar scalability bottleneck in the thread-exit codepath: profile_task_exit() ... Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra Acked-by: Nick Piggin Signed-off-by: Linus Torvalds commit 95543179f158b4891c5dc49004853ce081e8d794 Author: Linas Vepstas Date: Tue Jan 23 19:40:54 2007 +0100 [PATCH] elevator: move clearing of unplug flag earlier A flag was recently added to the elevator code to avoid performing an unplug when reuests are being re-queued. The goal of this flag was to avoid a deep recursion that can occur when re-queueing requests after a SCSI device/host reset. See http://lkml.org/lkml/2006/5/17/254 However, that fix added the flag near the bottom of a case statement, where an earlier break (in an if statement) could transport one out of the case, without setting the flag. This patch sets the flag earlier in the case statement. I re-discovered the deep recursion recently during testing; I was told that it was a known problem, and the fix to it was in the kernel I was testing. Indeed it was ... but it didn't fix the bug. With the patch below, I no longer see the bug. Signed-off by: Linas Vepstas Signed-off-by: Jens Axboe Cc: Chris Wright Signed-off-by: Linus Torvalds commit 364ca8a897eadb2f0e76b7f0ffe94168f6d83d66 Author: Yoichi Yuasa Date: Mon Jan 22 23:01:06 2007 +0900 [MIPS] Vr41xx: Fix after GENERIC_HARDIRQS_NO__DO_IRQ change Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit ac8be955049dab828a68b9c68a75144832f8289f Author: Ralf Baechle Date: Sat Jan 20 00:18:01 2007 +0000 [MIPS] SMTC: Instant IPI replay. SMTC pseudo-interrupts between TCs are deferred and queued if the target TC is interrupt-inhibited (IXMT). In the first SMTC prototypes, these queued IPIs were serviced on return to user mode, or on entry into the kernel idle loop. The INSTANT_REPLAY option dispatches them as part of local_irq_restore() processing, which adds runtime overhead (hence the option to turn it off), but ensures that IPIs are handled promptly even under heavy I/O interrupt load. Signed-off-by: Ralf Baechle commit 3a7122923e87fc5cdf8affa1845924a0def4657d Author: Jeff Chua Date: Mon Jan 22 20:40:50 2007 -0800 [PATCH] acpi: remove "video device notify" message Seems to be some left-over debug code. Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee8bb9eae66d3d5558b685f71b52bd8bc4ba5a62 Author: Horms Date: Mon Jan 22 20:40:49 2007 -0800 [PATCH] Kdump documentation update: ia64 portion this patch fills in the portions for ia64 kexec. Signed-off-by: Simon Horman Cc: "Zou, Nanhai" Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ea112bd5493d44967b3dc44fd078be517272b044 Author: Horms Date: Mon Jan 22 20:40:48 2007 -0800 [PATCH] Kdump documentation update: kexec-tools update Mohan Kumar suggested making kexec-tools-testing.tar.gz a link to the latest version. I have done this and this patch updates the documentation accordingly. Signed-off-by: Simon Horman Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de14569f94513279e3d44d9571a421e9da1759ae Author: Vladimir Saveliev Date: Mon Jan 22 20:40:46 2007 -0800 [PATCH] resierfs: avoid tail packing if an inode was ever mmapped This patch fixes a confusion reiserfs has for a long time. On release file operation reiserfs used to try to pack file data stored in last incomplete page of some files into metadata blocks. After packing the page got cleared with clear_page_dirty. It did not take into account that the page may be mmaped into other process's address space. Recent replacement for clear_page_dirty cancel_dirty_page found the confusion with sanity check that page has to be not mapped. The patch fixes the confusion by making reiserfs avoid tail packing if an inode was ever mmapped. reiserfs_mmap and reiserfs_file_release are serialized with mutex in reiserfs specific inode. reiserfs_mmap locks the mutex and sets a bit in reiserfs specific inode flags. reiserfs_file_release checks the bit having the mutex locked. If bit is set - tail packing is avoided. This eliminates a possibility that mmapped page gets cancel_page_dirty-ed. Signed-off-by: Vladimir Saveliev Cc: Jeff Mahoney Cc: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30150f8d7b76f25b1127a5079528b7a17307f995 Author: Christoph Lameter Date: Mon Jan 22 20:40:45 2007 -0800 [PATCH] mbind: restrict nodes to the currently allowed cpuset Currently one can specify an arbitrary node mask to mbind that includes nodes not allowed. If that is done with an interleave policy then we will go around all the nodes. Those outside of the currently allowed cpuset will be redirected to the border nodes. Interleave will then create imbalances at the borders of the cpuset. This patch restricts the nodes to the currently allowed cpuset. The RFC for this patch was discussed at http://marc.theaimsgroup.com/?t=116793842100004&r=1&w=2 Signed-off-by: Christoph Lameter Cc: Paul Jackson Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79603a35009ff39562cd5634fa1cf513eb080f27 Author: Mark Gross Date: Mon Jan 22 20:40:44 2007 -0800 [PATCH] tlclk: bug fix + misc fixes The following patch fixes a few problems with the tlclk driver. * bug in the select_amcb1_transmit_clock * racy read sys call * racy open sys call * use of add_timer where mod_timer would be better * change to the timer data parameter use Signed-off-by: Mark Gross Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cda9205da24aeaa8fb086b0fb85cdf39571ecc3f Author: Chen, Kenneth W Date: Mon Jan 22 20:40:43 2007 -0800 [PATCH] fix blk_direct_IO bio preparation For large size DIO that needs multiple bio, one full page worth of data was lost at the boundary of bio's maximum sector or segment limits. After a bio is full and got submitted. The outer while (nbytes) { ... } loop will allocate a new bio and just march on to index into next page. It just forgets about the page that bio_add_page() rejected when previous bio is full. Fix it by put the rejected page back to pvec so we pick it up again for the next bio. Signed-off-by: Ken Chen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15c945c3d0913d73a7d57d7a0a3c4e2902598cc6 Author: Jamie Lenehan Date: Mon Jan 22 20:40:41 2007 -0800 [PATCH] rtc-sh: act on rtc_wkalrm.enabled when setting an alarm This fixes the SH rtc driver correctly act on the "enabled" flag when setting an alarm. Signed-off-by: Jamie Lenehan Cc: David Brownell Cc: Alessandro Zummo Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc3dffe12148b9612870eb21b24f2aecefa9ea24 Author: Avi Kivity Date: Mon Jan 22 20:40:40 2007 -0800 [PATCH] KVM: fix bogus pagefault on writable pages If a page is marked as dirty in the guest pte, set_pte_common() can set the writable bit on newly-instantiated shadow pte. This optimization avoids a write fault after the initial read fault. However, if a write fault instantiates the pte, fix_write_pf() incorrectly reports the fault as a guest page fault, and the guest oopses on what appears to be a correctly-mapped page. Fix is to detect the condition and only report a guest page fault on a user access to a kernel page. With the fix, a kvm guest can survive a whole night of running the kernel hacker's screensaver (make -j9 in a loop). Signed-off-by: Avi Kivity Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 038e51de2e7ae2c8e9d8a0b15231f8509875dc33 Author: Avi Kivity Date: Mon Jan 22 20:40:40 2007 -0800 [PATCH] KVM: x86 emulator: fix bit string instructions The various bit string instructions (bts, btc, etc.) fail to adjust the address correctly if the bit address is beyond BITS_PER_LONG. This bug creeped in as the emulator originally relied on cr2 to contain the memory address; however we now decode it from the mod r/m bits, and must adjust the offset to account for large bit indices. The patch is rather large because it switches src and dst decoding around, so that the bit index is available when decoding the memory address. This fixes workloads like the FC5 installer. Signed-off-by: Avi Kivity Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cccf748b810832cfab4dbb3ed4c7cf1a1ee35ad2 Author: Avi Kivity Date: Mon Jan 22 20:40:39 2007 -0800 [PATCH] KVM: fix race between mmio reads and injected interrupts The kvm mmio read path looks like: 1. guest read faults 2. kvm emulates read, calls emulator_read_emulated() 3. fails as a read requires userspace help 4. exit to userspace 5. userspace emulates read, kvm sets vcpu->mmio_read_completed 6. re-enter guest, fault again 7. kvm emulates read, calls emulator_read_emulated() 8. succeeds as vcpu->mmio_read_emulated is set 9. instruction completes and guest is resumed A problem surfaces if the userspace exit (step 5) also requests an interrupt injection. In that case, the guest does not re-execute the original instruction, but the interrupt handler. The next time an mmio read is exectued (likely for a different address), step 3 will find vcpu->mmio_read_completed set and return the value read for the original instruction. The problem manifested itself in a few annoying ways: - little squares appear randomly on console when switching virtual terminals - ne2000 fails under nfs read load - rtl8139 complains about "pci errors" even though the device model is incapable of issuing them. Fix by skipping interrupt injection if an mmio read is pending. A better fix is to avoid re-entry into the guest, and re-emulating immediately instead. However that's a bit more complex. Signed-off-by: Avi Kivity Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 084384754ebe6636f9e5554ad30b3143b4a26c84 Author: Avi Kivity Date: Mon Jan 22 20:40:38 2007 -0800 [PATCH] KVM: make sure there is a vcpu context loaded when destroying the mmu This makes the vmwrite errors on vm shutdown go away. Signed-off-by: Avi Kivity Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dbe5a111382fd1320ff4b1d889e5b8c41290619 Author: Ingo Molnar Date: Mon Jan 22 20:40:36 2007 -0800 [PATCH] paravirt: mark the paravirt_ops export internal The paravirt subsystem is still in flux so all exports from it are definitely internal use only. The APIs around this /will/ change. Signed-off-by: Ingo Molnar Cc: Andi Kleen Cc: Zachary Amsden Cc: Jeremy Fitzhardinge Acked-by: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a517b9f9fe8e57437b0b9b50e279220aaf651268 Author: Andrew Morton Date: Mon Jan 22 20:40:36 2007 -0800 [PATCH] SubmitChecklist update Sing the praises of `gcc -W'. Would have prevented that blockdev direct-IO bug. Cc: "Chen, Kenneth W" Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 790816dd54e22827f63c8cbb30bd623d3d45e594 Author: Andrew Morton Date: Mon Jan 22 20:40:35 2007 -0800 [PATCH] blockdev direct_io: fix signedness bug size_t is unsigned. IO errors aren't getting through. Cc: "Chen, Kenneth W" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58d9ce7d751fa11c6c8ea5dcd4d63b320aae1363 Author: Venkatesh Pallipadi Date: Mon Jan 22 20:40:34 2007 -0800 [PATCH] Revert nmi_known_cpu() check during boot option parsing Commit f2802e7f571c05f9a901b1f5bd144aa730ccc88e and its x86 version (b7471c6da94d30d3deadc55986cc38d1ff57f9ca) adds nmi_known_cpu() check while parsing boot options in x86_64 and i386. With that, "nmi_watchdog=2" stops working for me on Intel Core 2 CPU based system. The problem is, setup_nmi_watchdog is called while parsing the boot option and identify_cpu is not done yet. So, the return value of nmi_known_cpu() is not valid at this point. So revert that check. This should not have any adverse effect as the nmi_known_cpu() check is done again later in enable_lapic_nmi_watchdog(). Signed-off-by: Venkatesh Pallipadi Cc: Don Zickus Cc: Andi Kleen Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbe1a59b3a3d4af3869647d294618a23f6c9c6a4 Author: Andrew Morton Date: Mon Jan 22 20:40:33 2007 -0800 [PATCH] fix "kvm: add vm exit profiling" export profile_hits() on !SMP too. Cc: Ingo Molnar Cc: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc6191b10018311a301fb6ef22994177c769b868 Author: Karsten Wiese Date: Wed Jan 10 19:02:26 2007 +0100 [ALSA] Repair snd-usb-usx2y over OHCI The previous patch 'Repair snd-usb-usx2y for usb 2.6.18' assumed urb->start_frame roll over beyond MAX_INT for both UHCI & OHCI. This isn't true until now (kernel 2.6.20). Fix this by only looking at the common between OHCI & UHCI Frame number range. This is for mainline and stable kernels >= 2.6.18. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 184231bdb41fc4c385ae8e115f5afaff02fe1690 Author: Amit S. Kale Date: Mon Jan 22 06:52:53 2007 -0800 NetXen: Use pci_register_driver() instead of pci_module_init() in init_module This will use pci_register_driver() instead of pci_module_init(). Signed-off-by: Amit S. Kale Signed-off-by: Richard Knutsson Signed-off-by: Jeff Garzik commit 90f8b1d295e0c4a2148776e6cf801391cf07ae92 Author: Amit S. Kale Date: Mon Jan 22 06:38:05 2007 -0800 NetXen: Firmware check modifications This patch is to make the driver work with multiple minor firmware versions Signed-off-by: Amit S. Kale Signed-off-by: Jeff Garzik commit 41b69c705152e93b3c6c872678dffd8a19b14d61 Author: Thomas Klein Date: Mon Jan 22 12:55:20 2007 +0100 ehea: Fixed possible nullpointer access Fixed possible nullpointer access in event queue processing Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit bb3a6449c18f6203e59195a98d633f5b5b57c133 Author: Thomas Klein Date: Mon Jan 22 12:54:50 2007 +0100 ehea: Added logging off associated errors Added logging of error events associated with a specific queue pair Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 7674a588e93c6fa1fde8e452a4c025c49037cb96 Author: Thomas Klein Date: Mon Jan 22 12:54:20 2007 +0100 ehea: Improved logging of permission issues Disabled dump of hcall regs on some permission issues and fixed appropriate misleading logmessages Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 4e996b32e0585756c335b35980dc68852c33f297 Author: Thomas Klein Date: Mon Jan 22 12:53:50 2007 +0100 ehea: New method to determine number of available ports Count OFDT nodes to determine the number of available ports instead of using the possibly outdated value from the hypervisor Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit e919b5938b11e1d48a6dcdcb2860e890a954f10d Author: Thomas Klein Date: Mon Jan 22 12:53:20 2007 +0100 ehea: Modified initial autoneg state determination Logical partitions are not allowed to (try to) set the autonegotiation status. This patch removes the respective function call from the port setup function. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 602e0d100daa9ba9bc7c17e0014a6f76b638dc80 Author: Thomas Klein Date: Mon Jan 22 12:52:50 2007 +0100 ehea: Fixing firmware queue config issue Fix to use exactly one queue for incoming packets in all firmware configurations Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 061bf3cdba753ae7b52fba8cc324d81adac77696 Author: Thomas Klein Date: Mon Jan 22 12:52:20 2007 +0100 ehea: Fixed wrong dereferencation Not only check the pointer against 0 but also the dereferenced value Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit 9f6d55d0846dd8628fd3eac15be377c4d3493c3e Author: Kumar Gala Date: Sat Jan 20 16:38:26 2007 -0600 PHY: Export phy ethtool helpers We need to export phy_ethtool_gset and phy_ethtool_sset to allow drivers that use these functions to be built as modules. Signed-off-by: Kumar Gala Signed-off-by: Jeff Garzik commit b3a242b75361936ab9a42c42c44ea35e79a9d4cd Author: Adrian Bunk Date: Thu Jan 11 14:49:44 2007 +0100 more ftape removal This patch removes some more ftape code. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 54b290a2ecfbfb8613fbf854f9c45667821d9b8d Author: Jeff Garzik Date: Tue Jan 23 00:29:01 2007 -0500 Note that JFFS (v1) is to be deleted, in feature-removal-schedule.txt It is already noted in Kconfig, but the listing in this file was accidentally forgotten. Signed-off-by: Jeff Garzik commit d08d283974f96cb30d78ba24282a0a7d6709af32 Author: Komuro Date: Sat Dec 2 11:53:27 2006 +0900 modify 3c589_cs to be SMP safe 1. EL3WINDOW is always 1 when lock is not held. 2. The second argument of el3_interrupt is 'void *dev_id', not 'struct el3_private *lp'. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Jeff Garzik commit 9ee79a3d372fcb6729893437f4923c5efd1f85db Author: James Bottomley Date: Mon Jan 22 09:18:31 2007 -0600 [PATCH] x86: fix PDA variables to work during boot The current PDA code, which went in in post 2.6.19 has a flaw in that it doesn't correctly cycle the GDT and %GS segment through the boot PDA, the CPU PDA and finally the per-cpu PDA. The bug generally doesn't show up if the boot CPU id is zero, but everything falls apart for a non zero boot CPU id. The basically kills voyager which is perfectly capable of doing non zero CPU id boots, so voyager currently won't boot without this. The fix is to be careful and actually do the GDT setups correctly. Signed-off-by: James Bottomley Cc: Andi Kleen Cc: Jeremy Fitzhardinge Cc: Andrew Morton Signed-off-by: Linus Torvalds commit e00154891137e3b0659556b877d45a16cabd700c Author: Herbert Xu Date: Tue Jan 23 14:10:00 2007 +1100 [PATCH] vmx: Fix register constraint in launch code Both "=r" and "=g" breaks my build on i386: $ make CC [M] drivers/kvm/vmx.o {standard input}: Assembler messages: {standard input}:3318: Error: bad register name `%sil' make[1]: *** [drivers/kvm/vmx.o] Error 1 make: *** [_module_drivers/kvm] Error 2 The reason is that setbe requires an 8-bit register but "=r" does not constrain the target register to be one that has an 8-bit version on i386. According to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10153 the correct constraint is "=q". Signed-off-by: Herbert Xu Signed-off-by: Linus Torvalds commit cea9ea67e9927da18af89b49bd949a8d65ba1b15 Author: Hoang-Nam Nguyen Date: Fri Jan 19 22:50:10 2007 +0100 IB/ehca: Fix mismatched spin_unlock in irq handler The lock is taken with _irqsave and hence must be released with _irqrestore on all paths. Signed-off-by Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit ce29d72cc737df3573854a4719f00385adf1c9a6 Author: Hoang-Nam Nguyen Date: Fri Jan 19 22:50:10 2007 +0100 IB/ehca: Fix improper use of yield() with spinlock held Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit a20f3a6d7e67a8aee571fb04634a631ba59f6e92 Author: Ishai Rabinovitz Date: Tue Jan 16 17:20:25 2007 +0200 IB/srp: Check match_strdup() return Checks if the kmalloc in match_strdup() was successful, and bail out on looking at the token if it failed. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit 847641d7db15ac3f18b3d4aa05479812abdf397a Author: Marcel Holtmann Date: Mon Jan 22 22:00:45 2007 +0100 [Bluetooth] Restrict well known PSM to privileged users The PSM values below 0x1001 of L2CAP are reserved for well known services. Restrict the possibility to bind them to privileged users. Signed-off-by: Marcel Holtmann commit 7386397636d49cd5f03da29432467d3e98cbad35 Author: Marcel Holtmann Date: Mon Jan 22 22:00:40 2007 +0100 [Bluetooth] Missing endian swapping for L2CAP socket list The PSM value in the L2CAP socket list must be converted to host order before printing it. Signed-off-by: Marcel Holtmann commit ae9608af9e300395ec032479621f32688c121141 Author: Randy Dunlap Date: Tue Jan 9 21:41:01 2007 -0800 PCI: fix pci-driver kernel-doc Function short description should be on only one line. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 74da15eb1188ba9f22f7eba2c0dc56bbffcc597b Author: Grant Grundler Date: Mon Dec 25 01:06:35 2006 -0700 PCI: rework Documentation/pci.txt Rewrite Documentation/pci.txt: o restructure document to match how API is used when writing init code. o update to reflect changes in struct pci_driver function pointers. o removed language on "new style vs old style" device discovery. "Old style" is now deprecated. Don't use it. Left description in to document existing driver behaviors. o add section "Legacy I/O Port free driver" by Kenji Kaneshige http://lkml.org/lkml/2006/11/22/25 (renamed to "pci_enable_device_bars() and Legacy I/O Port space") o add "MMIO space and write posting" section to help avoid common pitfall when converting drivers from IO Port space to MMIO space. Orignally posted http://lkml.org/lkml/2006/2/27/24 o many typo/grammer/spelling corrections from Randy Dunlap o two more spelling corrections from Stephan Richter o fix CodingStyle as per Randy Dunlap Signed-off-by: Grant Grundler Signed-off-by: Greg Kroah-Hartman commit 2e45785c529e0c60b1801b4fabacb05e0b8cdf87 Author: Jean Delvare Date: Fri Jan 5 09:17:56 2007 +0100 PCI: Unhide the SMBus on the Asus P4P800-X Unhide the SMBus on the Asus P4P800-X (and probably some other models of the family.) This gives access to the memory module SPD EEPROMs. Thanks to Winbond for supporting the lm-sensors project with the donation of this motherboard. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 39559b4ff89e390c42633d23d257e793a1177e03 Author: Manuel Osdoba Date: Thu Jan 18 21:28:45 2007 +0100 USB: unusual_devs.h entry for nokia 6233 In appendix a patch for the nokia 6233 mobile phone is included. The patch is against 2.6.20-rc5. It is my first patch. Hopefully it has the right format. The code makes my nokia 6233 on my computer work. From: Manuel Osdoba Signed-off-by: Greg Kroah-Hartman commit caaf26325d70f5b559a647d4c11d84ef5a3341a4 Author: Petr Stetiar Date: Wed Jan 17 06:30:39 2007 -0800 USB: Fix for typo in ohci-ep93xx.c Attached patch fixes typo in USB driver reported by Chase Douglas on linux-cirrus mailing list. http://www.freelists.org/archives/linux-cirrus/12-2006/msg00003.html Signed-off-by: Petr Stetiar Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit b1bf4f412b4818869106ffcb5304d69551697b9c Author: Greg Kroah-Hartman Date: Tue Jan 16 15:41:03 2007 -0800 USB: disable USB_MULTITHREAD_PROBE Disable the USB_MULTITHREAD_PROBE option because it causes crashes on people's machines and they never remember to actually read the config help files. No one likes this, everyone hates it, I'm going to go eat worms... The full logic will be ripped out later. Signed-off-by: Greg Kroah-Hartman commit 53e8f84dc68f29c724bbb7e0675040386f6143ae Author: garrett_damore@tadpole.com Date: Fri Jan 12 17:10:28 2007 -0800 USB: add vendor/device id for Option GT Max 3.6 cards This fixes http://bugzilla.kernel.org/show_bug.cgi?id=7814 Signed-off-by: Greg Kroah-Hartman commit 379885a9b204dec9d0009b6b450e104389b4a590 Author: Pete Zaitcev Date: Sat Jan 13 15:17:46 2007 -0800 USB: unusual_devs.h for 0x046b:ff40 American Megatrends did something wrong in their floppy emulator. It breaks with both kinds of MODE SENSE which our stack sends. Alan and I tried a few tweaks, and got LUNs sensed right, but US_FL_NO_WP_DETECT is still needed. I set the firmware bracket to 1.00 exactly, in case AMI or Sun fix it with a firmware update. Hey, you never know. Signed-off-by: Pete Zaitcev Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 8d2bad8788a6f968247df409f50c757b1a5489f4 Author: Oliver Neukum Date: Thu Jan 11 10:14:33 2007 +0100 USB: make usbhid ignore Imation Disc Stakka on request of the sourceforge project for this device, a kind of robotized CD storage, it should be ignored by the generic driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit deb31f1764e0a11bcfe8d44e0658f83d83860e84 Author: Daniel Gollub Date: Tue Jan 16 11:03:01 2007 +0100 USB: rndis_host: fix crash while probing a Nokia S60 mobile Bug fix for driver rndis_host which fixes rndis_host probing certain Nokia S60 (Series 60) mobiles. While the rndis_host get probed by usbnet and tries to bind the Nokia mobile the bind is going to fail. The rndis_host module tries to release the device, in a wrong way, which cause the oops. Fixes Bugzilla #7201 Signed-off-by: Daniel Gollub Signed-off-by: Greg Kroah-Hartman commit d0ffff8fddd5853e4b2b101790ac0c3690655af5 Author: Andres Salomon Date: Thu Jan 11 18:39:16 2007 -0500 USB: asix: Detect internal PHY and enable/use accordingly Different AX88772 dongles use different PHYs; the chip is capable of using both a primary and secondary PHY, and supports an internal and external PHY. It appears that some DUB-E100 devices use the internal PHY, so trying to use an external one will not work (note that this is different across revisions, as well; the "A" and "B" revs of the DUB-E100 use different PHYs!). The data sheet for the AX88772 chip specifies that the internal PHY id will be 0x10, so if that's read from the EEPROM, we should use that rather than attempting to use an external PHY. Thanks to Mitch Bradley for pointing this out! Signed-off-by: Andres Salomon Cc: David Hollis Cc: Chris Ball Signed-off-by: Greg Kroah-Hartman commit c9d8c2b324d24ffb4fdcd93b3f752530a5a0a591 Author: Daniel Ritz Date: Mon Dec 11 18:17:45 2006 +0100 usbtouchscreen: make ITM screens report BTN_TOUCH as zero when not touched ITM screens send invalid x/y data when not touched. this was fixes a while ago but the problem is if the screen is not touched anymore the driver never does not report BTN_TOUCH as zero. fix it by sending the report with the last valid coordinates when pressure is released. Signed-off-by: Daniel Ritz Cc: J.P. Delport Signed-off-by: Greg Kroah-Hartman commit 6d3154cc1143f62c3b80d9929caeaec6db8cb451 Author: Linus Torvalds Date: Mon Jan 22 08:53:24 2007 -0800 Revert "[PATCH] Fix up mmap_kmem" This reverts commit 99a10a60ba9bedcf5d70ef81414d3e03816afa3f. As per Hugh Dickins: "Nadia Derbey has reported that mmap of /dev/kmem no longer works with the kernel virtual address as offset, and Franck has confirmed that his patch came from a misunderstanding of what an offset means to /dev/kmem - whereas his patch description seems to say that he was correcting the offset on a few plaforms, there was no such problem to correct, and his patch was in fact changing its API on all platforms." Suggested-by: Hugh Dickins Cc: Franck Bui-Huu Cc: Nadia Derbey Cc: Andi Kleen Cc: Arjan van de Ven Cc: Andrew Morton Signed-off-by: Linus Torvalds commit e89debcd18a3ef74b27894e479d6b9e658fc6de6 Author: Paul Mackerras Date: Mon Jan 22 22:39:24 2007 +1100 [POWERPC] Update defconfigs Mostly took the defaults, except tried to get the netfilter options more or less as they were before. Signed-off-by: Paul Mackerras commit 434f98c48fc1d2a1f562a28a1562a7b53e940957 Author: Robert Jennings Date: Wed Jan 17 10:50:20 2007 -0600 [POWERPC] atomic_dec_if_positive sign extension fix On 64-bit machines, if an atomic counter is explicitly set to a negative value, the atomic_dec_if_positive function will decrement and store the next smallest value in the atomic counter, contrary to its intended operation. The comparison to determine if the decrement will make the result negative was done by the "addic." instruction, which operates on a 64-bit value, namely the zero-extended word loaded from the atomic variable. This patch uses an explicit word compare (cmpwi) and changes the addic. to an addi (also changing "=&r" to "=&b" so that r0 isn't used, and addi doesn't become li). This also fixes a bug for both 32-bit and 64-bit in that previously 0x80000000 was considered positive, since the result after decrementing is positive. Now it is considered negative. Also, I clarify the return value in the comments just to make it clear that the value returned is always the decremented value, even if that value is not stored back to the atomic counter. Signed-off-by: Robert Jennings Signed-off-by: Paul Mackerras commit 06cd9396778d5b70ba27fa8158db78d6bc0f007b Author: Li Yang Date: Wed Jan 17 14:42:22 2007 +0800 [POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code Incorrect use of of_find_node_by_name() causes of_node_put() on a node which has already been put. It causes the refcount of the node to underflow, which triggers the WARN_ON in kref_get for 836x and 832x. This fixes it. Signed-off-by: Li Yang Signed-off-by: Paul Mackerras commit 121361f72ca93cb6710e368bb89f9d976b1da443 Author: Grant Likely Date: Fri Jan 19 00:00:14 2007 -0700 [POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable Documentation-only change. The 5200 device tree layout has not yet stablized, so nobody should depend on the layout of the tree. Signed-off-by: Grant Likely Acked-by: Sylvain Munaut Signed-off-by: Paul Mackerras commit 77319254f109963213f33cbb15e0103f2e81a64a Author: Linas Vepstas Date: Wed Jan 10 19:16:29 2007 -0600 [POWERPC] Fix broken DMA on non-LPAR pSeries It appears that the iommu table address is never stored, and thus never found, on non-lpar systems. Thus, for example, during boot: <7>[ 93.067916] PCI: Scanning bus 0001:41 <7>[ 93.068542] PCI: Found 0001:41:01.0 [8086/100f] 000200 00 <7>[ 93.068550] PCI: Calling quirk c0000000007822e0 for 0001:41:01.0 <7>[ 93.069815] PCI: Fixups for bus 0001:41 <4>[ 93.070167] iommu: Device 0001:41:01.0 has no iommu table <7>[ 93.070251] PCI: Bus scan for 0001:41 returning with max=41 No iommu table? How can that be? Well, circa line 471 of arch/powerpc/platforms/pseries/iommu.c we see the code: while (dn && PCI_DN(dn) && PCI_DN(dn)->iommu_table == NULL) dn = dn->parent; and a few lines later is the surprising print statement about the missing table. Seems that this loop ran unto the end, never once finding a non-null PCI_DN(dn)->iommu_table. The problem can be found a few lines earlier: it sems that the value of PCI_DN(dn)->iommu_table is never ever set. Thus, the patch sets it. The patch was tested on a Power4 system running in full system partition mode, which is where I saw the problem. It works; I've not done any wider testing. Had a brief discussion on this on irc. Signed-off-by: Linas Vepstas Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6984ee797a8798128e94ab2447c8ed91f0156eb5 Author: Benjamin Herrenschmidt Date: Thu Jan 11 16:08:41 2007 +1100 [POWERPC] Fix cell's mmio nvram to properly parse device tree The mmio nvram driver (used by cell only atm) isn't properly parsing the device-tree, meaning that nvram isn't found correctly on the new Cell blades. It works ok for old blades where the nvram is at the root of the device tree but fails on Malta and CAB when it's hanging off axon. This fixes it by using the proper OF parsing functions. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 4ef6e68117e93111590d9d4ada1a282304241169 Author: Benjamin Herrenschmidt Date: Thu Jan 11 16:38:22 2007 +1100 [POWERPC] Remove bogus sanity check in pci -> OF node code The new implementation of pci_device_to_OF_node() on ppc32 has a bogus sanity check in it that can cause oopses at boot when no device node is present, and might hit correct cases with older/weird apple device-trees where they have the type "vci" for the chaos bridge. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 8e6f195af0e1f226e9b2e0256af8df46adb9d595 Author: Steve French Date: Mon Jan 22 01:19:30 2007 +0000 [CIFS] Fix oops when Windows server sent bad domain name null terminator Fixes RedHat bug 211672 Windows sends one byte (instead of two) of null to terminate final Unicode string (domain name) in session setup response in some cases - this caused cifs to misalign some informational strings (making it hard to convert from UCS16 to UTF8). Thanks to Shaggy for his help and Akemi Yagi for debugging/testing Signed-off-by: Shirish Pargaonkar Signed-off-by: Steve French commit 50af94b14c98f5769860a282a397c6f3b135c8a8 Author: Mark Fasheh Date: Sun Jan 21 14:44:59 2007 -0800 ocfs2: Add backup superblock info to ocfs2_fs.h This synchronizes us with recent ocfs2-tools changes. Signed-off-by: Mark Fasheh commit 6a1bd4a5788435b6ef1664383604b43607eb825a Author: Mark Fasheh Date: Wed Jan 3 17:06:59 2007 -0800 ocfs2: cleanup ocfs2_iget() errors Get rid of some error prints in the ocfs2_iget() path from ocfs2_get_dentry(). NFSD can easily cause us to read stale inodes. Signed-off-by: Mark Fasheh commit 592282cf2eaa33409c6511ddd3f3ecaa57daeaaa Author: Mark Fasheh Date: Tue Jan 2 17:59:40 2007 -0800 ocfs2: Directory c/mtime update fixes ocfs2 wasn't updating c/mtime on directories during dirent creation/deletion. Fix ocfs2_unlink(), ocfs2_rename() and __ocfs2_add_entry() by adding the proper code to update the struct inode and push the change out to disk. This helps rename/unlink on nfs exported file systems in particular as those clients compare directory time values to avoid a full re-reading a directory which hasn't changed. ocfs2_rename() loses some superfluous error handling as a result of this patch. Signed-off-by: Mark Fasheh commit 72bce5078d124a8b13fb167aea028b6e8d91873e Author: Mark Fasheh Date: Wed Jan 3 17:25:40 2007 -0800 ocfs2: Don't print errors when following symlinks We shouldn't print errors returned from vfs_follow_link(). This was causing spurious errors to show up in the logs. Signed-off-by: Mark Fasheh commit bd2abf177b3384375c43906be551d976e4c18166 Author: Steve French Date: Sun Jan 21 23:19:01 2007 +0000 [CIFS] cifs sprintf fix Cc: Signed-off-by: Andrew Morton Signed-off-by: Steve French commit 76849e3e97a95f1ef4627b10305d38a686fab112 Author: Steve French Date: Sun Jan 21 22:56:22 2007 +0000 [CIFS] Remove 2 unneeded kzalloc casts Signed-off-by: Ahmed Darwish Signed-off-by: Steve French commit d8c8a393166d6283003fb111d0b4a40931c0eda4 Author: Jeremy Roberson Date: Fri Jan 19 15:44:18 2007 -0700 hid-core.c: Adds GTCO CalComp Interwrite IPanel PIDs to blacklist Adds GTCO CalComp Interwrite IPanels to the hid-core.c blacklist. Signed-off-by: Jeremy A. Roberson Signed-off-by: Jiri Kosina commit be8209753b014f2d7a92b2ec3ff82db478fc86d1 Author: Anssi Hannula Date: Fri Jan 19 19:28:17 2007 +0200 HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage The commit 4916b3a57fc94664677d439b911b8aaf86c7ec23 introduced a hid regression between 2.6.19 and 2.6.20-rc1. The device put in input_dev->cdev is now of type usb_device instead of usb_interface. Before: > # readlink -f /sys/class/input/input6/event4/device > /sys/devices/pci0000:00/0000:00:10.0/usb2/2-1/2-1:1.1 After: > # readlink -f /sys/class/input/input3/event3/device > /sys/devices/pci0000:00/0000:00:10.0/usb1/1-1 This causes breakage: > # udevinfo -q all -n /dev/input/event3 > P: /class/input/input3/event3 > N: input/event3 > S: input/by-path/pci-1-1--event- > E: ID_SERIAL=noserial > E: ID_PATH=pci-1-1- No ID_MODEL, ID_VENDOR, ID_REVISION, ID_TYPE etc etc. Fix this by assigning the intf->dev into hid->dev, and fixing all the users. Signed-off-by: Anssi Hannula Signed-off-by: Jiri Kosina commit f7ebf99eb489a02dba2e5a071fde9f5354275a50 Author: Simon Budig Date: Mon Jan 15 18:34:32 2007 +0100 HID: add missing RX, RZ and RY enum values to hid-debug output This trivial change adds some missing enum values to the hid-debug output. Signed-off-by: Simon Budig Signed-off-by: Jiri Kosina commit 1f3ab013336e76687441462961000157c8980bb8 Author: Jiri Kosina Date: Tue Jan 16 00:30:42 2007 +0100 HID: hid/hid-input.c doesn't need to include linux/usb/input.h There is no reason for generic hid-input.c to include usb-specific input.h. As a sideeffect, this also fixes warning of redefinition of dbg() macro, when hid-input.c is compiled with DEBUG (as there is a clash between dbg() from hid.h and usb/input.h). Signed-off-by: Jiri Kosina commit e54dea69bac12dae2ff27c1c7a472d4eee70638d Author: Jiri Kosina Date: Mon Jan 15 23:53:05 2007 +0100 HID: compilation fix when DEBUG_DATA is defined hid/hid-core.c references 'len' variable when DEBUG_DATA is defined, but the actual name of the variable is 'size'. Fix it. Signed-off-by: Jiri Kosina commit d4ae650a904612ffb7edd3f28b69b022988d2466 Author: Simon Budig Date: Mon Jan 15 17:28:47 2007 +0100 HID: proper LED-mapping for SpaceNavigator This change introduces a mapping for LED indicators between the HID specification and the Linux input subsystem. The previous code properly mapped the LEDs relevant for Keyboards, but garbeled the remaining ones. With this change all LED enums from the input system get mapped to more or less equivalent LED numbers from the HID specification. This patch also ensures that the unused bits in a HID report to the device are zeroed out. This makes the 3Dconnexion SpaceNavigator fully usable with the linux input system. Signed-off-by: Simon Budig Signed-off-by: Jiri Kosina commit 641266fdaa3c137c632f8ad2e4124248bafe7a98 Author: Jiri Kosina Date: Mon Jan 15 09:56:21 2007 +0100 HID: update MAINTAINERS entry for USB-HID Change USB-HID maintainer from Vojtech Pavlik to Jiri Kosina. Acked-by: Vojtech Pavlik Signed-off-by: Jiri Kosina commit 694400641b0da92d88db60821235aa69eb8fa556 Author: Adrian Friedli Date: Sun Jan 14 22:12:43 2007 +0100 HID: GEYSER4_ISO needs quirk I've got a newer MacBook with core2duo. Two keys on the keyboard are swapped, "unswaping" works with the same trick as GEYSER3_ISO. Signed-off-by: Adrian Friedli Signed-off-by: Jiri Kosina commit e7c4e1a58f320bafb194a411a41de29abc19315f Author: Russell King Date: Fri Jan 12 21:53:51 2007 +0000 HID: fix some ARM builds due to HID brokenness - make USB_HID depend on INPUT We have USB_HID _newly_ selected in configurations which didn't have it before, which overrides CONFIG_HID and builds HID without input support. Nevertheless, here's a patch to solve more of the same that my original patch attempted to solve. The original patch is still required. Seems to solve the final instance of this problem here. Signed-off-by: Russell King Signed-off-by: Jiri Kosina commit e93f09dc2d49d8e98818a93ad17f3ede91533738 Author: Olof Johansson Date: Thu Jan 18 18:39:59 2007 -0600 sata_mv HighPoint 2310 support (88SX7042) With the following patch, my HighPoint 2310 with a Marvell 88SX7042 on it seems to work OK. The controller only has 4 ports, with MV_FLAG_DUAL_HC it seems to init 8 ports and fails miserably at probe time. There are no other devices mapped to that chip, maybe it was just incorrectly specified in the first place? Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit 79a55b72a1996f77e9d23c7a5282e5839d45beb3 Author: Tejun Heo Date: Thu Jan 18 17:22:18 2007 +0900 libata: fix handling of port actions in per-dev action mask libata EH ignores port-wide actions in per-dev action mask. However, device resume requests EH_SOFTRESET using per-dev action mask. Under certain circumstances, this results in not resetting frozen port after resuming which causes failure of all commands. This patch allows port-wide actions to be requested in per-dev action mask. Before EH recovery starts, port-wide actions will be collected. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 501e0c500217e38276d61445ee0839b3f2c66d05 Author: Tejun Heo Date: Wed Jan 17 11:34:02 2007 +0900 libata: initialize qc->dma_dir to DMA_NONE libata didn't used to init qc->dma_dir to any specific value on qc initialization and command translation path didn't set qc->dma_dir if the command doesn't need data transfer. This made non-data commands to have random qc->dma_dir. This usually doesn't cause problem because LLDs usually check qc->protocol first and look at qc->dma_dir iff the command needs data transfer but this doesn't hold for all LLDs. It might be worthwhile to rename qc->dma_dir to qc->data_dir as we use the field to tag data direction for both PIO and DMA protocols. This problem has been spotted by James Bottomley. Signed-off-by: Tejun Heo Cc: James Bottomley Signed-off-by: Jeff Garzik commit 96bc103f4c4e470d82ba5e372191d02ad715da45 Author: Luca Pedrielli Date: Tue Jan 16 12:55:04 2007 +0900 sata_via: add PCI ID 0x5337 Add PCI ID 0x5337 to supported PCI ID. This is VT8237 in IDE mode. Signed-off-by: Luca Pedrielli Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 7db51fbecbd7082ddf9d038c7e748d5a402c9da7 Author: Robert P. J. Day Date: Mon Jan 8 02:22:03 2007 -0500 libata doc: "error : unterminated entity reference exceptions" Fix libata.tmpl to not generate "error : unterminated entity reference exceptions" errors anymore when running "make htmldocs". Signed-off-by: Robert P. J. Day Signed-off-by: Jeff Garzik commit 7939aae0c08412138a827e0af6f16fc19c346353 Author: Francois Romieu Date: Thu Jan 18 23:22:23 2007 +0100 sis190: failure to set the MAC address from EEPROM Fix from http://bugzilla.kernel.org/show_bug.cgi?id=7747 Signed-off-by: Andrew Morton Cc: Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 2806ccd7ad9073f4f1a065b5672d7592e7838e97 Author: Ralf Baechle Date: Tue Dec 19 02:12:42 2006 +0100 [MIPS] Delete duplicate call to load_irq_save. This call may have resulted to local_tlb_flush_range returning with interrupts disabled resulting in excessive interrupt latency. Signed-off-by: Ralf Baechle commit c80697b3a0d05dd87eeeb55c4dd1c3dae047293e Author: Ralf Baechle Date: Wed Jan 17 18:58:44 2007 +0000 [MIPS] SMTC: Fix cp0 hazard. Signed-off-by: Ralf Baechle commit c70a8c345fd770ecb2ff334bdf88b63edaffb77d Author: Gong Jun Date: Thu Jan 18 22:14:24 2007 +0100 hwmon/w83793: Hide invalid VID readings Ignore the VID readings when the motherboard has not designed the function. Signed-off-by: Gong Jun Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare commit c92943152884e3777439ad40a40126f2e51b8ea8 Author: Rudolf Marek Date: Thu Jan 18 22:14:24 2007 +0100 hwmon/w83793: Fix the fan input detection Catch the cases when alternative pins are used to route the fan9-12 input. Signed-off-by: Rudolf Marek Signed-off-by: Gong Jun Signed-off-by: Jean Delvare commit 46bed4dfe5f95f1fc8f68ead592a7e295bbbe01e Author: Gong Jun Date: Thu Jan 18 22:14:24 2007 +0100 hwmon/w83793: Ignore disabled temperature channels Ignore the temperature readings when its channel is disabled, ignore AMDSI readings. Signed-off-by: Gong Jun Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare commit 9fab2d8b75a4084e91f1dcb4e55368406fe53010 Author: Jean Delvare Date: Thu Jan 18 22:14:23 2007 +0100 hwmon: Fix the VRD 11 decoding I wonder how we came up with such a broken test in the first place. Signed-off-by: Jean Delvare commit ddca933bd554b4f81f27776f3cb9daa67cf241b1 Author: Gong Jun Date: Thu Jan 18 22:14:23 2007 +0100 hwmon/w83793: Remove the description of AMDSI and update the voltage formula Fix the driver to match the information in datasheet 1.0. AMD SI interface is marked as reserved, computing formula for 5VDD and 5VSB is updated. Signed-off-by: Gong Jun Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare commit 6bf446522b246194551cf167f0168792080d6118 Author: Timur Tabi Date: Thu Jan 18 11:09:35 2007 -0600 Fix phy_read/write redefinition errors in ucc_geth_phy.c The local versions of phy_read() and phy_write() in ucc_geth_phy.c conflict with the prototypes in include/linux/phy.h, so this patch renames them, moves them to the top of the file (while eliminating the redundant prototype), and makes them static. Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala Signed-off-by: Jeff Garzik commit df19b6b020791b4c42e7cf2e4f582454cbc49251 Author: Timur Tabi Date: Tue Jan 9 12:31:38 2007 -0600 Update ucc_geth.c for new workqueue structure The workqueue interface changed with David Howell's patch on 11/22/2006 (SHA 65f27f38446e1976cc98fd3004b110fedcddd189). Several drivers were updated with that patch to handle the new interface, but ucc_geth.c was not one of them. This patch updates ucc_geth.c to support the new model. A compiler warning in set_mac_addr() was also fixed. Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala Signed-off-by: Jeff Garzik commit b2db8dd4fdce7f31aa72a854e2433108d474ebb2 Author: Brice Goglin Date: Tue Jan 9 21:05:35 2007 +0100 myri10ge: update driver version to 1.2.0 Driver is now at version 1.2.0. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 21d05db175202adb166b047f35cbb96dbf9b86a5 Author: Brice Goglin Date: Tue Jan 9 21:05:04 2007 +0100 myri10ge: check that we can get an irq Now that IRQ allocation is done in myri10ge_open(), we want to still check when loading the driver that IRQ allocation could succeed later. Additionaly, we fix the initialization and printing of netdev->irq. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 6ebc087a10c3953d59a61f362bd532f2d9468d1b Author: Brice Goglin Date: Tue Jan 9 21:04:25 2007 +0100 myri10ge: make wc_fifo usage load-time tunable Under some circumstances, using WC without the WC fifo is faster. So we make it possible to tune wc_fifo with a module parameter. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 553af56775b3f23bf64f87090ab81a62bef2837b Author: Chris Lalancette Date: Tue Jan 16 16:41:44 2007 -0500 8139cp: Don't blindly enable interrupts Similar to this commit: http://kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=d15e9c4d9a75702b30e00cdf95c71c88e3f3f51e It's not safe in cp_start_xmit to blindly call spin_lock_irq and then spin_unlock_irq, since it may very well be the case that cp_start_xmit was called with interrupts already disabled (I came across this bug in the context of netdump in RedHat kernels, but the same issue holds, for example, in netconsole). Therefore, replace all instances of spin_lock_irq and spin_unlock_irq with spin_lock_irqsave and spin_unlock_irqrestore, respectively, in cp_start_xmit(). I tested this against a fully-virtualized Xen guest using netdump, which happens to use the 8139cp driver to talk to the emulated hardware. I don't have a real piece of 8139cp hardware to test on, so someone else will have to do that. Signed-off-by: Chris Lalancette Signed-off-by: Jeff Garzik commit bd62b23cbcc691cc8faa6f4028783f60957b6508 Author: Anton Altaparmakov Date: Thu Jan 18 10:28:18 2007 +0000 NTFS: Forgot to bump version number in makefile to 2.1.28... Signed-off-by: Anton Altaparmakov commit 8331191e56802f0155772a3d56bc2a750acc38e1 Author: Anton Altaparmakov Date: Thu Jan 18 09:42:48 2007 +0000 NTFS: 2.1.28 - Fix deadlock reported by Sergey Vlasov due to ntfs_put_inode(). - Fix deadlock in fs/ntfs/inode.c::ntfs_put_inode(). Thanks to Sergey Vlasov for the report and detailed analysis of the deadlock. The fix involved getting rid of ntfs_put_inode() altogether and hence NTFS no longer has a ->put_inode super operation. Signed-off-by: Anton Altaparmakov commit 10764889c6355cbb335cf0578ce12427475d1a65 Author: Larry Finger Date: Fri Jan 12 12:08:50 2007 -0600 [PATCH] bcm43xx: Fix failure to deliver PCI-E interrupts The PCI-E modifications to bcm43xx do not set up the interrupt vector correctly. Tested with BCM4311 (PCI-E) on x86_64 and BCM4306 (PCI) on i386. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 4b95320fc4d21b0ff2f8604305dd6c851aff6096 Author: Wang Zhenyu Date: Wed Jan 17 11:07:54 2007 +0800 [AGPGART] intel_agp: restore graphics device's pci space early in resume Currently in resuming path graphics device's pci space restore is behind host bridge, so resume function wrongly accesses graphics device's space. This makes resuming failure which crashed X. here's a patch to restore device's pci space early, which makes resuming ok with X. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit 412297d31d439ba56cd4faeb3a49a6f569f40702 Author: Mauro Carvalho Chehab Date: Sun Jan 7 08:51:05 2007 -0300 V4L/DVB (5023): Fix compilation on ppc32 architecture There's a problem, pointed by Meelis Roos , that, on ppc32 arch, with some gcc versions (noticed with prerelease 4.1.2 20061115), compilation fails, due the lack of __ucmpdi2 to do the required 64-bit comparision. This patch takes some sugestions made by Andrew Morton , Stelian Pop and Segher Boessenkool Signed-off-by: Mauro Carvalho Chehab commit 1323fbda1343f50f198bc8bd6d1d59c8b7fc45bf Author: Michael Krufky Date: Fri Jan 12 17:38:05 2007 -0300 V4L/DVB (5071): Tveeprom: autodetect LG TAPC G701D as tuner type 37 autodetect LG TAPC G701D as tuner type 37. Thanks to Adonis Papas, for pointing out the missing autodetection for this tuner. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 10329b962be782fa4fbebea9358063a4507d0c4d Author: Gerd Hoffmann Date: Fri Jan 12 21:26:32 2007 -0300 V4L/DVB (5069): Fix bttv and friends on 64bit machines with lots of memory We have a DMA32 zone now, lets use it to make sure the card can reach the memory we have allocated for the video frame buffers. Signed-off-by: Gerds Hoffmann Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit e382f62be8a92ebbdf697ebfab260b7d943a359f Author: hermann pitton Date: Sun Jan 7 21:19:48 2007 -0300 V4L/DVB (5033): MSI TV@nywhere Plus fixes - MSI TV@nywhere Plus. Fix radio, S-Video and external analog audio in as far we can know currently. Signed-off-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab commit 55d5440d4587454628a850ce26703639885af678 Author: Martin Samuelsson Date: Sun Jan 7 20:50:27 2007 -0300 V4L/DVB (5029): Ks0127 status flags Or status flags together in DECODER_GET_STATUS instead of and-zapping them. Signed-off-by: Martin Samuelsson Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit c6d704c8c4453f05717ba88792f70f8babf95268 Author: Grant Likely Date: Sun Jan 7 10:33:30 2007 -0300 V4L/DVB (5024): Fix quickcam communicator driver for big endian architectures Host endianess does not affect the order that pixel rgb data comes in from the quickcam (the values are bytes, not words or longs). The driver is erroniously swapping the order of rgb values for big endian machines. This patch is needed get the Quickcam communicator working on big endian machines (tested on powerpc) Signed-off-by: Grant Likely Signed-off-by: Mauro Carvalho Chehab commit a96afb3e9428f2e7463344f12dbc85faf08e2e09 Author: Robert Hancock Date: Sun Jan 7 08:12:19 2007 -0300 V4L/DVB (5021): Cx88xx: Fix lockup on suspend Suspending with the cx88xx module loaded causes the system to lock up because the cx88_audio_thread kthread was missing a try_to_freeze() call, which caused it to go into a tight loop and result in softlockup when suspending. Fix that. Signed-off-by: Robert Hancock Signed-off-by: Mauro Carvalho Chehab commit 35d6270b806562b37279d3970fa477aaeb372829 Author: Mauro Carvalho Chehab Date: Sun Jan 14 10:14:17 2007 -0200 V4L/DVB (5020): Fix: disable interrupts while at KM_BOUNCE_READ vivi.c uses the KM_BOUNCE_READ with local interrupts enabled. This means that if a disk interrupt occurs while vivi.c is using this fixmap slot, the vivi.c driver will, upon return from that interrupt, find that the fixmap slot now points at a different physical page. The net result will probably be rare corruption of disk file contents, because viv.c will now be altering the page which the disk code was recently using. Thanks to Andrew Morton for pointing this. Signed-off-by: Mauro Carvalho Chehab commit c430ca1e16b2b4b30f567806c73e270caea8db1d Author: Thierry MERLE Date: Fri Dec 29 20:32:08 2006 -0300 V4L/DVB (5019): Fix the frame->grabstate update in read() entry point. The Coverity checker spotted that in usbvision_v4l2_read(), the variable "frmx" is never assigned any value different from -1, but it's used an an array index in "usbvision->frame[frmx]". Thanks to Adrian Bunk for warning about that. Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit 6f949909e8f9e5d7e5584dc48d9a5e060c52aed1 Author: Philip Langdale Date: Thu Jan 4 07:04:47 2007 -0800 mmc: Correct definition of R6 During development of SDHC support, it was discovered that the definition for R6 was incorrect. This patch fixes that and patches the drivers that do switch on the response type. Signed-off-by: Philip Langdale Cc: Alex Dubov Cc: Pavel Pisa Signed-off-by: Pierre Ossman commit 1b3b2631842ab60c1b7923bef102c610439ba3dd Author: Carlos Eduardo Aguiar Date: Mon Jan 15 06:38:15 2007 +0100 omap: Update MMC response types This patch is a fix in order to update MMC response types. This modification is needed to allow SD card support on OMAP platforms. Signed-off-by: Carlos Eduardo Aguiar Signed-off-by: Yuha Yrjola Signed-off-by: Pierre Ossman commit e499e01d234a31d59679b7b1e1cf628d917ba49a Author: David Woodhouse Date: Sat Jan 13 08:19:03 2007 +0800 [JFFS2] debug.h: include for current->pid Signed-off-by: David Woodhouse commit a8b3485287731978899ced11f24628c927890e78 Author: Linus Torvalds Date: Fri Jan 12 10:54:26 2007 -0800 Linux v2.6.20-rc5 commit c43a5082a61f351248c5f015ee5d4641309bd96e Author: Jens Axboe Date: Fri Jan 12 12:20:26 2007 +0100 [PATCH] blktrace: only add a bounce trace when we really bounce Currently we issue a bounce trace when __blk_queue_bounce() is called, but that merely means that the device has a lower dma mask than the higher pages in the system. The bio itself may still be lower pages. So move the bounce trace into __blk_queue_bounce(), when we know there will actually be page bouncing. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit e176d397ad73ca76936e5638c2c81740dedb9d5d Author: Daniel Ritz Date: Fri Dec 8 18:07:01 2006 +0100 [PATCH] PCMCIA: fix drivers broken by recent cleanup Setting .ConfigBase and .Present is now done at the pcmcia core. The driver cleanup missed a few places where the driver did set .Present to PRESENT_OPTION and later to the values from the CIS. Setting to PRESENT_OPTION now overrides the values from the CIS. So just remove those lines. Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski Signed-off-by: Linus Torvalds commit aae7d14f619c665b83e07013e3dda8694ea3e40b Author: Andrew Morton Date: Wed Jan 10 23:15:45 2007 -0800 [PATCH] FD_ZERO build fix unionfs managed to hit this on s390. Some architectures use __ptr_t in their FD_ZERO implementation. We don't have a __ptr_t. Switch them over to plain old void*. Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Al Viro Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: "Luck, Tony" Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Josef 'Jeff' Sipek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4f0ae0ea63caceff37a13f281a72652b7ea71ba Author: takada Date: Wed Jan 10 23:15:44 2007 -0800 [PATCH] fix typo in geode_configre()@cyrix.c We write back the wrong register when configuring the Geode processor. Instead of storing to CCR4, it stores to CCR3. Cc: Jordan Crouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56fb5fe9f16f630e3ee663c47c5aff26ac424d05 Author: Michael Buesch Date: Wed Jan 10 23:15:43 2007 -0800 [PATCH] Fix HWRNG built-in initcalls priority This changes all HWRNG driver initcalls to module_init(). We must probe the RNGs after the major kernel subsystems are already up and running (like PCI). This fixes Bug 7730. http://bugzilla.kernel.org/show_bug.cgi?id=7730 Signed-off-by: Michael Buesch Cc: Jan Beulich Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9863be598ed068613996af8da71d9fd976a0ab2d Author: Jan Beulich Date: Wed Jan 10 23:15:41 2007 -0800 [PATCH] intel-rng workarounds Add a load option to intel-rng to allow skipping the FWH detection, necessary in case the BIOS has locked read-only the firmware hub space. Also prevent any attempt to write to firmware space if it cannot be write enabled (apparently caused hangs on some systems not having an FWH and thus also not having a respective RNG). Signed-off-by: Jan Beulich Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f73ca1b76c6880b934d3ef566c1592efc80bb759 Author: David Chinner Date: Wed Jan 10 23:15:41 2007 -0800 [PATCH] Revert bd_mount_mutex back to a semaphore Revert bd_mount_mutex back to a semaphore so that xfs_freeze -f /mnt/newtest; xfs_freeze -u /mnt/newtest works safely and doesn't produce lockdep warnings. (XFS unlocks the semaphore from a different task, by design. The mutex code warns about this) Signed-off-by: Dave Chinner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88bf7b391dca840f03fe25e4ff8fe6b4319fa07b Author: David Miller Date: Wed Jan 10 23:15:40 2007 -0800 [PATCH] really fix funsoft driver Fix void cast and re-enable on sparc. Signed-off-by: David S. Miller Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3db7691e9f3dff3289f64e3d98583e28afe03db Author: Trond Myklebust Date: Wed Jan 10 23:15:39 2007 -0800 [PATCH] NFS: Fix race in nfs_release_page() NFS: Fix race in nfs_release_page() invalidate_inode_pages2() may find the dirty bit has been set on a page owing to the fact that the page may still be mapped after it was locked. Only after the call to unmap_mapping_range() are we sure that the page can no longer be dirtied. In order to fix this, NFS has hooked the releasepage() method and tries to write the page out between the call to unmap_mapping_range() and the call to remove_mapping(). This, however leads to deadlocks in the page reclaim code, where the page may be locked without holding a reference to the inode or dentry. Fix is to add a new address_space_operation, launder_page(), which will attempt to write out a dirty page without releasing the page lock. Signed-off-by: Trond Myklebust Also, the bare SetPageDirty() can skew all sort of accounting leading to other nasties. [akpm@osdl.org: cleanup] Signed-off-by: Peter Zijlstra Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07031e14c1127fc7e1a5b98dfcc59f434e025104 Author: Ingo Molnar Date: Wed Jan 10 23:15:38 2007 -0800 [PATCH] KVM: add VM-exit profiling This adds the profile=kvm boot option, which enables KVM to profile VM exits. Use: "readprofile -m ./System.map | sort -n" to see the resulting output: [...] 18246 serial_out 148.3415 18945 native_flush_tlb 378.9000 23618 serial_in 212.7748 29279 __spin_unlock_irq 622.9574 43447 native_apic_write 2068.9048 52702 enable_8259A_irq 742.2817 54250 vgacon_scroll 89.3740 67394 ide_inb 6126.7273 79514 copy_page_range 98.1654 84868 do_wp_page 86.6000 140266 pit_read 783.6089 151436 ide_outb 25239.3333 152668 native_io_delay 21809.7143 174783 mask_and_ack_8259A 783.7803 362404 native_set_pte_at 36240.4000 1688747 total 0.5009 Signed-off-by: Ingo Molnar Acked-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3881a6816b45668df60a426e5c3431ece1539a7 Author: Lars Ellenberg Date: Wed Jan 10 23:15:37 2007 -0800 [PATCH] md: pass down BIO_RW_SYNC in raid{1,10} md raidX make_request functions strip off the BIO_RW_SYNC flag, thus introducing additional latency. Fixing this in raid1 and raid10 seems to be straightforward enough. For our particular usage case in DRBD, passing this flag improved some initialization time from ~5 minutes to ~5 seconds. Acked-by: NeilBrown Signed-off-by: Lars Ellenberg Acked-by: Jens Axboe Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 664c0d3d575946bce24ecf5b7f93ee9541e4caf3 Author: Vivek Goyal Date: Wed Jan 10 23:15:36 2007 -0800 [PATCH] i386: sched_clock using init data tsc_disable fix o sched_clock() a non-init function is using init data tsc_disable. This is flagged by MODPOST on i386 if CONFIG_RELOCATABLE=y WARNING: vmlinux - Section mismatch: reference to .init.data:tsc_disable from .text between 'sched_clock' (at offset 0xc0109d58) and 'tsc_update_callback' Signed-off-by: Vivek Goyal Cc: Andi Kleen Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c61a446a1cab4280404798e335655266c1a4929 Author: Vivek Goyal Date: Wed Jan 10 23:15:35 2007 -0800 [PATCH] Kdump documentation update o Kdump documentation update. - Update details for using relocatable kernel. - Start using kexec-tools-testing release as it is latest and old kexec-tools can't load relocatable bzImage file. - Also add kdump on ia64 specific details. Signed-off-by: Vivek Goyal Cc: Horms Cc: Mohan Kumar M Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b282b6f8a8d1cf3e132ce3769d7d1cac81d9dd2d Author: Gautham R Shenoy Date: Wed Jan 10 23:15:34 2007 -0800 [PATCH] Change cpu_up and co from __devinit to __cpuinit Compiling the kernel with CONFIG_HOTPLUG = y and CONFIG_HOTPLUG_CPU = n with CONFIG_RELOCATABLE = y generates the following modpost warnings WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141b7d) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141b9c) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.text:__cpu_up from .text between '_cpu_up' (at offset 0xc0141bd8) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141c05) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141c26) and 'cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between '_cpu_up' (at offset 0xc0141c37) and 'cpu_up' This is because cpu_up, _cpu_up and __cpu_up (in some architectures) are defined as __devinit AND __cpu_up calls some __cpuinit functions. Since __cpuinit would map to __init with this kind of a configuration, we get a .text refering .init.data warning. This patch solves the problem by converting all of __cpu_up, _cpu_up and cpu_up from __devinit to __cpuinit. The approach is justified since the callers of cpu_up are either dependent on CONFIG_HOTPLUG_CPU or are of __init type. Thus when CONFIG_HOTPLUG_CPU=y, all these cpu up functions would land up in .text section, and when CONFIG_HOTPLUG_CPU=n, all these functions would land up in .init section. Tested on a i386 SMP machine running linux-2.6.20-rc3-mm1. Signed-off-by: Gautham R Shenoy Cc: Vivek Goyal Cc: Mikael Starvik Cc: Ralf Baechle Cc: Kyle McMartin Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d103e90f63c4b78f2101f8c0bd303fa049ce9a7 Author: David Brownell Date: Wed Jan 10 23:15:32 2007 -0800 [PATCH] rtc-sh: correctly report rtc_wkalrm.enabled This fixes the SH rtc driver to (a) correctly report 'enabled' status with other alarm status; (b) not duplicate that status in its procfs dump Signed-off-by: David Brownell Acked-by: Paul Mundt Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fa1da8ea9318af6a0252f56cd2e689616346218 Author: Roman Zippel Date: Wed Jan 10 23:15:31 2007 -0800 [PATCH] qconf: (re)fix SIGSEGV on empty menu items Back out the recent fix for this bug, fix it by correctly initialising ConfigInfoView.sym. Signed-off-by: Roman Zippel Cc: "Cyrill V. Gorcunov" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2f3aa02576632cdb60bd3de1f4bf55e9ac65604 Author: Dave Hansen Date: Wed Jan 10 23:15:30 2007 -0800 [PATCH] Fix sparsemem on Cell Fix an oops experienced on the Cell architecture when init-time functions, early_*(), are called at runtime. It alters the call paths to make sure that the callers explicitly say whether the call is being made on behalf of a hotplug even, or happening at boot-time. It has been compile tested on ppc64, ia64, s390, i386 and x86_64. Acked-by: Arnd Bergmann Signed-off-by: Dave Hansen Cc: Yasunori Goto Acked-by: Andy Whitcroft Cc: Christoph Lameter Cc: Martin Schwidefsky Acked-by: Heiko Carstens Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47a4d5be7c50b2e9b905abbe2b97dc87051c5a44 Author: Brice Goglin Date: Wed Jan 10 23:15:29 2007 -0800 [PATCH] increment pos before looking for the next cap in __pci_find_next_ht_cap While testing 2.6.20-rc3 on a machine with some CK804 chipsets, we noticed that quirk_nvidia_ck804_msi_ht_cap() was not detecting HT MSI capabilities anymore. It is actually caused by the MSI mapping on the root chipset being the 2nd HT capability in the chain. pci_find_ht_capability() does not seem to find anything but the first HT cap correctly, because it forgets to increment the position before looking for the next cap. The following patch seems to fix it. At least, this proves that having a ttl is good idea since the machine would have been stucked in an infinite loop if we didn't have a ttl :) We have to pass pos + PCI_CAP_LIST_NEXT to __pci_find_next_cap_ttl to get the next HT cap instead of the same one again. Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5e5673f828623e58a401862b33173591faaeaff Author: Nathan Lynch Date: Wed Jan 10 23:15:28 2007 -0800 [PATCH] sched: tasks cannot run on cpus onlined after boot Commit 5c1e176781f43bc902a51e5832f789756bff911b ("sched: force /sbin/init off isolated cpus") sets init's cpus_allowed to a subset of cpu_online_map at boot time, which means that tasks won't be scheduled on cpus that are added to the system later. Make init's cpus_allowed a subset of cpu_possible_map instead. This should still preserve the behavior that Nick's change intended. Thanks to Giuliano Pochini for reporting this and testing the fix: http://ozlabs.org/pipermail/linuxppc-dev/2006-December/029397.html Signed-off-by: Nathan Lynch Acked-by: Ingo Molnar Cc: Nick Piggin Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c71551ad309c46d9d2433a9b688491edbd10c806 Author: Linus Torvalds Date: Thu Jan 11 18:18:04 2007 -0800 Don't put "linux_banner" in the .init section It might save a few bytes after bootup, but it causes the string to be linked in at the end of the final vmlinux image, which defeats the whole point of doing all this, namely allowing some broken user-space binaries to search for the kernel version string in the kernel binary. So just remove the __init specifier. Cc: Olaf Hering Cc: Jean Delvare Cc: Roman Zippel Cc: Andrey Borzenkov Cc: Andrew Morton Acked-by: Andy Whitcroft Signed-off-by: Linus Torvalds commit d2fadbbbf0e42b842731da71864f222e7f119461 Author: Henrique de Moraes Holschuh Date: Thu Jan 11 02:58:15 2007 -0500 Revert "ACPI: ibm-acpi: make non-generic bay support optional" This reverts commit 2df910b4c3edcce9a0c12394db6f5f4a6e69c712. ACPI_BAY has not been merged into mainline yet, so the changes to ibm-acpi related Kconfig entries that depend on ACPI_BAY were permanently disabling ibm-acpi bay support. This is a serious regression for ThinkPad users. Signed-off-by: Henrique de Moraes Holschuh Signed-off-by: Len Brown commit 8b59a454c421542a51c391f542c80d165f7547a0 Author: Len Brown Date: Mon Jan 8 19:03:28 2007 -0500 ACPI: update MAINTAINERS s/Maintained/Supported/ and document some sub-maintainers for ACPI drivers. Signed-off-by: Len Brown commit 1bb67c2582f4271488721001a707124fd0af347e Author: Len Brown Date: Thu Jan 11 01:49:44 2007 -0500 ACPI: schedule obsolete features for deletion Signed-off-by: Len Brown commit d6637b28ffb38f207015c990e481fde5bba233d7 Author: Venkatesh Pallipadi Date: Wed Jan 10 23:16:36 2007 -0500 ACPI: delete two spurious ACPI messages ACPI: Getting cpuindex for acpiid 0x4 acpi_processor-0742 [00] processor_preregister_: Error while parsing _PSD domain information. Assuming no coordination http://bugzilla.kernel.org/show_bug.cgi?id=7286 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 5d65131fa8d333d4575e7dfe5a05d3a9fa4a687e Author: Venkatesh Pallipadi Date: Wed Jan 10 23:08:38 2007 -0500 ACPI: rename cstate_entry_s to cstate_entry style change only. Signed-off-by: Len Brown commit 7401969907594ac9632368ec53528fbd9b18f339 Author: Andi Kleen Date: Thu Jan 11 01:52:45 2007 +0100 [PATCH] x86-64: Fix warnings in ia32_aout.c Fix linux/arch/x86_64/ia32/ia32_aout.c: In function ‘create_aout_tables’: linux/arch/x86_64/ia32/ia32_aout.c:244: warning: cast from pointer to integer of different size linux/arch/x86_64/ia32/ia32_aout.c:253: warning: cast from pointer to integer of different size with gcc 4.3 Signed-off-by: Andi Kleen commit 88d20328cd66ee05f9b7f4d414640700db69d82b Author: Vivek Goyal Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] i386: Convert some functions to __init to avoid MODPOST warnings o Some functions which should have been in init sections as they are called only once. Put them in init sections. Otherwise MODPOST generates warning as these functions are placed in .text and they end up accessing something in init sections. WARNING: vmlinux - Section mismatch: reference to .init.text:migration_init from .text between 'do_pre_smp_initcalls' (at offset 0xc01000d1) and 'run_init_process' Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen commit 0e0be25d31f75f64b6fbe00f0b4e5d6b1ad1438e Author: Vivek Goyal Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] i386: Fix memory hotplug related MODPOST generated warning o Fix modpost generated warning. WARNING: vmlinux - Section mismatch: reference to .init.text: from .text between 'add_one_highpage_hotplug' (at offset 0xc0113d3f) and 'online_page' Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen commit b92cc55923898ab5e8a78939be9734ab9e1c8f49 Author: Muli Ben-Yehuda Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] x86-64: tighten up printks Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen Cc: Andi Kleen Signed-off-by: Andrew Morton commit ed5316d4457b35c7b4942af028d6b878174264f7 Author: Jack Steiner Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] x86-64: - Ignore long SMI interrupts in clock calibration Ensure that no SMI interrupts occur between the read of the HPET & TSC in the clock calibration loop. I noticed that a 2.66GHz system incorrectly detected the processor clock speed about 1/7 of the time: time.c: Detected 2660.005 MHz processor. (most of the time) time.c: Detected 2988.203 MHz processor. (sometime) The problem is caused by an SMI interrupt occuring in hpet_calibrate_tsc() between the read of the HPET & TSC. Prior to switching the BIOS into ACPI mode, it appears that every 27msec an SMI interrupt occurs. The SMI interrupt takes 4.8 msec to process. Note: On my test system, TICK_MIN had to be >380. I picked 5000 to minimize risk of having a value that is too small for other platforms. Signed-off-by: Jack Steiner Signed-off-by: Andi Kleen arch/x86_64/kernel/time.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) commit 9d24a81e84cee7cbf4656d178842838ac5ab23a4 Author: Vivek Goyal Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] x86-64: pci quirks MODPOST warning fix o MODPOST generates warnings for i386 if kernel is compiled with CONFIG_RELOCATABLE=y WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between 'asus_hides_smbus_lpc_ich6' (at offset 0xc0217d58) and 'quirk_cardbus_legacy' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between 'asus_hides_smbus_lpc' (at offset 0xc0217fd9) and 'pci_match_id' o Two quirk functions which are non __init, are accessing data which is of type __init. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen commit ee6a8545a4cbc620625c7956c95aac513842156b Author: Vivek Goyal Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] x86-64: Modpost whitelist reference to more symbols (pattern 3) o MODPOST generates warning on i386 if kernel is compiled with CONFIG_RELOCATABLE=y. WARNING: vmlinux - Section mismatch: reference to .init.text:__init_begin from .text between 'free_initmem' (at offset 0xc0114fd3) and 'do_test_wp_bit' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'core_kernel_text' (at offset 0xc012aeae) and 'kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'core_kernel_text' (at offset 0xc012aeb7) and 'kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'get_symbol_pos' (at offset 0xc0135776) and 'reset_iter' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'get_symbol_pos' (at offset 0xc013577d) and 'reset_iter' o These symbols (__init_begin, _sinittext, _einittext) belong to init section and generally represent a section boundary. These are special symbols in the sense that their size is zero and no memory is allocated for them in init section. Their addr and value are same. So even if we free the init section, it is ok to reference them. o Whitelist access to such select symbols in MODPOST. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Cc: "Eric W. Biederman" Cc: Andi Kleen Signed-off-by: Andrew Morton commit 118c0ace1b61433311ae4e067fdd32841baa7f91 Author: Vivek Goyal Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] x86-64: modpost add more symbols to whitelist pattern2 o MODPOST generates warning for i386 if compiled with CONFIG_RELOCATABLE=y and serial console support is enabled. o Serial console setup function, serial8250_console_setup(), is a non __init function and it calls functions which are of type __init(). (uart_parse_options() and uart_set_options()). Assuming, setup will be called during init time, changing serial8250_console_setup() to __init. o Adding one more pattern to modpost whitelist. Console drivers might have *_console structures containing references to setup functions which can be of __init type. Don't generate warnings for those. WARNING: vmlinux - Section mismatch: reference to .init.text: from .data between 'serial8250_console' (at offset 0xc05a33d8) and 'serial8250_reg' Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Cc: "Eric W. Biederman" Cc: Andi Kleen Signed-off-by: Andrew Morton commit e96763d6e52c22a8821466e4d01c0c995b8087be Author: Vivek Goyal Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] i386: make apic probe function non-init o struct genapic contains pointer to probe() function which is of type __init. Hence MODPOST generates warning if kernel is compiled with CONFIG_RELOCATABLE=y for i386. WARNING: vmlinux - Section mismatch: reference to .init.text: from .data between 'apic_summit' (at offset 0xc058b504) and 'apic_bigsmp' WARNING: vmlinux - Section mismatch: reference to .init.text: from .data between 'apic_bigsmp' (at offset 0xc058b5a4) and 'cpu.4471' WARNING: vmlinux - Section mismatch: reference to .init.text: from .data between 'apic_es7000' (at offset 0xc058b644) and 'apic_default' WARNING: vmlinux - Section mismatch: reference to .init.text: from .data between 'apic_default' (at offset 0xc058b6e4) and 'interrupt' o One of the possible options is to put special case check in MODPOST to not emit warnings for this case but I think it is not a very good option in terms of maintenance. o Another option is to make probe() function non __init. Anyway this function is really small so not freeing this memory after init is not a big deal. Secondly, from a programming perspective, probably genapic should not provide pointers to functions which have been freed as genapic is non __init and is used even after initialization is complete. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Cc: "Eric W. Biederman" Cc: Andi Kleen Signed-off-by: Andrew Morton commit 4a5d107a9a79ef3404209a43866554cba451dda4 Author: Vivek Goyal Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] i386: cpu hotplug/smpboot misc MODPOST warning fixes o Misc smpboot/cpu hotplug path cleanups. I did those to supress the warnings generated by MODPOST. These warnings are visible only if CONFIG_RELOCATABLE=y. o CONFIG_RELOCATABLE compiles the kernel with --emit-relocs option. This option retains relocation information in vmlinux file and MODPOST is quick to spit out "Section mismatch" warnings. o This patch fixes some of those warnings. Many of the functions in smpboot case are __devinit type and they in turn accesses text/data which if of type __cpuinit. Now if CONFIG_HOTPLUG=y and CONFIG_HOTPLUG_CPU=n then we end up in cases where a function in .text segment is calling another function in .init.text segment and MODPOST emits warning. WARNING: vmlinux - Section mismatch: reference to .init.text:identify_cpu from .text between 'smp_store_cpu_info' (at offset 0xc011020d) and 'do_boot_cpu' WARNING: vmlinux - Section mismatch: reference to .init.text:init_gdt from .text between 'do_boot_cpu' (at offset 0xc01102ca) and '__cpu_up' WARNING: vmlinux - Section mismatch: reference to .init.text:print_cpu_info from .text between 'do_boot_cpu' (at offset 0xc01105d0) and '__cpu_up' o It also fixes the issues where CONFIG_HOTPLUG_CPU=y and start_secondary() is calling smp_callin() which in-turn calls synchronize_tsc_ap() which is of type __init. This should have meant broken CPU hotplug. WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between 'start_secondary' (at offset 0xc011603f) and 'initialize_secondary' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between 'MP_processor_info' (at offset 0xc0116a4f) and 'mp_register_lapic' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between 'MP_processor_info' (at offset 0xc0116a4f) and 'mp_register_lapic' Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen commit 24420760c3701ff422b344e047a20ca09b76fc64 Author: Andi Kleen Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] x86-64: Use different constraint for gcc < 4.1 in bitops.h +m is really correct for a RMW instruction, but some older gccs error out. I finally gave in and ifdefed it. This fixes compilation errors with some compiler version. Signed-off-by: Andi Kleen commit 343cde51b3b856470eea24a89f00166b8e2d7272 Author: Vivek Goyal Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] x86-64: Make noirqdebug_setup function non init to fix modpost warning o noirqdebug_setup() is __init but it is being called by quirk_intel_irqbalance() which if of type __devinit. If CONFIG_HOTPLUG=y, quirk_intel_irqbalance() is put into text section and it is wrong to call a function in __init section. o MODPOST flags this on i386 if CONFIG_RELOCATABLE=y WARNING: vmlinux - Section mismatch: reference to .init.text:noirqdebug_setup from .text between 'quirk_intel_irqbalance' (at offset 0xc010969e) and 'i8237A_suspend' o Make noirqdebug_setup() non-init. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen commit 7c8809aef0c71cc92ffc7d922e8824c04a36f44b Author: Andi Kleen Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] i386: Update defconfig Signed-off-by: Andi Kleen commit 03c3cc612802be8c303944c816fd159ffff991b9 Author: Andi Kleen Date: Thu Jan 11 01:52:44 2007 +0100 [PATCH] x86-64: Update defconfig Signed-off-by: Andi Kleen commit 8a93c4968fc177844680987b31d00d1fc3bc02aa Author: Alexander Bigga Date: Thu Dec 21 11:25:19 2006 +0100 [MIPS] Alchemy: Fix PCI-memory access The problem was introduced in 2.6.18.3 with the casting of some 36bit-defines (PCI memory) in au1000.h to resource_size_t which may be u32 or u64 depending on the experimental CONFIG_RESOURCES_64BIT. With unset CONFIG_RESOURCES_64BIT, the pci-memory cannot be accessed because the ioremap in arch/mips/au1000/common/pci.c already used the truncated addresses. With set CONFIG_RESOURCES_64BIT, things get even worse, because PCI-scan aborts, due to resource conflict: request_resource() in arch/mips/pci/pci.c fails because the maximum iomem-address is 0xffffffff (32bit) but the pci-memory-start-address is 0x440000000 (36bit). To get pci working again, I propose the following patch: 1. remove the resource_size_t-casting from au1000.h again 2. make the casting in arch/mips/au1000/common/pci.c (it's allowed and necessary here. The 36bit-handling will be done in __fixup_bigphys_addr). With this patch pci works again like in 2.6.18.2, the gcc-compile warnings in pci.c are gone and it doesn't depend on CONFIG_EXPERIMENTAL. Signed-off-by: Alexander Bigga Signed-off-by: Ralf Baechle --- commit e16d8df0be26c8e82c4a1188af8143f2d466b12a Author: Atsushi Nemoto Date: Wed Jan 10 18:53:33 2007 +0900 [MIPS] Fix N32 SysV IPC routines Add wrappers for N32 msg{snd,rcv}. compat_sys_msg{snd,rcv} can not not be used as system call entries as is. This fix is based on Kaz Kylheku's patch. Also change a type of last argument of sysn32_semctl to match its true size. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 6b4cd2755039a0be642699e3fc2e3386daa88151 Author: Atsushi Nemoto Date: Tue Jan 9 10:23:00 2007 +0900 [MIPS] PNX8550: Fix system timer initialization Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 1a74bc68e4c0534d150e6454b45a70dab831fa32 Author: Stefan Richter Date: Wed Jan 10 20:17:15 2007 +0100 ieee1394: sbp2: fix probing of some DVD-ROM/RWs Since commit 98e238cd42be6c0852da519303cf0182690f8d9f in Linux 2.6.19, "ieee1394: sbp2: don't prefer MODE SENSE 10", some FireWire DVD-ROMs and DVD-RWs were mistaken as CD-ROM because sr_mod now sent MODE SENSE 6. The MMC command set includes only MODE SENSE 10. http://bugzilla.kernel.org/show_bug.cgi?id=7800 This fix lets sbp2 switch scsi_device.use_10_for_rw on for MMC LUs. This should rather be done in the command set driver sr_mod, not in the sbp2 transport driver, and an according patch will follow for a next Linux release. Signed-off-by: Stefan Richter commit 3eb3c740f51c2126b53c2dde974c1c57e634aa7b Author: Roman Zippel Date: Wed Jan 10 14:45:28 2007 +0100 [PATCH] fix linux banner format string Revert previous attempts at messing with the linux banner string and simply use a separate format string for proc. Signed-off-by: Roman Zippel Acked-by: Olaf Hering Acked-by: Jean Delvare Cc: Andrey Borzenkov Cc: Andrew Morton Cc: Andy Whitcroft Cc: Herbert Poetzl Signed-off-by: Linus Torvalds commit b3277dfaf0257221f83dd861b82c54de4507473e Author: Mikael Pettersson Date: Wed Jan 10 09:33:53 2007 +0100 [PATCH] MAINTAINERS: maintainer for sata_promise This patch adds myself as maintainer of the sata_promise libata driver. Signed-off-by: Mikael Pettersson Signed-off-by: Linus Torvalds commit 0fc2ccea4c8fa779053cb6f8984f6da399a81182 Author: Adrian Hunter Date: Tue Jan 9 17:55:21 2007 +0200 [MTD] OneNAND: Handle DDP chip boundary during read-while-load The read-while-load method of reading from OneNAND needs to allow for the change of bufferRAM address at the boundary between the two chips in a double density (DDP) device. Signed-off-by: Adrian Hunter Signed-off-by: Kyungmin Park commit b3c9f8bfe7ab366a5d2495ebe5d2dc6fd7368122 Author: Kyungmin Park Date: Fri Jan 5 19:16:04 2007 +0900 [MTD] OneNAND: return ecc error code only when 2-bit ecc occurs we don't need to return ecc error when 1-bit ecc. We only return error code when 2-bit ecc error Signed-off-by: Kyungmin Park commit a8de85d557004d6d4e4cf79ecd6b97339b986fe9 Author: Adrian Hunter Date: Thu Jan 4 09:51:26 2007 +0200 [MTD] OneNAND: Implement read-while-load Read-while-load enables higher performance read operations. Signed-off-by: Adrian Hunter Signed-off-by: Kyungmin Park commit 2fd32d4af83f4535d12d3f6dd23189352a9596fa Author: Kyungmin Park Date: Fri Dec 29 11:51:40 2006 +0900 [MTD] OneNAND: fix onenand_wait bug in read ecc error Even though there is ECC error. OneNAND driver updates the buffram as valid Signed-off-by: Kyungmin Park commit 61a7e1983e773b93aac172dadc97f1eb484536b4 Author: Artem Bityutskiy Date: Tue Dec 26 16:41:24 2006 +0900 [MTD] OneNAND: release CPU in cycles This patch teaches OneNAND to release processor in read/write/erase cycles and let other processes proceed. Also, remove buggi touch watchdog call which only hides the problem instead of solving it. Signed-off-by: Artem Bityutskiy Signed-off-by: Kyungmin Park commit 60d84f9739a47d0ed8e19805d9056e39fba31c79 Author: Kyungmin Park Date: Fri Dec 22 16:21:54 2006 +0900 [MTD] OneNAND: add subpage write support OneNAND supports up to 4 writes at one NAND page. Add support of this feature. Signed-off-by: Kyungmin Park commit f62724873652ddb19edf7f92843e9456fe3be3ea Author: Kyungmin Park Date: Fri Dec 22 16:02:50 2006 +0900 [MTD] OneNAND: fix onenand_wait bug Fix onenand_wait error reporting Signed-off-by: Kyungmin Park commit abb536e7ac8719243cfc4b40b39bf3eefd028f82 Author: Kyungmin Park Date: Fri Dec 22 16:39:30 2006 +0900 [JFFS2] use the ref_offset macro Don't use ref->flash_offset directly in debugging code, use the ref_offset macro instead. Signed-off-by: Kyungmin Park Signed-off-by: Artem Bityutskiy commit a2166b933ef9099b4fa6860b165e6dac553a97aa Author: Artem Bityutskiy Date: Thu Dec 28 12:01:41 2006 +0200 [JFFS2] Reschedule in loops Make JFFS2 nicer and teach it to call cond_resched() in loops which may be quite large. Signed-off-by: Artem Bityutskiy commit 483479ecc565b7f5845997138eddf5ecbc2684b1 Author: Jarek Poplawski Date: Tue Jan 9 14:38:31 2007 -0800 [IPV4] devinet: inetdev_init out label moved after RCU assignment inetdev_init out label moved after RCU assignment (final suggestion by Herbert Xu) Signed-off-by: Jarek Poplawski Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 469de9b90f739f130ab3d483e819888e977596b8 Author: Paul Moore Date: Tue Jan 9 14:37:06 2007 -0800 [INET]: style updates for the inet_sock->is_icsk assignment fix A quick patch to change the inet_sock->is_icsk assignment to better fit with existing kernel coding style. Signed-off-by: Paul Moore Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 4a1c0107bca2eccf4491b86fec41ce63268d803d Author: Vlad Yasevich Date: Tue Jan 9 14:35:51 2007 -0800 [SCTP]: Fix err_hdr assignment in sctp_init_cause. The subh->err_hdr should point to the error header, not the data. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit f79e7802153829e015dc2a60eb8b7444eb191b67 Author: Patrick McHardy Date: Tue Jan 9 14:34:14 2007 -0800 [NETFILTER]: tcp conntrack: fix IP_CT_TCP_FLAG_CLOSE_INIT value IP_CT_TCP_FLAG_CLOSE_INIT is a flag and should have a value of 0x4 instead of 0x3, which is IP_CT_TCP_FLAG_WINDOW_SCALE | IP_CT_TCP_FLAG_SACK_PERM. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ffed53d25bf36efb0571f7d9109f2e95df7f8b33 Author: Patrick McHardy Date: Tue Jan 9 14:33:49 2007 -0800 [NETFILTER]: nf_nat: fix hanging connections when loading the NAT module When loading the NAT module, existing connection tracking entries don't have room for NAT information allocated and packets are dropped, causing hanging connections. They really should be entered into the NAT table as NULL mappings, but the current allocation scheme doesn't allow this. For now simply accept those packets to avoid the hanging connections. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8c82d8df7060221f131c9ca5352fb613c14f857a Author: Bart De Schuymer Date: Tue Jan 9 14:33:11 2007 -0800 [NETFILTER]: arp_tables: fix userspace compilation The included patch translates arpt_counters to xt_counters, making userspace arptables compile against recent kernels. Signed-off-by: Bart De Schuymer Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f9f02cca25acf33e5853c6b3cbb0c7146312783f Author: Patrick McHardy Date: Tue Jan 9 14:32:41 2007 -0800 [NETFILTER]: nf_conntrack_ipv6: fix crash when handling fragments When IPv6 connection tracking splits up a defragmented packet into its original fragments, the packets are taken from a list and are passed to the network stack with skb->next still set. This causes dev_hard_start_xmit to treat them as GSO fragments, resulting in a use after free when connection tracking handles the next fragment. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f5e10529a9a835a267f6aa7806e291d6df845e14 Author: Dotan Barak Date: Wed Dec 27 15:46:06 2006 +0200 IB/mthca: Don't execute QUERY_QP firmware command for QP in RESET state If a QP being queried is in the RESET state, don't execute the QUERY_QP firmware command (because it will fail). Signed-off-by: Dotan Barak Signed-off-by: Roland Dreier commit f2d9136133de257abbd97fec6f624d3a73d1e1fd Author: Hoang-Nam Nguyen Date: Tue Jan 9 18:04:14 2007 +0100 IB/ehca: Use proper GFP_ flags for get_zeroed_page() Here is a patch for ehca to use proper flag, ie. GFP_ATOMIC resp. GFP_KERNEL, when calling get_zeroed_page() to prevent "Bug: scheduling while atomic...". This error does not cause a kernel panic but makes ipoib un-usable afterwards. It is reproducible on 2.6.20-rc4 if one does ifconfig down during a flood ping test. I have not observed this error in earlier releases incl. 2.6.20-rc1. This error occurs when a qp event/irq is received and ehca event handler allocates a control block/page to obtain HCA error data block. Use of GFP_ATOMIC when in interrupt context prevents this issue. Signed-off-by Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 2f5c33b3180169f3eafb698b66686962d637fb0e Author: Mark M. Hoffman Date: Mon Jan 8 22:11:29 2007 -0500 [PATCH] i2c/pci: fix sis96x smbus quirk once and for all The sis96x SMBus PCI device depends on two different quirks to run in a specific order. Apart from being fragile, this was found to actually break on (at least) recent FC4, FC5, and FC6 kernels. This patch fixes the quirks so that they work without relying on the compiler and/or linker to put them in any specific order. http://lists.lm-sensors.org/pipermail/lm-sensors/2006-April/015962.html https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=189719 I tested this patch. Signed-off-by: Mark M. Hoffman Cc: Andrew Morton Cc: Adrian Bunk Cc: Greg K-H Cc: Jean Delvare Signed-off-by: Linus Torvalds commit 531498013163c72cee8540e98e12c0c430c7fe87 Author: Jiri Kosina Date: Tue Jan 9 13:24:25 2007 +0100 HID: Fix DRIVER_DESC macro DRIVER_DESC macro is wrong in drivers/hid/hid-core.c. Its value is legacy from original usb+hid code and clashes with current usbhid implementation. Fix it. Signed-off-by: Jiri Kosina commit a037b0a43f6abafc4f725f7c7f46d577d1c44c96 Author: Jaroslav Kysela Date: Tue Jan 9 10:57:25 2007 +0100 [ALSA] version 1.0.14rc1 Signed-off-by: Jaroslav Kysela commit bf3dbdcd0bfca74c16ad0b2b5a978907c864ed4c Author: Christian Borntraeger Date: Tue Jan 9 10:19:03 2007 +0100 [S390] locking problem with __cpcmd. Changeset 740b5706b9c4b3767f597b3ea76654c6f2a800b2 moved the protecting spinlock from __cpcmd to cpcmd. Therefore vmcp can no longer use __cpcmd, instead we have to use cpcmd. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit d8ad075ef60ca33f1bd8e227eed2202108fd6cd8 Author: Heiko Carstens Date: Tue Jan 9 10:18:50 2007 +0100 [S390] don't call handle_mm_fault() if in an atomic context. There are several places in the futex code where a spin_lock is held and still uaccesses happen. Deadlocks are avoided by increasing the preempt count. The pagefault handler will then not take any locks but will immediately search the fixup tables. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit de338a3795bbcb3c3d77591f65118cbec776cc39 Author: Heiko Carstens Date: Tue Jan 9 10:18:47 2007 +0100 [S390] Fix vmalloc area size calculation. setup_memory_end() uses VMALLOC_END instead of VMALLOC_END_INIT to calculate the maximum supported size of physical memory. Since VMALLOC_END is zero, this will cause a crash on 31 bit systems. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 6721f77810dfcb7cbf8e97be6fa43fe2740dd0aa Author: Heiko Carstens Date: Tue Jan 9 10:18:44 2007 +0100 [S390] Fix cpu hotplug (missing 'online' attribute). 72486f1f8f0a2bc828b9d30cf4690cf2dd6807fc inverts the logic if an 'online' attribute in /sys/devices/system/cpu/cpuX should appear. So we end up with no hotpluggable cpus at all... Set the hotpluggable value to one to make sure the online attribute appears again. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 6faf4444f2445b068a4f75a86ae81b104c0eed2c Author: Heiko Carstens Date: Tue Jan 9 10:18:41 2007 +0100 [S390] cio: use barrier() in stsch_reset. Use barrier() in stsch_reset() instead of duplicating the stsch() inline assembly and adding "memory" to the clobberlist. Pointed out by Chuck Ebbert. Real fix would be to add a fixup section to the stsch() and extend the basic program check handler so it searches the exception tables in case of a program check. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit dd401e2b9250e3bb07ef388ddccbbf80aa106fc7 Author: Hongjie Yang Date: Tue Jan 9 10:18:36 2007 +0100 [S390] memory detection misses 128k. Fix a memory leak problem in the memory detection routines. A memory leak of 128k occurs when we have a contiguous memory with mixed access-mode (read or write) ranges. Signed-off-by: Hongjie Yang Signed-off-by: Martin Schwidefsky commit cb48cfe8079ddda78425a16d6c1be57d822b365b Author: Craig Schlenter Date: Tue Jan 9 00:11:15 2007 -0800 [TCP]: Fix iov_len calculation in tcp_v4_send_ack(). This fixes the ftp stalls present in the current kernels. All credit goes to Komuro for tracking this down. The patch is untested but it looks *cough* obviously correct. Signed-off-by: Craig Schlenter Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 88044c8c9635b2ec67a27c6f334965e5b97eb2c7 Author: Patrick McHardy Date: Tue Jan 9 00:03:26 2007 -0800 [NETFILTER]: nf_conntrack_netbios_ns: fix uninitialized member in expectation ->helper is uninitialized in the expectation registered by the netbios_ns helper and it later copied to the expected connection, which causes invalid memory dereferences when trying to call the helper. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c1d2a1965a00693bddaddf75d57488a0d8e891af Author: Michael Chan Date: Mon Jan 8 19:57:20 2007 -0800 [TG3]: Add PHY workaround for 5755M. Some PHY trim values need to be fine-tuned on 5755M to be IEEE-compliant. Update version to 3.72. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit d6aa4acebafe3acb0aade7704ec5b2f03742ea14 Author: Michael Chan Date: Mon Jan 8 19:56:31 2007 -0800 [BNX2]: Update version and reldate. Update version to 1.5.3. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit e6be763f63420c334710a5a0818e6bfcf5d593f8 Author: Michael Chan Date: Mon Jan 8 19:56:13 2007 -0800 [BNX2]: Fix bug in bnx2_nvram_write(). The bug was a bogus pointer being passed to kfree(). The pointer was incremented in the write loop and then passed to kfree(). The fix is to use align_buf to save the original address. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 253c8b75546c5f21d5321d691df92c1e84d9b0fb Author: Michael Chan Date: Mon Jan 8 19:56:01 2007 -0800 [BNX2]: Fix 5709 Serdes detection. 5709 has a new register to detect copper/fiber PHYs. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 261dd5ca05c6f36c9216f2d60b018f59f92620c4 Author: Michael Chan Date: Mon Jan 8 19:55:46 2007 -0800 [BNX2]: Don't apply CRC PHY workaround to 5709. The workaround is only needed on 5706/5708 and cannot be applied on 5709. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2a2f11c227bdf292b3a2900ad04139d301b56ac4 Author: Paul Moore Date: Fri Jan 5 15:08:22 2007 -0500 NetLabel: correct CIPSO tag handling when adding new DOI definitions The current netlbl_cipsov4_add_common() function has two problems which are fixed with this patch. The first is an off-by-one bug where it is possibile to overflow the doi_def->tags[] array. The second is a bug where the same doi_def->tags[] array was not always fully initialized, which caused sporadic failures. Signed-off-by: Paul Moore Signed-off-by: James Morris commit 797951200679f1d5ea12a2e58cc7bdbc2848764c Author: Paul Moore Date: Fri Jan 5 15:08:21 2007 -0500 NetLabel: correct locking in selinux_netlbl_socket_setsid() The spinlock protecting the update of the "sksec->nlbl_state" variable is not currently softirq safe which can lead to problems. This patch fixes this by changing the spin_{un}lock() functions into spin_{un}lock_bh() functions. Signed-off-by: Paul Moore Signed-off-by: James Morris commit 86112ffdccab3ee75bc9d9dfae6745df73189e37 Author: Marcel Holtmann Date: Mon Jan 8 02:16:53 2007 +0100 [Bluetooth] Correct SCO buffer for Broadcom based Dell laptops The SCO buffer size values on Dell laptops with a Bluetooth chip from Broadcom are wrong. The USB Bluetooth driver has to set a quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann commit da942704c10129ecd0337a48ed4a0b0db59936b9 Author: Marcel Holtmann Date: Mon Jan 8 02:16:50 2007 +0100 [Bluetooth] Correct SCO buffer for Broadcom based HP laptops The SCO buffer size values on HP laptops with a Bluetooth chip from Broadcom are wrong. The USB Bluetooth driver has to set a quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann commit 5939be43a5718dadda2810b011c786c3e2c581ce Author: Marcel Holtmann Date: Mon Jan 8 02:16:46 2007 +0100 [Bluetooth] Correct SCO buffer size for another ThinkPad laptop The ThinkPad R60E uses a Broadcom based Bluetooth chip and even this version needs the quirk to correct the SCO buffer size values. Signed-off-by: Marcel Holtmann commit c893779e9fbe78575cbd04596f1fcafdb48e8f3f Author: Marcel Holtmann Date: Mon Jan 8 02:16:38 2007 +0100 [Bluetooth] Handle device registration failures In the case the device registration for a new Bluetooth low-level connection fails there is no need to unregister it when the temporary data structure has been removed. Signed-off-by: Marcel Holtmann commit 4d6a2188bd456969f52c03edf1988de90f08d9f5 Author: Marcel Holtmann Date: Mon Jan 8 02:16:31 2007 +0100 [Bluetooth] Fix uninitialized return value for RFCOMM sendmsg() When calling send() with a zero length parameter on a RFCOMM socket it returns a positive value. In this rare case the variable err is used uninitialized and unfortunately its value is returned. Signed-off-by: Marcel Holtmann commit b6e557fbf1dbba8cfa667a25503e5dbd0e9330b7 Author: Marcel Holtmann Date: Mon Jan 8 02:16:27 2007 +0100 [Bluetooth] More checks if DLC is still attached to the TTY If the DLC device is no longer attached to the TTY device, then return errors or default values for various callbacks of the TTY layer. Signed-off-by: Marcel Holtmann commit f4777569204cb59f2f04fbe9ef4e9a6918209104 Author: Marcel Holtmann Date: Mon Jan 8 02:16:23 2007 +0100 [Bluetooth] Add packet size checks for CAPI messages With malformed packets it might be possible to overwrite internal CMTP and CAPI data structures. This patch adds additional length checks to prevent these kinds of remote attacks. Signed-off-by: Marcel Holtmann commit d2e7543c41755f4ec75385536b109d5f084fe734 Author: Andrew Hendry Date: Thu Jan 4 17:00:56 2007 -0800 [X25]: Trivial, SOCK_DEBUG's in x25_facilities missing newlines Trivial. Newlines missing on the SOCK_DEBUG's for X.25 facility negotiation. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit cbbd7d4f36a61631f8c0d73be43df985d1e7d6a6 Author: Paul Moore Date: Thu Jan 4 16:56:46 2007 -0800 [INET]: Fix incorrect "inet_sock->is_icsk" assignment. The inet_create() and inet6_create() functions incorrectly set the inet_sock->is_icsk field. Both functions assume that the is_icsk field is large enough to hold at least a INET_PROTOSW_ICSK value when it is actually only a single bit. This patch corrects the assignment by doing a boolean comparison whose result will safely fit into a single bit field. Signed-off-by: Paul Moore Signed-off-by: David S. Miller commit 2a2a5dddece676acbe3775e5ca9961f325717022 Author: Takashi Iwai Date: Mon Jan 8 17:42:22 2007 +0100 [ALSA] usbaudio - Fix kobject_add() error at reconnection Fixed the error from kobject_add() at reconnection the usb audio device. This happens when an app keeps opening a device while the device is replugged, due to the confliction of the internal bookkept index and the really empty slot. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7fbe3ca571e4b0795b729658e3d76824be54cb18 Author: Mariusz Kozlowski Date: Mon Jan 8 11:25:30 2007 +0100 [ALSA] usb: usbmixer error path fix Without the patch below namelist[0] will not be freed in case of kmalloc error. Signed-off-by: Mariusz Kozlowski Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8c670714223d58086695d007b76b3e3ead54e4f5 Author: Timofei V. Bondarenko Date: Wed Dec 20 19:20:07 2006 +0100 [ALSA] _snd_cmipci_uswitch_put doesn't set zero flags Playing with spdif output on cmipci i've noticed the SPDO5V option does not change appropriate bits the register. The _snd_cmipci_uswitch_put checks the change in flags in wrong way. If 'active' state of an option corresponds to a _zero_ bits in a hw register then function fails. The SPDO5V is the sample. In the most cases 'active' state of option is set through an non-zerio bits in a register. This case works fine. The fix attached. Unfortunately i was unable to change spdif output voltage anyway. Although the register changes right at least. From: Timofei V. Bondarenko Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 6afeb11de5b28e47adea1459c35e598bb98424d6 Author: Takashi Iwai Date: Mon Dec 18 16:16:04 2006 +0100 [ALSA] hda-codec - Fix NULL dereference in generic hda code Fix NULL dereference in hda_generic.c. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f9cc8a8b1887e6e2bb430405d0a4f9b5fb39fa5d Author: Jason Gaston Date: Wed Nov 22 11:53:52 2006 +0100 [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH9 This patch adds the Intel ICH9 HD Audio controller DID's for ALSA. Signed-off-by: Jason Gaston Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 987411b7d899fd9b838d4ce32b45be0741c4ee22 Author: Clemens Ladisch Date: Mon Nov 20 14:14:39 2006 +0100 [ALSA] usb-audio: work around wrong frequency in CM6501 descriptors The C-Media CM6501 chip's descriptors say that altsetting 5 supports 48 kHz, but it actually plays at 96 kHz. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 5929546a96d55962bdcabae0c4e25dfcd9f1fda9 Author: Giuliano Pochini Date: Mon Nov 6 11:42:00 2006 +0100 [ALSA] Fix potential NULL pointer dereference in echoaudio midi Fix races between the timer handler and the close function. Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 5b005a0126bc2a2be3ae2c333d56e91bd5e2d8a6 Author: Peer Chen Date: Tue Oct 31 15:33:42 2006 +0100 [ALSA] Audio: Add nvidia HD Audio controllers of MCP67 support to hda_intel.c Add the support for HD audio controllers of MCP51,MCP55,MCP61,MCP65 & MCP67. Signed-off-by: Peer Chen Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 77aab8bf22042d1658d4adbca8b71779e7f2d0ff Author: Komuro Date: Sun Dec 17 19:23:17 2006 +0900 pcnet_cs : add new id pcnet_cs: add new id. corega K.K. (CG-LAPCCTXD) Logitec LPM-LN10TE Signed-off-by: Komuro Signed-off-by: Jeff Garzik commit ab3b1c7e82fe6094a07baa5d2cb0138c4cb40fcb Author: Stephen Hemminger Date: Mon Jan 8 11:24:26 2007 -0800 chelsio: error path fix Fix handling of allocation failure. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 45d2530167027e96686a1b6a7892c55af1f516f5 Author: Frank Pavlic Date: Mon Jan 8 17:30:33 2007 +0100 s390: iucv Kconfig help description changes [PATCH 4/5] s390: iucv Kconfig help description changes From: Ursula Braun remove text from help description which does not apply anymore for 2.6 kernel series. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit ee2db684b4b92d138ee3b7326e69f4297cf4beca Author: Frank Blaschka Date: Mon Jan 8 17:30:11 2007 +0100 s390: qeth driver fixes: atomic context fixups - qeth device functions were not callable in atomic context due to usage of wait_event_xxx operations in qeth. "schedule while atomic" message appeared and kernel dumped when removing slave from bond device. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 2d36c16eb032239cb038ad875ecf83c545002461 Author: Frank Blaschka Date: Mon Jan 8 17:29:58 2007 +0100 s390: qeth driver fixes: packet socket - packet socket support is not complete. Recvfrom a packet socket does not fill the sockaddr_ll structure. device function hard_header_parse is not implemented. For layer 2 mode and layer 3 mode with fake_ll turned on, we have the information to fill sockaddr_ll. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 95c78c8bfe8d0b49a43f392b9a74e2f9e89765ab Author: Frank Blaschka Date: Mon Jan 8 17:29:34 2007 +0100 s390: qeth driver fixes: VLAN hdr, perf stats From: Ursula Braun - VLAN header reordering did not work on packets received through qeth interface in layer 2 mode. This caused dhcpcd not to work with VLAN devices. - set qeth performance statistics initally inactive Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit f35723ec48ca60f2f3493ea40d63a9bc5b585c28 Author: Ayaz Abdulla Date: Thu Feb 20 03:03:54 2003 -0500 forcedeth: sideband management fix This patch contains a fix that implements proper communication with the sideband management unit. Also, it makes sure that the speed is correctly set for gigabit phys in the case where sideband mgmt unit initialized the phy. Refer to bug #7684 for more details. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit dc40127ca5c6e1da48d2b5f9d0c65b5795faac12 Author: Anton Blanchard Date: Tue Jan 9 02:43:02 2007 +1100 [POWERPC] Fix bugs in the hypervisor call stats code There were a few issues with the HCALL_STATS code: - PURR cpu feature checks were backwards - We iterated one entry off the end of the hcall_stats array - Remove dead update_hcall_stats() function prototype I noticed one thing while debugging, and that is we call H_ENTER (to set up the MMU hashtable in early init) before we have done the cpu fixups. This means we will execute the PURR SPR reads even on a CPU that isnt capable of it. I wonder if we can move the CPU feature fixups earlier. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit ab87e8dc88a7cae341c403547cea6b022f5ac023 Author: Anton Blanchard Date: Tue Jan 9 02:37:16 2007 +1100 [POWERPC] Fix corruption in hcall9 It looks to me like we are corrupting r12 in the hcall9 function. Although we have r0 free we cant use offsets against it, so save away r12 in there instead. r12 holds the ninth return value from the hypervisor call, so without this fix, the caller will see the wrong value for the ninth element in the array that gets the return values. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit e75b171768b8b98ec5fd57acb3e87a30c97c9472 Author: Stephen Rothwell Date: Thu Jan 4 17:06:21 2007 +1100 [POWERPC] iSeries: fix setup initcall Clearing the progress indicator should only be done if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit e9966ff85013be0ef56d3c76f3b4d5c02488d964 Author: Stephen Rothwell Date: Thu Jan 4 17:05:13 2007 +1100 [POWERPC] iSeries: fix viopath initialisation /proc/iSeries/config should only be created if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 13d2c9bbb09e37e8a231a36b279a97861d6d5407 Author: Stephen Rothwell Date: Thu Jan 4 17:04:21 2007 +1100 [POWERPC] iSeries: fix lpevents initialisation /proc/iSeries/lpevents should only be created if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 8404e654300cb807428b839d5ae56fd45b5acb92 Author: Stephen Rothwell Date: Thu Jan 4 17:03:16 2007 +1100 [POWERPC] iSeries: fix proc/iSeries initialisation These proc files should only be created if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit d9523aa157e9fbb93467dcd0d1bed9604153bf7f Author: Stephen Rothwell Date: Thu Jan 4 17:01:51 2007 +1100 [POWERPC] iSeries: fix mf proc initialisation This proc file should only be created if we are running on legacy iSeries. Since we can now run the same kernel on legacy iSeries and other machines, we currently get the /proc/iSeries directory and the files in it on non-iSeries machines, and accessing them causes an oops in some cases. This and the following patches make sure that these files are not created on non-iSeries machines, thus avoiding the oops. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 7232846b8d682a56407839e3774d03be0c7806c8 Author: Olaf Hering Date: Wed Jan 3 18:33:56 2007 +0100 [POWERPC] disable PReP and EFIKA during make oldconfig New boards should not be enabled per default. Disable EFIKA and PReP per default. Anyone who really needes the new code can enable it during make oldconfig. Signed-off-by: Olaf Hering Acked-by: Grant Likely Signed-off-by: Paul Mackerras commit c98750c2eb07b0bf49db0630cb5017ede005ce14 Author: Grant Likely Date: Tue Jan 2 15:45:37 2007 -0700 [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again The mpc52xx_uart_of_enumerate() function was added when adding 52xx support to arch/powerpc, but it must not be called for arch/ppc. Signed-off-by: Grant Likely Signed-off-by: Paul Mackerras commit 9b3a6f4ab98809c93ac57fa5e11dff0575046efc Author: Grant Likely Date: Tue Jan 2 15:45:29 2007 -0700 [POWERPC] Don't include powerpc/sysdev/rom.o for arch/ppc builds sysdev/rom.c is for arch/powerpc only. Don't compile it when building an arch/ppc kernel. Signed-off-by: Grant Likely Acked-by: Sylvain Munaut Signed-off-by: Paul Mackerras commit a5b6ad6691763ee5eba46665d014d5abfe433df2 Author: Grant Likely Date: Tue Jan 2 15:44:44 2007 -0700 [POWERPC] Fix mpc52xx fdt to use correct device_type for sound devices This corrects the documented interface for mpc52xx device trees. Sound devices should be using 'sound' for the device_type field, not the type of sound interface. Signed-off-by: Grant Likely Acked-by: Sylvain Munaut Signed-off-by: Paul Mackerras commit 5c334eed6ecd66cebfbc80267149e755510d8bc8 Author: Sylvain Munaut Date: Tue Jan 2 23:29:53 2007 +0100 [POWERPC] 52xx: Don't use device_initcall to probe of_platform_bus Using device_initcall makes it happen for every platform that compiles this file in. This is really bad, for obvious reasons. Instead, we use the .init field of the machine description. If the platform needs the hook to do something specific it can provides its own function and call mpc52xx_declare_of_platform_devices from there. If not, the mpc52xx_declare_of_platform_devices function can directly be used as the init hook. Signed-off-by: Sylvain Munaut Acked-by: Grant Likely Signed-off-by: Paul Mackerras commit 56c336cb05d58991f3e9d5f0ec098ba0f219a15e Author: Stephen Rothwell Date: Tue Jan 2 16:13:50 2007 +1100 [POWERPC] Add legacy iSeries to ppc64_defconfig Since we can now boot legacy iSeries and other machines with the same config, enable legacy iSeries in ppc64_defconfig. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 338e997d94840baca115fb35dcf82867b1f3dc32 Author: Stephen Rothwell Date: Tue Jan 2 16:11:09 2007 +1100 [POWERPC] Update ppc64_defconfig Enabled new netfilter stuff corresponding to what was enabled before under different names, and turned on the gxt4500 video driver; otherwise just took the defaults. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 007d88d042d7b71aa2c9fc615aef97888e20ddf3 Author: David Woodhouse Date: Mon Jan 1 18:45:34 2007 +0000 [POWERPC] Fix manual assembly WARN_ON() in enter_rtas(). When we switched over to the generic BUG mechanism we forgot to change the assembly code which open-codes a WARN_ON() in enter_rtas(), so the bug table got corrupted. This patch provides an EMIT_BUG_ENTRY macro for use in assembly code, and uses it in entry_64.S. Tested with CONFIG_DEBUG_BUGVERBOSE on ppc64 but not without -- I tried to turn it off but it wouldn't go away; I suspect Aunt Tillie probably needed it. This version gets __FILE__ and __LINE__ right in the assembly version -- rather than saying include/asm-powerpc/bug.h line 21 every time which is a little suboptimal. Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit 673aeb76d07f49f2b07792f813bc2a9fee212ab7 Author: Michal Ostrowski Date: Wed Dec 20 07:29:40 2006 -0600 [POWERPC] Avoid calling get_irq_server() with a real, not virtual irq. We can use default_server when masking an interrupt vector. get_irq_server() assumes a virtual irq, so badness may happen if we give it a real one. Signed-off-by: Michal Ostrowski Signed-off-by: Paul Mackerras commit 5e264a5215e4b703b1bbeb2910ea4441886be8d7 Author: Nathan Lynch Date: Tue Jan 2 16:37:06 2007 -0600 [POWERPC] Fix unbalanced uses of of_node_put The (maple|pasemi)_init_IRQ functions call of_node_put(root) once more than they should, causing the refcount of the root node to underflow, which triggers the WARN_ON in kref_get. Signed-off-by: Nathan Lynch Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 6aa3e1e9447134ccda8b04b91c4ba8182274a78e Author: David Gibson Date: Fri Dec 22 09:23:03 2006 +1100 [POWERPC] Fix bogus BUG_ON() in in hugetlb_get_unmapped_area() The powerpc specific version of hugetlb_get_unmapped_area() makes some unwarranted assumptions about what checks have been made to its parameters by its callers. This will lead to a BUG_ON() if a 32-bit process attempts to make a hugepage mapping which extends above TASK_SIZE (4GB). I'm not sure if these assumptions came about because they were valid with earlier versions of the get_unmapped_area() path, or if it was always broken. Nonetheless this patch fixes the logic, and removes the crash. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit fea5f1e19611d94fbf3905875a427c4cb959cd06 Author: Linus Torvalds Date: Mon Jan 8 15:04:46 2007 -0800 Revert "[PATCH] x86-64: Try multiple timer variants in check_timer" This reverts commit b026872601976f666bae77b609dc490d1834bf77, which has been linked to several problem reports with IO-APIC and the timer. Machines either don't boot because the timer doesn't happen, or we get double timer interrupts because we end up double-routing the timer irq through multiple interfaces. See for example http://lkml.org/lkml/2006/12/16/101 http://lkml.org/lkml/2007/1/3/9 http://bugzilla.kernel.org/show_bug.cgi?id=7789 about some of the discussion. Patches to fix this cleanup exist (and have been confirmed to work fine at least for some of the affected cases) and we'll revisit it for 2.6.21, but this late in the -rc series we're better off just reverting the incomplete commit that caused the problems. Suggested-by: Adrian Bunk Cc: Eric W. Biederman Cc: Yinghai Lu Cc: Andrew Morton Cc: Andi Kleen Signed-off-by: Linus Torvalds commit 0efc61eaee5471acd7399c8536feff280b4966dd Author: Venkat Yekkirala Date: Tue Dec 12 13:02:41 2006 -0600 selinux: Delete mls_copy_context This deletes mls_copy_context() in favor of mls_context_cpy() and replaces mls_scopy_context() with mls_context_cpy_low(). Signed-off-by: Venkat Yekkirala Acked-by: Stephen Smalley Signed-off-by: James Morris commit 2dbda7dceca81adfe57c8884be5c66e70822d89a Author: Vitaly Wool Date: Thu Dec 28 17:14:05 2006 +0300 [MIPS] PNX8550: Fix system timer support the patch inlined below restores proper time accounting for PNX8550-based boards. It also gets rid of #ifdef in the generic code which becomes unnecessary then. It's functionally identical to the previous patch with the same name but it has minor comments from Atsushi and Sergei taken into account. Signed-off-by: Vitaly Wool Signed-off-by: Ralf Baechle commit 33b06b513e804ae64ebd5105fb703ec90bd7e173 Author: Atsushi Nemoto Date: Mon Dec 18 00:38:21 2006 +0900 [MIPS] TX49: Fix use of CDEX build_store_reg() The commit a923660d786a53e78834b19062f7af2535f7f8ad accidently prevents TX49 from using CDEX. Use build_dst_pref() only if prefetch for store was really available. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d98f92371461c5c8cc24e12a212c59b3f437b581 Author: Davy Chan Date: Fri Jan 5 13:56:46 2007 +0800 [MIPS] pnx8550: Fix write_config_byte() PCI config space accessor There's a serious typo in the function: arch/mips/pci/ops-pnx8550.c:write_config_byte() The parameter passed to the function config_access() is PCI_CMD_CONFIG_READ instead of PCI_CMD_CONFIG_WRITE. This renders any attempts to write a single byte to the PCI configuration registers useless. This problem does not exist for write_config_word() nor write_config_dword(). This problem has been there since kernel v2.6.17 and is still there as of kernel v2.6.19.1. Signed-off-by: Ralf Baechle commit f75f369fd783d194cb45632617561ca4d7045849 Author: Atsushi Nemoto Date: Mon Jan 8 01:27:40 2007 +0900 [MIPS] Fix build errors on SEAD Quick and dirty fix for build errors on SEAD. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f9bba75e378776ee4e97adc0555db16695d341e1 Author: Atsushi Nemoto Date: Mon Jan 8 00:50:34 2007 +0900 [MIPS] SMTC build fix Pass "irq" to __DO_IRQ_SMTC_HOOK() macro. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f860c90bd6ce22c6a0a352cc16acc74fba3d628e Author: Atsushi Nemoto Date: Wed Dec 13 01:22:06 2006 +0900 [MIPS] csum_partial and copy in parallel Implement optimized asm version of csum_partial_copy_nocheck, csum_partial_copy_from_user and csum_and_copy_to_user which can do calculate and copy in parallel, based on memcpy.S. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 61e84f99877fa8caaf1be86d51d825406e8d8bc1 Author: Ralf Baechle Date: Tue Dec 12 11:52:34 2006 +0000 [MIPS] Malta: Add missing MTD file. Signed-off-by: Ralf Baechle commit e97126cd9056b3b42cdc862ace2ed66f8026f55b Author: Russell King Date: Mon Jan 8 19:49:12 2007 +0000 [ARM] Provide basic printk_clock() implementation Current sched_clock() implementations on ARM cause unbootable kernels with PRINTK_TIME support enabled. To avoid this, provide a basic printk_clock() implementation which avoids sched_clock() being called before the page tables have been set up. Signed-off-by: Russell King commit 6020dff09252e3670a89edb36baaa4afb9b10d15 Author: Russell King Date: Sat Dec 30 23:17:40 2006 +0000 [ARM] Resolve fuse and direct-IO failures due to missing cache flushes fuse does not work on ARM due to cache incoherency issues - fuse wants to use get_user_pages() to copy data from the current process into kernel space. However, since this accesses userspace via the kernel mapping, the kernel mapping can be out of date wrt data written to userspace. This can lead to unpredictable behaviour (in the case of fuse) or data corruption for direct-IO. This resolves debian bug #402876 Signed-off-by: Russell King commit a6f36be32622730710b2fadacb6e2649defa4371 Author: Russell King Date: Sat Dec 30 22:24:19 2006 +0000 [ARM] pass vma for flush_anon_page() Since get_user_pages() may be used with processes other than the current process and calls flush_anon_page(), flush_anon_page() has to cope in some way with non-current processes. It may not be appropriate, or even desirable to flush a region of virtual memory cache in the current process when that is different to the process that we want the flush to occur for. Therefore, pass the vma into flush_anon_page() so that the architecture can work out whether the 'vmaddr' is for the current process or not. Signed-off-by: Russell King commit e47c222b22cd53c317a5573e1dc5f9e0cbd46380 Author: Russell King Date: Mon Jan 8 16:42:51 2007 +0000 [ARM] Fix potential MMCI bug The MMCI driver might end up aborting the initial command and leaving the data part of the command sequence still in place. Avoid this problem by ensuring that any data sequence is properly cleared out when a command completes. Signed-off-by: Russell King commit 4d503ecc86a14b86ab7bcdfa8b755994143eba19 Author: Jiri Kosina Date: Mon Jan 8 13:42:43 2007 +0100 HID: mousepoll parameter makes no sense for generic HID mousepoll parameter makes no sense for generic HID code. It belongs to (and is implemented by) usbhid. This is also where all users are expecting it. Signed-off-by: Jiri Kosina commit d6509c36ba333282362e5f9769869f8a8d790aaf Author: Ahmed S. Darwish Date: Sat Jan 6 15:18:52 2007 +0200 HID: tiny patch to remove a kmalloc cast Remove unnecessary cast. Signed-off-by: Ahmed Darwish Signed-off-by: Jiri Kosina commit 35068976916fdef82d6e69ef1f8c9a1c47732759 Author: Adrian Drzewiecki Date: Sat Jan 6 12:37:26 2007 +0100 HID: fix mappings for DiNovo Edge Keyboard - Logitech USB BT receiver This patch fixes mappings for the Logitech USB BT receiver that ships along with Logitech's DiNovo Edge keyboard. Without these changes, the "touchwheel" does not work as intended (a mouse) Signed-off-by: Adrian Drzewiecki Acked-by: Vojtech Pavlik Signed-off-by: Jiri Kosina commit eac681b3aec226c83f52d307254d88393aab5eb9 Author: =?utf-8?q?Michel_D=C3=A4nzer?= Date: Mon Jan 8 20:38:34 2007 +1100 i915: Fix a DRM_ERROR that should be DRM_DEBUG. It would clutter up the kernel output in a situation which is legitimate before X.org 7.2 and handled correctly by the 3D driver. Signed-off-by: Dave Airlie commit 98714cb161b4b1a5d0c5bd0337a8578196b73677 Author: Jack Morgenstein Date: Mon Dec 25 09:24:52 2006 +0200 IB/mthca: Fix PRM compliance problem in atomic-send completions According to the Tavor and Arbel programmer's reference manuals, the number of bytes transferred is not provided in the byte_cnt field of the CQ entry for atomic operation completions. For atomic operations, the number of bytes transferred is always 8 (when the status is "success"), and this constant value should always be used by the driver in the ib_wc entry returned, rather than using the CQE. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 0cefcf0bbc2d252eb48bff3289fb59c3817dd405 Author: Sean Hefty Date: Fri Jan 5 12:35:15 2007 -0800 RDMA/ucma: Don't report events with invalid user context There's a problem with how rdma cm events are reported to userspace that can lead to application crashes. When a new connection request arrives, a context for the connection is allocated in the kernel. The connection event is then reported to userspace. The userspace library retrieves the event and allocates its own context for the connection. The userspace context is associated with the kernel's context when accepting. This allows the kernel to give userspace context with other events. A problem occurs if a second event for the same connection occurs before the user has had a chance to call accept. The userspace context has not yet been set, which causes the librdmacm to crash. (This has been seen when the app takes too long to call accept, resulting in the remote side timing out and rejecting the connection) Fix this by ignoring events for new connections until userspace has set their context. This can only happen if an error occurs on a new connection before the user accepts it. This is okay, since the accept will just fail later. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 30a5ec982e4cfa955f93c454debaefc4d61d2da6 Author: Sean Hefty Date: Thu Dec 14 11:22:19 2006 -0800 RDMA/ucma: Fix struct ucma_event leak when backlog is full We discard new connection requests while the listen backlog is full, but leak a struct ucma_event in the process. Free the structure in this case. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 881a045fc5b454b57c69e010acecd5830d87e242 Author: Steve Wise Date: Fri Dec 15 16:50:17 2006 -0600 RDMA/iwcm: iWARP connection timeouts shouldn't be reported as rejects The iWARP CM should report timeouts as event RDMA_CM_EVENT_UNREACHABLE, not event RDMA_CM_EVENT_REJECTED. Signed-off-by: Steve Wise Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit e6331173c8703602d264b3388b515d00f72fc4ae Author: Jeff Garzik Date: Sun Jan 7 22:57:38 2007 -0500 Revert "[PATCH] e1000: disable TSO on the 82544 with slab debugging" This reverts commit 72f3ab7462f4e153d1e8ac78e379716ad71d6923, which was superceded by commit 683a2aa339f607c8a422835161ceab68b2a5a18a ("e1000: Do not truncate TSO TCP header with 82544 workaround"), which fixed the real problem. Signed-off-by: Jeff Garzik commit 3a6b95c81c522d9dbd36b33d33b08e66c87a6088 Author: Heiko Carstens Date: Thu Dec 28 13:05:36 2006 +0100 qeth: fix uaccess handling and get rid of unused variable [patch] qeth: fix uaccess handling and get rid of unused variable drivers/s390/net/qeth_main.c: In function `qeth_process_inbound_buffer': drivers/s390/net/qeth_main.c:2563: warning: unused variable `vlan_addr' include/asm/uaccess.h: In function `qeth_do_ioctl': drivers/s390/net/qeth_main.c:4847: warning: ignoring return value of `copy_to_user' drivers/s390/net/qeth_main.c:4849: warning: ignoring return value of `copy_to_user' drivers/s390/net/qeth_main.c:4996: warning: ignoring return value of `copy_to_user' Cc: Frank Pavlic Signed-off-by: Heiko Carstens Signed-off-by: Jeff Garzik commit 80b02e595c308a5deb2ad49bd6aa3ab1da9cdbdb Author: Ron Mercer Date: Wed Jan 3 16:26:07 2007 -0800 qla3xxx: Add delay to NVRAM register access. When accessing the 93LC86 serial prom the clock high and low times must be at least 250ns each. We have seen on some systems where the access times were much lower casing bit errors. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit ca16497a75d0e658858b6a8601f8c60250e73833 Author: Ron Mercer Date: Wed Jan 3 16:26:06 2007 -0800 qla3xxx: Remove NETIF_F_LLTX from driver features. Driver TX locking was removed some time ago, but the flag was overlooked. Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit f0938401f2252bf39615c0815734650eab9053c8 Author: Erez Zilber Date: Sun Jan 7 12:28:02 2007 +0200 IB/iser: Return error code when PDUs may not be sent iSER limits the number of outstanding PDUs to send. When this threshold is reached, it should return an error code (-ENOBUFS) instead of setting the suspend_tx bit (which should be used only by libiscsi). Signed-off-by: Erez Zilber Signed-off-by: Roland Dreier commit bf81b46482c0fa8ea638e409d39768ea92a6b0f0 Author: Linus Torvalds Date: Sat Jan 6 21:45:51 2007 -0800 Linux 2.6.20-rc4 commit db6ccbb61c1291c8aaefadcc8304444f27eeb88d Author: Russell King Date: Sat Jan 6 22:53:48 2007 +0000 [ARM] Fix kernel-mode undefined instruction aborts If the kernel attempts to execute a CP1 or CP2 instruction and it aborts, and a FP emulator is not loaded, we try to return as if to a user context, instead of the proper kernel context. Since the fault came from kernel mode, we must use the kernel return paths. Signed-off-by: Russell King commit 90cb28e8f76e57751ffe14abd09c2d53a6aea7c8 Author: Linus Torvalds Date: Sat Jan 6 13:28:21 2007 -0800 Revert "[PATCH] binfmt_elf: randomize PIE binaries (2nd try)" This reverts commit 59287c0913cc9a6c75712a775f6c1c1ef418ef3b. Hugh Dickins reports that it causes random failures on x86 with SuSE 10.2, and points out "Isn't that randomization, anywhere from 0x10000 to ELF_ET_DYN_BASE, sure to place the ET_DYN from time to time just where the comment says it's trying to avoid? I assume that somehow results in the error reported." (where the comment in question is the existing comment in the source code about mmap/brk clashes). Suggested-by: Hugh Dickins Acked-by: Marcus Meissner Cc: Andrew Morton Cc: Andi Kleen Cc: Ingo Molnar Cc: Dave Jones Cc: Arjan van de Ven Signed-off-by: Linus Torvalds commit a3ffab87588234e41248d8cebd8cec88db605d3c Author: Aaron Salter Date: Sat Jan 6 09:51:41 2007 -0800 ixgb: Write RA register high word first, increment version We need to disable the AV bit before flushing the low register. Signed-off-by: Signed-off-by: Auke Kok commit dfd341e4e467d146901a3accb761f04fda535433 Author: Jesse Brandeburg Date: Sat Jan 6 09:51:38 2007 -0800 ixgb: Maybe stop TX if not enough free descriptors A similar patch to commit 65c7973fa5b46b024f38be208aa477e8daf9a603 but now for ixgb. Cc: Herbert Xu Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 5d9278537502d2e404e85485d1b905814fe728c0 Author: Jesse Brandeburg Date: Sat Jan 6 09:51:23 2007 -0800 ixgb: Fix early TSO completion This fix was already merged in commit 96f9c2e277768099479fbed7c3b69c294b1fadef but reverted in commit 989316ddfeafd0e8fb51a4d811383769ad62637a. After stresstesting we found that the fix does not add new regressions and works around a TX hang spotted by several users. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 3ef49a3b45c33b055002402f01e5da98cb773086 Author: Jes Sorensen Date: Fri Jan 5 12:05:37 2007 -0500 [SCSI] qla1280: set residual correctly Jeremy caught a bug in the qla1280 driver where it didn't set the residual value correctly. Signed-off-by: Jeremy Higdon Signed-off-by: Jes Sorensen Signed-off-by: James Bottomley commit d0a6b08ae08c2ab292f756bdae0e8b1242696d7f Author: Eric Moore Date: Thu Jan 4 20:49:03 2007 -0700 [SCSI] fusion: bump version bump version Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 9f4203b357d46a66c042df3dedf277ccaa5e2b1d Author: Eric Moore Date: Thu Jan 4 20:47:47 2007 -0700 [SCSI] fusion: MODULE_VERSION support * Add modinfo driver version support. * Change copyright year to 2007. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit f99be43b3024f2dd054f2addd54a318eabee2018 Author: Eric Moore Date: Thu Jan 4 20:46:54 2007 -0700 [SCSI] fusion: power pc and miscellaneous bug fixs * Endian fix's for warnings found in ppc environment. * Fix compile time warning when calling scsi_device_reprobe, where in newer kernels this API expects its return value to be examined. * Fix compile errors when debug messages are enabled. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 86dd424266530cda55258b2b33d04c23a88b9a9c Author: Eric Moore Date: Thu Jan 4 20:44:01 2007 -0700 [SCSI] fusion: fibre channel: return DID_ERROR for MPI_IOCSTATUS_SCSI_IOC_TERMINATED A repost of a patch forwarded by Mikael Reed from 2006-12-20. The fibre channel IOC may kill a request for a variety of reasons, some of which may be recovered by a retry, some of which are unlikely to be recovered. Return DID_ERROR instead of DID_RESET to permit retry of the command, just not an infinite number of them. Signed-off-by: Michael Reed Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 3d6d174a0888fe082e87ce1d4a0f1a85044a4515 Author: Sumant Patro Date: Fri Dec 29 08:13:54 2006 -0800 [SCSI] megaraid_sas: Update module author Update domain name change from lsil.com to lsi.com. Change module author to megaraidlinux@lsi.com Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit 4fe48187da5a0229be3951761b66cd426430a52b Author: adam radford Date: Thu Jan 4 18:16:56 2007 -0800 [SCSI] 3ware 8000 serialize reset code The attached patch updates the 3ware 8000 driver: - Free irq handler in __tw_shutdown(). - Turn on RCD bit for caching mode page. - Serialize reset code. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 6397256b0af52082db3b7f804aa3b612a17dcbc9 Author: Tejun Heo Date: Tue Jan 2 17:41:04 2007 +0900 [SCSI] sr: fix error code check in sr_block_ioctl() sr_block_ioctl() should proceed to SCSI ioctls if cdrom_ioctl() returns -ENOSYS. However it tested for ENOSYS instead of -ENOSYS rendering all SCSI ioctls other than GET_IDLUN and GET_BUS_NUMBER inaccessible. Fix it. Signed-off-by: Tejun Heo Signed-off-by: James Bottomley commit a96e0c7798057dd8055d0263c076fed975c10237 Author: Mariusz Kozlowski Date: Tue Jan 2 01:07:32 2007 +0100 [SCSI] scsi: lpfc error path fix Add kmalloc failure check and fix the loop on error path. Without the patch pool element at index [0] will not be freed. Signed-off-by: Mariusz Kozlowski Acked-by: James Smart Signed-off-by: James Bottomley commit 8e9d58e723e29e8b04c09bd9badd81c1d8232f5f Author: Salyzyn, Mark Date: Mon Dec 18 15:01:41 2006 -0500 [SCSI] aacraid: Product List Update Update drivers/scsi/aacraid/linit.c and Documentation/scsi/aacraid.txt file with the current list of adapters supported by the aacraid driver. Deprecated a few adapters that never shipped, corrected a few and added new adapters that matched the family code support. No functional changes to the driver. No side effects. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit 9b80cb4be1f4181875e0cf274dc59f42964fdf1b Author: Mike Christie Date: Sun Dec 17 12:10:28 2006 -0600 [SCSI] libiscsi: fix senselen calculation Yanling Qi, noted that when the sense data length of a check-condition is greater than 0x7f (127), senselen = (data[0] << 8) | data[1] will become negative. It causes different kinds of panics from GPF, spin_lock deadlock to spin_lock recursion. We were also swapping this value on big endien machines. This patch fixes both issues by using be16_to_cpu(). Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 94cb3f822bb806a750e1e1c8457bee6e96671569 Author: FUJITA Tomonori Date: Sun Dec 17 12:10:27 2006 -0600 [SCSI] iscsi: simplify IPv6 and IPv4 address printing Signed-off-by: FUJITA Tomonori Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 09492605aa3e17ce19572b9e925ecf66e4da55dd Author: Meelis Roos Date: Sun Dec 17 12:10:26 2006 -0600 [SCSI] iscsi: newline in printk This patch cures two run together printk messages in iSCSI driver. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 59c17ec1690fd76ce6ae586daac29b04601be3e0 Author: Akinobu Mita Date: Sun Dec 17 12:10:25 2006 -0600 [SCSI] iscsi: fix crypto_alloc_hash() error check The return value of crypto_alloc_hash() should be checked by IS_ERR(). Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit c959e1c2a475e0ad0d24eff200de9b6dcb3710c6 Author: Arne Redlich Date: Sun Dec 17 12:10:24 2006 -0600 [SCSI] iscsi: fix 2.6.19 data digest calculation bug The transition from crypto_digest_*() to the crypto_hash_*() family introduced a bug into the data digest calculation: crypto_hash_update() is called with the number of S/G elements instead of the S/G lists data size. Signed-off-by: Arne Redlich Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit ddaf6fc85459d161c39a70a2cf9e04343dafe47f Author: James Bottomley Date: Wed Dec 13 10:10:40 2006 -0600 [SCSI] scsi_scan: fix report lun problems with CDROM or RBC devices Apparently no ATAPI CD/DVD actually supports REPORT LUNS (in spite of claiming scsi-3 compliance, where it's mandatory) and worse, some crash or flake out on being sent the command. This may actually be due to a conflict between SPC and MMC with MMC not listing REPORT LUNS as mandatory. The same standards conflict exists for RBC as well. Fix all of this by reversing the blacklists for CDROM and RBC devices (i.e. now they have to have the BLIST_REPORTLUNS2 flag set even if the inquiry data returns scsi-3 compliance). Signed-off-by: James Bottomley commit 4ac941d2d04ef26a91adf677f3a371818596305d Author: Dan Williams Date: Thu Jan 4 02:14:49 2007 +0100 [ARM] 4082/1: iop3xx: fix iop33x gpio register offset iop33x gpio offset is correct in include/asm-arm/arch-iop33x/iop33x.h, but include/asm-arm/hardware/iop3xx.h adds 4. Signed-off-by: Dan Williams Signed-off-by: Russell King commit 9ca3f07b869c1fbbdfdac3150019a3e4d2948d8e Author: Ben Dooks Date: Sun Dec 24 01:36:35 2006 +0100 [ARM] 4070/1: arch/arm/kernel: fix warnings from missing includes Include to fix the warning: arch/arm/kernel/traps.c:647:6: warning: symbol '__readwrite_bug' was not declared. Should it be static? Include to fix the warning: arch/arm/kernel/time.c:42:1: warning: symbol 'rtc_lock' was not declared. Should it be static? Signed-off-by: Ben Dooks Signed-off-by: Russell King commit e2bdb176ffae3fd2c162db897a05fbad044ff9e9 Author: Dan Williams Date: Tue Jan 2 18:32:37 2007 +0100 [ARM] 4079/1: iop: Update MAINTAINERS Signed-off-by: Dan Williams Signed-off-by: Russell King commit af3e095a1fb42bac32355d5d59ce93f8b4e59a3e Author: Erik Jacobson Date: Fri Jan 5 16:37:05 2007 -0800 [PATCH] connector: some fixes for ia64 unaligned access errors On ia64, the various functions that make up cn_proc.c cause kernel unaligned access errors. If you are using these, for example, to get notification about all tasks forking and exiting, you get multiple unaligned access errors per process. Use put_unaligned() in the appropriate palces to fix this. Signed-off-by: Erik Jacobson Cc: Evgeniy Polyakov Cc: "Luck, Tony" Cc: Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76395d37611e8758dd8bd6c6f5bfcb31e1dc48f9 Author: Andrew Morton Date: Fri Jan 5 16:37:05 2007 -0800 [PATCH] shrink_all_memory(): fix lru_pages handling At the end of shrink_all_memory() we forget to recalculate lru_pages: it can be zero. Fix that up, and add a helper function for this operation too. Also, recalculate lru_pages each time around the inner loop to get the balancing correct. Cc: "Rafael J. Wysocki" Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d63b70902befe189ba2672925f28ec3f4db41352 Author: Evgeniy Dushistov Date: Fri Jan 5 16:37:04 2007 -0800 [PATCH] fix garbage instead of zeroes in UFS Looks like this is the problem, which point Al Viro some time ago: ufs's get_block callback allocates 16k of disk at a time, and links that entire 16k into the file's metadata. But because get_block is called for only a single buffer_head (a 2k buffer_head in this case?) we are only able to tell the VFS that this 2k is buffer_new(). So when ufs_getfrag_block() is later called to map some more data in the file, and when that data resides within the remaining 14k of this fragment, ufs_getfrag_block() will incorrectly return a !buffer_new() buffer_head. I don't see _right_ way to do nullification of whole block, if use inode page cache, some pages may be outside of inode limits (inode size), and will be lost; if use blockdev page cache it is possible to zero real data, if later inode page cache will be used. The simpliest way, as can I see usage of block device page cache, but not only mark dirty, but also sync it during "nullification". I use my simple tests collection, which I used for check that create,open,write,read,close works on ufs, and I see that this patch makes ufs code 18% slower then before. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ba3485947ee7bc89a17f86250fe9b692a615dff Author: Hugh Dickins Date: Fri Jan 5 16:37:03 2007 -0800 [PATCH] fix OOM killing of swapoff These days, if you swapoff when there isn't enough memory, OOM killer gives "BUG: scheduling while atomic" and the machine hangs: badness() needs to do its PF_SWAPOFF return after the task_unlock (tasklist_lock is also held here, so p isn't going to be freed: PF_SWAPOFF might get turned off at any moment, but that doesn't really matter). Signed-off-by: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8af57eb76fbd70c7f5b421b065fd55d096e2bff Author: Matthijs van Otterdijk Date: Fri Jan 5 16:37:03 2007 -0800 [PATCH] fix the toshiba_acpi write_lcd return value write_lcd() in toshiba_acpi returns 0 on success since the big ACPI patch merged in 2.6.20-rc2. It should return count. Signed-off-by: Matthijs van Otterdijk Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73b8ed29ab3f6ad7204b4e61cfa87dc0c28d3019 Author: Cyrill V. Gorcunov Date: Fri Jan 5 16:37:02 2007 -0800 [PATCH] qconf: fix SIGSEGV on empty menu items qconf may cause SIGSEGV by trying to show debug information on empty menu items Signed-off-by: Cyrill V. Gorcunov Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2e12bb272f2544d1504f982270e90ae3dcc4ff2 Author: Christoph Lameter Date: Fri Jan 5 16:37:02 2007 -0800 [PATCH] Check for populated zone in __drain_pages Both process_zones() and drain_node_pages() check for populated zones before touching pagesets. However, __drain_pages does not do so, This may result in a NULL pointer dereference for pagesets in unpopulated zones if a NUMA setup is combined with cpu hotplug. Initially the unpopulated zone has the pcp pointers pointing to the boot pagesets. Since the zone is not populated the boot pageset pointers will not be changed during page allocator and slab bootstrap. If a cpu is later brought down (first call to __drain_pages()) then the pcp pointers for cpus in unpopulated zones are set to NULL since __drain_pages does not first check for an unpopulated zone. If the cpu is then brought up again then we call process_zones() which will ignore the unpopulated zone. So the pageset pointers will still be NULL. If the cpu is then again brought down then __drain_pages will attempt to drain pages by following the NULL pageset pointer for unpopulated zones. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6929da4427b4335365dd51ab0b7dd2a0393656f0 Author: Alan Date: Fri Jan 5 16:37:01 2007 -0800 [PATCH] hpt37x: Two important bug fixes The HPT37x driver very carefully handles DMA completions and the needed fixups are done on pci registers 0x50 and 0x52. This is unfortunate because the actual registers are 0x50 and 0x54. Fixing this offset cures the second channel problems reported. Secondly there are some problems with the HPT370 and certain ATA drives. The filter code however only filters ATAPI devices due to a reversed type check. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 516e72cb47ae4457f368aff449ffc284c5f357c1 Author: Alexey Dobriyan Date: Fri Jan 5 16:37:00 2007 -0800 [PATCH] pata_optidma: typo in Kconfig Signed-off-by: Alexey Dobriyan Acked-by: Alan Cox Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 022a93080c269e913793bea3a9a7fed06ca7d29b Author: Dor Laor Date: Fri Jan 5 16:37:00 2007 -0800 [PATCH] KVM: Simplify test for interrupt window No need to test for rflags.if as both VT and SVM specs assure us that on exit caused from interrupt window opening, 'if' is set. Signed-off-by: Dor Laor Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68a99f6d37aa65e848e09ec6ea52848e93bd5de2 Author: Ingo Molnar Date: Fri Jan 5 16:36:59 2007 -0800 [PATCH] KVM: Simplify mmu_alloc_roots() Small optimization/cleanup: page == page_header(page->page_hpa) Signed-off-by: Ingo Molnar Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d21225ee2b6fa9f7669526927f2e0bedebd90940 Author: Ingo Molnar Date: Fri Jan 5 16:36:59 2007 -0800 [PATCH] KVM: Make loading cr3 more robust Prevent the guest's loading of a corrupt cr3 (pointing at no guest phsyical page) from crashing the host. Signed-off-by: Ingo Molnar Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 760db773fbd0ad2ece89393218c4a4213b5bae6a Author: Avi Kivity Date: Fri Jan 5 16:36:59 2007 -0800 [PATCH] KVM: MMU: Add missing dirty bit If we emulate a write, we fail to set the dirty bit on the guest pte, leading the guest to believe the page is clean, and thus lose data. Bad. Fix by setting the guest pte dirty bit under such conditions. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4db9c47c052b89d89f43d12879690c1b3283b887 Author: Avi Kivity Date: Fri Jan 5 16:36:58 2007 -0800 [PATCH] KVM: Don't set guest cr3 from vmx_vcpu_setup() It overwrites the right cr3 set from mmu setup. Happens only with the test harness. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc1d8955cbfb9f32f432cc5033f6ef291e6f7f1e Author: Avi Kivity Date: Fri Jan 5 16:36:58 2007 -0800 [PATCH] KVM: Add missing 'break' Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f7417d67ea6c1538469e3ea005484e807642c0a Author: Ingo Molnar Date: Fri Jan 5 16:36:57 2007 -0800 [PATCH] KVM: Avoid oom on cr3 switch Signed-off-by: Ingo Molnar Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86a2b42e81b8236d9454f5c2d7113a82ed25c735 Author: Avi Kivity Date: Fri Jan 5 16:36:57 2007 -0800 [PATCH] KVM: Initialize vcpu->kvm a little earlier Fixes oops on early close of /dev/kvm. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e52de1b8cf85aa2ccaaa253b4397c6d6cc0d4897 Author: Avi Kivity Date: Fri Jan 5 16:36:56 2007 -0800 [PATCH] KVM: Improve reporting of vmwrite errors This will allow us to see the root cause when a vmwrite error happens. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37a7d8b046da6254718be1409140cd7bf3126f8f Author: Avi Kivity Date: Fri Jan 5 16:36:56 2007 -0800 [PATCH] KVM: MMU: add audit code to check mappings, etc are correct Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ede74e0af549d75d4ea870bed8b178983816745 Author: Avi Kivity Date: Fri Jan 5 16:36:55 2007 -0800 [PATCH] KVM: MMU: Destroy mmu while we still have a vcpu left mmu_destroy flushes the guest tlb (indirectly), which needs a valid vcpu. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40907d5768ab8cadd4cad97bef350820ded20338 Author: Avi Kivity Date: Fri Jan 5 16:36:55 2007 -0800 [PATCH] KVM: MMU: Flush guest tlb when reducing permissions on a pte If we reduce permissions on a pte, we must flush the cached copy of the pte from the guest's tlb. This is implemented at the moment by flushing the entire guest tlb, and can be improved by flushing just the relevant virtual address, if it is known. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2dec939db126989808853d218e426daaeebc9e2 Author: Avi Kivity Date: Fri Jan 5 16:36:54 2007 -0800 [PATCH] KVM: MMU: Detect oom conditions and propagate error to userspace Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 714b93da1a6d97307dfafb9915517879d8a66c0d Author: Avi Kivity Date: Fri Jan 5 16:36:53 2007 -0800 [PATCH] KVM: MMU: Replace atomic allocations by preallocated objects The mmu sometimes needs memory for reverse mapping and parent pte chains. however, we can't allocate from within the mmu because of the atomic context. So, move the allocations to a central place that can be executed before the main mmu machinery, where we can bail out on failure before any damage is done. (error handling is deffered for now, but the basic structure is there) Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f51234c2cd3ab8bed836e09686e27877e1b55f2a Author: Avi Kivity Date: Fri Jan 5 16:36:52 2007 -0800 [PATCH] KVM: MMU: Free pages on kvm destruction Because mmu pages have attached rmap and parent pte chain structures, we need to zap them before freeing so the attached structures are freed. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 143646567f6dcd584e1ab359b5ec83e0545e70cf Author: Avi Kivity Date: Fri Jan 5 16:36:52 2007 -0800 [PATCH] KVM: MMU: Treat user-mode faults as a hint that a page is no longer a page table Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32b35627355c3bf17e1903efd117efed7653a54e Author: Avi Kivity Date: Fri Jan 5 16:36:51 2007 -0800 [PATCH] KVM: MMU: Fix cmpxchg8b emulation cmpxchg8b uses edx:eax as the compare operand, not edi:eax. cmpxchg8b is used by 32-bit pae guests to set page table entries atomically, and this is emulated touching shadowed guest page tables. Also, implement it for 32-bit hosts. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bb65a22a4502067f8cd3cb4c923ffa70be62091 Author: Avi Kivity Date: Fri Jan 5 16:36:51 2007 -0800 [PATCH] KVM: MMU: Never free a shadow page actively serving as a root We always need cr3 to point to something valid, so if we detect that we're freeing a root page, simply push it back to the top of the active list. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86a5ba025d0a0b251817d0efbeaf7037d4175d21 Author: Avi Kivity Date: Fri Jan 5 16:36:50 2007 -0800 [PATCH] KVM: MMU: Page table write flood protection In fork() (or when we protect a page that is no longer a page table), we can experience floods of writes to a page, which have to be emulated. This is expensive. So, if we detect such a flood, zap the page so subsequent writes can proceed natively. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 139bdb2d9e410d448281057a37b53770324ccac8 Author: Avi Kivity Date: Fri Jan 5 16:36:50 2007 -0800 [PATCH] KVM: MMU: If an empty shadow page is not empty, report more info Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f1e0b6abcc100a79528387207adc3dd92aa5374 Author: Avi Kivity Date: Fri Jan 5 16:36:49 2007 -0800 [PATCH] KVM: MMU: Ensure freed shadow pages are clean Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 260746c03dcb2e5089f95b60cb786aaf405ced63 Author: Avi Kivity Date: Fri Jan 5 16:36:49 2007 -0800 [PATCH] KVM: MMU: Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e7bc4b9610ed9fde0fa14f0b7a7f939805e5ae9 Author: Avi Kivity Date: Fri Jan 5 16:36:48 2007 -0800 [PATCH] KVM: MMU: Handle misaligned accesses to write protected guest page tables A misaligned access affects two shadow ptes instead of just one. Since a misaligned access is unlikely to occur on a real page table, just zap the page out of existence, avoiding further trouble. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73f7198e738004671b885c443eb6f88df021c07f Author: Avi Kivity Date: Fri Jan 5 16:36:48 2007 -0800 [PATCH] KVM: MMU: Remove release_pt_page_64() Unused. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f015a5b28c75bb6cc5158640db58689b1ee1b51 Author: Avi Kivity Date: Fri Jan 5 16:36:47 2007 -0800 [PATCH] KVM: MMU: Remove invlpg interception Since we write protect shadowed guest page tables, there is no need to trap page invalidations (the guest will always change the mapping before issuing the invlpg instruction). Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebeace8609205bf5e1b96fe325b7dea148042232 Author: Avi Kivity Date: Fri Jan 5 16:36:47 2007 -0800 [PATCH] KVM: MMU: oom handling When beginning to process a page fault, make sure we have enough shadow pages available to service the fault. If not, free some pages. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc4529efc7b730b596d9c7d5a917c00a357e92aa Author: Avi Kivity Date: Fri Jan 5 16:36:47 2007 -0800 [PATCH] KVM: MMU: kvm_mmu_put_page() only removes one link to the page ... and so must not free it unconditionally. Move the freeing to kvm_mmu_zap_page(). Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 697fe2e24ac49f03a82f6cfe5d77f7a2122ff382 Author: Avi Kivity Date: Fri Jan 5 16:36:46 2007 -0800 [PATCH] KVM: MMU: Implement child shadow unlinking When removing a page table, we must maintain the parent_pte field all child shadow page tables. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a436036baf331703b4d2c8e8a45f02c597bf6913 Author: Avi Kivity Date: Fri Jan 5 16:36:45 2007 -0800 [PATCH] KVM: MMU: If emulating an instruction fails, try unprotecting the page A page table may have been recycled into a regular page, and so any instruction can be executed on it. Unprotect the page and let the cpu do its thing. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b7a032567ee1128daeebebfc14d3acedfe28c8c Author: Avi Kivity Date: Fri Jan 5 16:36:45 2007 -0800 [PATCH] KVM: MMU: Zap shadow page table entries on writes to guest page tables Iterate over all shadow pages which correspond to a the given guest page table and remove the mappings. A subsequent page fault will reestablish the new mapping. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da4a00f002239f72b0d7d0eeaa3b60100e2b1438 Author: Avi Kivity Date: Fri Jan 5 16:36:44 2007 -0800 [PATCH] KVM: MMU: Support emulated writes into RAM As the mmu write protects guest page table, we emulate those writes. Since they are not mmio, there is no need to go to userspace to perform them. So, perform the writes in the kernel if possible, and notify the mmu about them so it can take the approriate action. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 815af8d42ee3f844c0ceaf2104bd9c6a0bb1e26c Author: Avi Kivity Date: Fri Jan 5 16:36:44 2007 -0800 [PATCH] KVM: MMU: Let the walker extract the target page gfn from the pte This fixes a problem where set_pte_common() looked for shadowed pages based on the page directory gfn (a huge page) instead of the actual gfn being mapped. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 374cbac0333ddf5cf1c6637efaf7f3adcc67fd75 Author: Avi Kivity Date: Fri Jan 5 16:36:43 2007 -0800 [PATCH] KVM: MMU: Write protect guest pages when a shadow is created for them When we cache a guest page table into a shadow page table, we need to prevent further access to that page by the guest, as that would render the cache incoherent. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cea0f0e7ea54753c3265dc77f605a6dad1912cfc Author: Avi Kivity Date: Fri Jan 5 16:36:43 2007 -0800 [PATCH] KVM: MMU: Shadow page table caching Define a hashtable for caching shadow page tables. Look up the cache on context switch (cr3 change) or during page faults. The key to the cache is a combination of - the guest page table frame number - the number of paging levels in the guest * we can cache real mode, 32-bit mode, pae, and long mode page tables simultaneously. this is useful for smp bootup. - the guest page table table * some kernels use a page as both a page table and a page directory. this allows multiple shadow pages to exist for that page, one per level - the "quadrant" * 32-bit mode page tables span 4MB, whereas a shadow page table spans 2MB. similarly, a 32-bit page directory spans 4GB, while a shadow page directory spans 1GB. the quadrant allows caching up to 4 shadow page tables for one guest page in one level. - a "metaphysical" bit * for real mode, and for pse pages, there is no guest page table, so set the bit to avoid write protecting the page. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25c0de2cc6c26cb99553c2444936a7951c120c09 Author: Avi Kivity Date: Fri Jan 5 16:36:42 2007 -0800 [PATCH] KVM: MMU: Make kvm_mmu_alloc_page() return a kvm_mmu_page pointer This allows further manipulation on the shadow page table. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aef3d3fe1314f2a130f5ccc7114df20865ba784f Author: Avi Kivity Date: Fri Jan 5 16:36:41 2007 -0800 [PATCH] KVM: MMU: Make the shadow page tables also special-case pae Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b0973bd8f788178f21d9eebdd879203464f8528 Author: Avi Kivity Date: Fri Jan 5 16:36:41 2007 -0800 [PATCH] KVM: MMU: Use the guest pdptrs instead of mapping cr3 in pae mode This lets us not write protect a partial page, and is anyway what a real processor does. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17ac10ad2bb7d8c4f401668484b2e661a15726c6 Author: Avi Kivity Date: Fri Jan 5 16:36:40 2007 -0800 [PATCH] KVM: MU: Special treatment for shadow pae root pages Since we're not going to cache the pae-mode shadow root pages, allocate a single pae shadow that will hold the four lower-level pages, which will act as roots. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac79c978f173586ab3624427c89cd22b393cabd4 Author: Avi Kivity Date: Fri Jan 5 16:36:40 2007 -0800 [PATCH] KVM: MMU: Fold fetch_guest() into init_walker() It is never necessary to fetch a guest entry from an intermediate page table level (except for large pages), so avoid some confusion by always descending into the lowest possible level. Rename init_walker() to walk_addr() as it is no longer restricted to initialization. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1342d3536d6a12541ceb276da15f043db90716eb Author: Avi Kivity Date: Fri Jan 5 16:36:39 2007 -0800 [PATCH] KVM: MMU: Load the pae pdptrs on cr3 change like the processor does In pae mode, a load of cr3 loads the four third-level page table entries in addition to cr3 itself. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bcbd6aba00fced696fc99f1a4fcd7ac7d42d6ef Author: Avi Kivity Date: Fri Jan 5 16:36:39 2007 -0800 [PATCH] KVM: MMU: Teach the page table walker to track guest page table gfns Saving the table gfns removes the need to walk the guest and host page tables in lockstep. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd4a4e5374110444dc38831af517e51ff5a053c3 Author: Avi Kivity Date: Fri Jan 5 16:36:38 2007 -0800 [PATCH] KVM: MMU: Implement simple reverse mapping Keep in each host page frame's page->private a pointer to the shadow pte which maps it. If there are multiple shadow ptes mapping the page, set bit 0 of page->private, and use the rest as a pointer to a linked list of all such mappings. Reverse mappings are needed because we when we cache shadow page tables, we must protect the guest page tables from being modified by the guest, as that would invalidate the cached ptes. Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 399badf315bd4dd571b4b3b7cf666d9a2af40229 Author: Avi Kivity Date: Fri Jan 5 16:36:38 2007 -0800 [PATCH] KVM: Prevent stale bits in cr0 and cr4 Hardware virtualization implementations allow the guests to freely change some of the bits in cr0 and cr4, but trap when changing the other bits. This is useful to avoid excessive exits due to changing, for example, the ts flag. It also means the kvm's copy of cr0 and cr4 may be stale with respect to these bits. most of the time this doesn't matter as these bits are not very interesting. Other times, however (for example when returning cr0 to userspace), they are, so get the fresh contents of these bits from the guest by means of a new arch operation. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb26b572dc39467ba0969d1a76c2f723d2d6a2a6 Author: David Brownell Date: Fri Jan 5 16:36:37 2007 -0800 [PATCH] Update the rtc-rs5c372 driver Bugfixes: - Handle RTCs which are configured to use 12-hour mode. - Never report bogus/un-initialized times. - Displaying "raw trim" requires not masking it first! - Fix the sysfs and procfs display of crystal and trim data. Features: - Handle other RTCs in this family, notably rv5c386/rv5c387. - Declare the other registers. - Provide alarm get/set functionality. - Handle AIE and UIE; but no IRQ handling yet. Cleanup: - Shrink object by not including needless sysfs or procfs support - We don't need no steenkin' forward declarations. (Except one.) Until the I2C framework merges "new style" driver support, matching the driver model better, using rv5c chips or alarm IRQs requires a separate board-specific patch. (And an IRQ handler, handing off labor through a work_struct...) This uses the "method 3" register reads, but notes that it's done to work around an evident i2c adapter driver bug. Signed-off-by: David Brownell Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6a60451813bad6a9f57cb159004c3b3e12a1cd3 Author: Hugh Dickins Date: Fri Jan 5 16:36:36 2007 -0800 [PATCH] fix BUG_ON(!PageSlab) from fallback_alloc pdflush hit the BUG_ON(!PageSlab(page)) in kmem_freepages called from fallback_alloc: cache_grow already freed those pages when alloc_slabmgmt failed. But it wouldn't have freed them if __GFP_NO_GROW, so make sure fallback_alloc doesn't waste its time on that case. Signed-off-by: Hugh Dickins Acked-by: Christoph Lameter Acked-by: Pekka J Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be6aab0e9fa6d3c6d75aa1e38ac972d8b4ee82b8 Author: Eric Sandeen Date: Fri Jan 5 16:36:36 2007 -0800 [PATCH] fix memory corruption from misinterpreted bad_inode_ops return values CVE-2006-5753 is for a case where an inode can be marked bad, switching the ops to bad_inode_ops, which are all connected as: static int return_EIO(void) { return -EIO; } #define EIO_ERROR ((void *) (return_EIO)) static struct inode_operations bad_inode_ops = { .create = bad_inode_create ...etc... The problem here is that the void cast causes return types to not be promoted, and for ops such as listxattr which expect more than 32 bits of return value, the 32-bit -EIO is interpreted as a large positive 64-bit number, i.e. 0x00000000fffffffa instead of 0xfffffffa. This goes particularly badly when the return value is taken as a number of bytes to copy into, say, a user's buffer for example... I originally had coded up the fix by creating a return_EIO_ macro for each return type, like this: static int return_EIO_int(void) { return -EIO; } #define EIO_ERROR_INT ((void *) (return_EIO_int)) static struct inode_operations bad_inode_ops = { .create = EIO_ERROR_INT, ...etc... but Al felt that it was probably better to create an EIO-returner for each actual op signature. Since so few ops share a signature, I just went ahead & created an EIO function for each individual file & inode op that returns a value. Signed-off-by: Eric Sandeen Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2723f9603a8f8bb2cd8c7b581f7c94b8d75e3837 Author: Andrew Morton Date: Fri Jan 5 16:36:35 2007 -0800 [PATCH] ip2 warning fix Make this: drivers/char/ip2/ip2main.c: In function 'ip2_loadmain': drivers/char/ip2/ip2main.c:654: warning: control may reach end of non-void function 'iiSetAddress' being inlined drivers/char/ip2/ip2main.c:808: warning: control may reach end of non-void function 'iiInitialize' being inlined go away. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3771a450cf47fa64f36c53ba61e36aa2ec84a86b Author: Vivek Goyal Date: Fri Jan 5 16:36:34 2007 -0800 [PATCH] i386: modpost smpboot code warning fix o Currently synchronize_tsc_ap() is of type __init. It is called by smp_callin() which is of type __cpuinit. So synchronize_tsc_ap() should be of type __cpuinit. o Modpost generates warnings for i386 if CONFIG_RELOCATABLE=y and CONFIG_HOTPLUG_CPU=y WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between 'start_secondary' (at offset 0xc01164dc) and 'initialize_secondary' WARNING: vmlinux - Section mismatch: reference to .init.data: from .text between 'start_secondary' (at offset 0xc01164e8) and 'initialize_secondary' o tsc is of type __initdata. It should be of type __cpuinitdata. Signed-off-by: Vivek Goyal Cc: Andi Kleen Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dbeeec91e8f4a200ac56af5004473fa6099520f Author: Vivek Goyal Date: Fri Jan 5 16:36:34 2007 -0800 [PATCH] i386: fix another modpost warning o MODPOST generates warning for i386 if kernel is compiled with CONFIG_RELOCATABLE=y WARNING: vmlinux - Section mismatch: reference to .init.data: from .data between 'this_cpu' (at offset 0xc05194d0) and 'cpuinfo_op' o this_cpu pointer should be of type __cpuinitdata. Signed-off-by: Vivek Goyal Cc: Andi Kleen Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1119a33a962077570ab0c2ef4712c0e48acfc577 Author: Vivek Goyal Date: Fri Jan 5 16:36:33 2007 -0800 [PATCH] i386: fix modpost warning in SMP trampoline code o MODPOST generates warning for i386 if kernel is compiled with CONFIG_RELOCATABLE=y WARNING: vmlinux - Section mismatch: reference to .init.text:startup_32_smp from .data between 'trampoline_data' (at offset 0xc0519cf8) and 'boot_gdt' o trampoline code/data can go into init section is CPU hotplug is not enabled. Signed-off-by: Vivek Goyal Cc: Andi Kleen Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ab37b8f21b4dfe256d736c13738d20c88a1f3ad Author: Paul Mundt Date: Fri Jan 5 16:36:30 2007 -0800 [PATCH] Sanely size hash tables when using large base pages At the moment the inode/dentry cache hash tables (common by way of alloc_large_system_hash()) are incorrectly sized by their respective detection logic when we attempt to use large base pages on systems with little memory. This results in odd behaviour when using a 64kB PAGE_SIZE, such as: Dentry cache hash table entries: 8192 (order: -1, 32768 bytes) Inode-cache hash table entries: 4096 (order: -2, 16384 bytes) The mount cache hash table is seemingly the only one that gets this right by directly taking PAGE_SIZE in to account. The following patch attempts to catch the bogus values and round it up to at least 0-order. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd0ec16fa6cf2498b831663a543e1b67fce6e155 Author: Vivek Goyal Date: Fri Jan 5 16:36:30 2007 -0800 [PATCH] i386: Restore CONFIG_PHYSICAL_START option o Relocatable bzImage support had got rid of CONFIG_PHYSICAL_START option thinking that now this option is not required as people can build a second kernel as relocatable and load it anywhere. So need of compiling the kernel for a custom address was gone. But Magnus uses vmlinux images for second kernel in Xen environment and he wants to continue to use it. o Restoring the CONFIG_PHYSICAL_START option for the time being. I think down the line we can get rid of it. Signed-off-by: Vivek Goyal Cc: "Eric W. Biederman" Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a75acf850ca80136a4f845cf9a7cd26e7465c1f4 Author: Ingo Molnar Date: Fri Jan 5 16:36:29 2007 -0800 [PATCH] profiling: fix sched profiling typo Fix sched profiling typo, introduced by the sleep profiling patch. This bug caused profile=sched to not work. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bf236874292fd073c6bdd27f89c3d9e81a79cbc Author: Rafael J. Wysocki Date: Fri Jan 5 16:36:28 2007 -0800 [PATCH] swsusp: Do not fail if resume device is not set In the kernels later than 2.6.19 there is a regression that makes swsusp fail if the resume device is not explicitly specified. It can be fixed by adding an additional parameter to mm/swapfile.c:swap_type_of() allowing us to pass the (struct block_device *) corresponding to the first available swap back to the caller. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3223ea8cca5936b8e78450dd5b8ba88372e9c0a8 Author: James Bursa Date: Fri Jan 5 16:36:28 2007 -0800 [PATCH] adfs: fix filename handling Fix filenames on adfs discs being terminated at the first character greater than 128 (adfs filenames are Latin 1). I saw this problem when using a loopback adfs image on a 2.6.17-rc5 x86_64 machine, and the patch fixed it there. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c5f8cc33eb2e10b6ab788bbe259fc142a068627 Author: Alan Date: Fri Jan 5 16:36:27 2007 -0800 [PATCH] atiixp: Old drivers/ide layer driver for the ATIIXP hang fix When the old IDE layer calls into methods in the driver during error handling it is essentially random whether ide_lock is already held. This causes a deadlock in the atiixp driver which also uses ide_lock internally for locking. Switch to a private lock instead. [akpm@osl.org: cleanup] Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 406c9b605cbc45151c03ac9a3f95e9acf050808c Author: Christoph Hellwig Date: Fri Jan 5 16:36:26 2007 -0800 [PATCH] Fix BUG at drivers/scsi/scsi_lib.c:1118 caused by "pktsetup dvd /dev/sr0" Fix http://bugzilla.kernel.org/show_bug.cgi?id=7667 This is because the packet driver tries to send down read/write BLOCK_PC commands that don't use a bio and do not use sg lists. The right fix is to replace all the packet_command stuff in the packet driver by scsi_execute() which needs to be lifted from scsi code to the block code for that. Fix the bug for now. It's not the full way to a generic execute block pc infrastcuture but fixes the bug for the time being. Signed-off-by: Christoph Hellwig Acked-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d73e3cd73c058ce792ad276f979680aa331f4f8e Author: David Brownell Date: Fri Jan 5 16:36:25 2007 -0800 [PATCH] rtc-at91rm9200 build fix The at91rm9200 RTC driver needs some assistance to build, because of recent header file rearrangement. Signed-off-by: David Brownell Cc: Alessandro Zummo Cc: Andrew Victor Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1150d8cf9e9d2b356fab52d79f2366985e5511b Author: Dor Laor Date: Fri Jan 5 16:36:24 2007 -0800 [PATCH] KVM: Improve interrupt response The current interrupt injection mechanism might delay an interrupt under the following circumstances: - if injection fails because the guest is not interruptible (rflags.IF clear, or after a 'mov ss' or 'sti' instruction). Userspace can check rflags, but the other cases or not testable under the current API. - if injection fails because of a fault during delivery. This probably never happens under normal guests. - if injection fails due to a physical interrupt causing a vmexit so that it can be handled by the host. In all cases the guest proceeds without processing the interrupt, reducing the interactive feel and interrupt throughput of the guest. This patch fixes the situation by allowing userspace to request an exit when the 'interrupt window' opens, so that it can re-inject the interrupt at the right time. Guest interactivity is very visibly improved. Signed-off-by: Dor Laor Signed-off-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e097f35ce58eb8d687f3a300247cf1a978fcea39 Author: Yoshimi Ichiyanagi Date: Fri Jan 5 16:36:24 2007 -0800 [PATCH] KVM: Recover after an arch module load failure If we load the wrong arch module, it leaves behind kvm_arch_ops set, which prevents loading of the correct arch module later. Fix be not setting kvm_arch_ops until we're sure it's good. Signed-off-by: Yoshimi Ichiyanagi Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3b2c33860d4acdfe3ac29b40b03e655eb8d1e2c Author: Ingo Molnar Date: Fri Jan 5 16:36:23 2007 -0800 [PATCH] KVM: Use raw_smp_processor_id() instead of smp_processor_id() where applicable Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 965b58a550b6f84815cb555e6abb953e863f1610 Author: Ingo Molnar Date: Fri Jan 5 16:36:23 2007 -0800 [PATCH] KVM: Fix GFP_KERNEL alloc in atomic section bug KVM does kmalloc() in an atomic section while having preemption disabled via vcpu_load(). Fix this by moving the ->*_msr setup from the vcpu_setup method to the vcpu_create method. (This is also a small speedup for setting up a vcpu, which can in theory be more frequent than the vcpu_create method). Signed-off-by: Ingo Molnar Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd36beec0b83d28dceb85696a23542bf1b97cc8c Author: Bartlomiej Zolnierkiewicz Date: Fri Jan 5 16:36:21 2007 -0800 [PATCH] via82cxxx: fix cable detection This patch fixes 2.6.15 regression, is straightforward and tested. Cable detection got broken probably while converting the driver to support multiple controllers. Cable detection is done by examining how BIOS configured the attached devices. The current code is broken in that it examines the status *after* modifying Clk66 configuration ending up detecting 40c cables as 80c. This patch fixes it. Signed-off-by: Tejun Heo Signed-off-by: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ae4adf50380d0fc5176a76d98d324f8fa491a8f Author: Ard van Breemen Date: Fri Jan 5 16:36:21 2007 -0800 [PATCH] PCI: prevent down_read when pci_devices is empty The pci_find_subsys gets called very early by obsolete ide setup parameters. This is a bogus call since pci is not initialized yet, so the list is empty. But in the mean time, interrupts get enabled by down_read. This can result in a kernel panic when the irq controller gets initialized. This patch checks if the device list is empty before taking the semaphore, and hence will not enable irq's. Furthermore it will inform that it is called while pci_devices is empty as a reminder that the ide code needs to be fixed. The pci_get_subsys can get called in the same manner, and as such is patched in the same manner. [akpm@osdl.org: cleanups] Signed-off-by: Ard van Breemen Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a416aba637dcb4127595c02a59041cd278422f7e Author: Ard van Breemen Date: Fri Jan 5 16:36:20 2007 -0800 [PATCH] kernelparams: detect if and which parameter parsing enabled irq's The parsing of some kernel parameters seem to enable irq's at a stage that irq's are not supposed to be enabled (Particularly the ide kernel parameters). Having irq's enabled before the irq controller is initialized might lead to a kernel panic. This patch only detects this behaviour and warns about wich parameter caused it. [akpm@osdl.org: cleanups] Signed-off-by: Ard van Breemen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4a68306b9c0939b3facdad2cc5e34d660ff463a Author: Ard van Breemen Date: Fri Jan 5 16:36:19 2007 -0800 [PATCH] start_kernel: test if irq's got enabled early, barf, and disable them again The calls made by parse_parms to other initialization code might enable interrupts again way too early. Having interrupts on this early can make systems PANIC when they initialize the IRQ controllers (which happens later in the code). This patch detects that irq's are enabled again, barfs about it and disables them again as a safety net. [akpm@osdl.org: cleanups] Signed-off-by: Ard van Breemen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34f1ca540679f61a02b7406f036d9edde9717ee2 Author: Richard Purdie Date: Fri Jan 5 16:36:18 2007 -0800 [PATCH] Fix leds-s3c24xx hardware.h reference Russell King recently reminded us that one shouldn't use asm/arch/hardware.h but one should use asm/hardware.h (http://lkml.org/lkml/2006/12/23/26). Unfortunately, the leds-s3c24xx driver is using the wrong header. This patch is fixing that. Signed-off-by: Arnaud Patard Signed-off-by: Richard Purdie Acked-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6002f544c9f724a9e35cbd5799742fd98e3d6046 Author: Dave Jones Date: Fri Jan 5 16:36:18 2007 -0800 [PATCH] Fix implicit declarations in via-pmu drivers/macintosh/via-pmu.c: In function 'pmac_suspend_devices': drivers/macintosh/via-pmu.c:2014: error: implicit declaration of function 'pm_prepare_console' drivers/macintosh/via-pmu.c: In function 'pmac_wakeup_devices': drivers/macintosh/via-pmu.c:2139: error: implicit declaration of function 'pm_restore_console' Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd2c565999e015004622425020a61593deb87a04 Author: Adam Megacz Date: Fri Jan 5 16:36:17 2007 -0800 [PATCH] Add AFS_SUPER_MAGIC to magic.h Jeffrey Altman, one of the gatekeepers of OpenAFS (the open source project which inherited the Transarc/IBM AFS codebase) has requested that the magic number 0x5346414F (little endian 'OAFS') be allocated for the f_type field of the fsinfo structure on Linux: https://lists.openafs.org/pipermail/openafs-info/2006-December/024829.html Add it to include/linux/magic.h, mostly as a way of publishing this number and ensuring that no other filesystem accidentally uses it. Cc: Jeffrey Altman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 723fe2ca82d1ffc80c9d53035babf011f84c65d4 Author: Len Brown Date: Sat Jan 6 00:02:07 2007 -0500 ACPI: ec: enable printk on cmdline use if somebody uses "ec_intr=", lets be sure to capture that in the dmesg even in the non-debug case. Signed-off-by: Len Brown commit 7f422e2e84307bdd9b51c19a602e1601d160aebc Author: Kay Sievers Date: Wed Dec 20 10:39:33 2006 +0100 [PATCH] Driver core: Fix prefix driver links in /sys/module by bus-name Modules may have drivers with the same name on different buses. This patch fixes this problem. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit fd8d4b11354a8a33ef61b06fa64880c2c6d25ae4 Author: Andrew Morton Date: Thu Dec 14 16:40:00 2006 -0800 [PATCH] PCI: disable PCI_MULTITHREAD_PROBE Unfortunatly, no one reads Kconfig help entries :( Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 14e51f28ade783cd948cd10202a696ff7e5d33d6 Author: David Hollis Date: Thu Dec 28 14:09:11 2006 -0500 USB: asix: Fix AX88772 device PHY selection A small typo in ax88772_bind() prevents the device from selecting the proper PHY, leaving the device useless. The attached patch fixes this. If this patch can be added to the 2.6.19.x series as well, that would be helpful for end-users. Signed-off-by: David Hollis Signed-off-by: Greg Kroah-Hartman commit 4f45d0387b407348de48c212ac5b3496ce6d2fda Author: Martin Williges Date: Thu Dec 28 20:52:10 2006 +0100 USB: usblp.c - add Kyocera Mita FS 820 to list of "quirky" printers This patch gets the Kyocera FS-820 working with cups 1.2 via usb again. It adds the printer to the list of "quirky" printers. The printer seems not answer to ID requests some seconds after plugging in. Patch is based on linux-2.6.19.1. Background: As far as I could see (strace, usbmon), the Kyocera FS-820 answers to ID requests only a few seconds after plugging it in. This applies to detecting it with cups and is also true for the printing itself, which is initiated with an ID request. Since I have little usb knowledge, maybe someone can interpret the data, especially the fist bulk transfer - why request 8192 bytes? This is the second version of the patch. usbmon output of printing an email without patch: tail -F /tmp/printlog.txt c636e140 3374734463 S Bi:002:02 -115 8192 < c9d43b40 3374734494 S Ci:002:00 s a1 00 0000 0000 03ff 1023 < c9d43b40 3379732301 C Ci:002:00 -104 0 c636e140 3379733294 C Bi:002:02 -2 0 [...repeating...] with patch: tail -F /tmp/printlog.txt d9cb82c0 3729790131 S Ci:002:00 s a1 00 0000 0000 03ff 1023 < d9cb82c0 3729791725 C Ci:002:00 0 91 = 005b4944 3a46532d 3832303b 4d46473a 4b796f63 6572613b 434d443a 50434c58 df956320 3732493190 S Bo:002:01 -115 1347 = 1b252d31 32333435 5840504a 4c0a4050 4a4c2053 4554204d 414e5541 4c464545 [...more data...] Signed-off-by: Martin Williges Signed-off-by: Greg Kroah-Hartman commit c067dfc650a2d7d26d4b9bdecc339596f8746cff Author: Andrew Morton Date: Wed Jan 3 16:45:21 2007 -0800 sisusb_con warning fixes x86_64: drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_putc': drivers/usb/misc/sisusbvga/sisusb_con.c:405: warning: cast from pointer to integer of different size drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_putcs': drivers/usb/misc/sisusbvga/sisusb_con.c:440: warning: cast from pointer to integer of different size drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_clear': drivers/usb/misc/sisusbvga/sisusb_con.c:494: warning: cast from pointer to integer of different size drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_bmove': drivers/usb/misc/sisusbvga/sisusb_con.c:566: warning: cast from pointer to integer of different size drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_switch': drivers/usb/misc/sisusbvga/sisusb_con.c:614: warning: cast from pointer to integer of different size drivers/usb/misc/sisusbvga/sisusb_con.c: In function 'sisusbcon_scroll_area': drivers/usb/misc/sisusbvga/sisusb_con.c:941: warning: cast from pointer to integer of different size Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit c07be136a883a148a16ce4cd91163035631b37ea Author: Sarah Bailey Date: Wed Jan 3 21:37:22 2007 -0800 USB: Fixed bug in endpoint release function. Error handling in usb_create_ep_files() is not correct unless the minor number is freed in ep_device_release(). Signed-off-by: Sarah Bailey Signed-off-by: Greg Kroah-Hartman commit 684a0e70008934dbdf87ed35e29ccbb58e91f8dc Author: Oliver Neukum Date: Wed Jan 3 15:14:43 2007 +0100 USB: small update to Documentation/usb/acm.txt this docu update mentions that cell phones also use cdc-acm. Signed-off-by: Oliver Neukum commit ad1428c96ebdee592aa475afe129530225bef186 Author: Pete Zaitcev Date: Sun Dec 31 13:43:26 2006 -0800 USB storage: fix ipod ejecting issue This patch from Pete fixes the 'ejecting problem' on yet another ipod. Please applyt. Signed-off-by: Pete Zaitcev Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit f1cd4ad202ce34d29c847fd82df948ff67c17826 Author: Phil Dibowitz Date: Sun Dec 31 00:19:50 2006 -0800 USB Storage: unusual_devs: add supertop drives This combines patches from Alan Stern and Robert Schedel for two "Super Top" drives that need the IGNORE_RESIDUE flag but have different vendor IDs. Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit e6a6e472f55e0c8398650446b64c40e4a373b0c5 Author: David Brownell Date: Sun Dec 10 11:47:04 2006 -0800 USB: omap_udc build fixes (sync with linux-omap) Resync the omap_udc driver with the latest from the Linux-OMAP tree. Changes include DMA API updates (it builds again!), clock/pm updates, minor bugfixes, whitespace. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6a3c3d495201490ba51a8a26daf400d89c410e6e Author: Andrew Morton Date: Thu Dec 14 22:28:29 2006 -0800 USB: funsoft is borken on sparc drivers/usb/serial/funsoft.c: In function `funsoft_ioctl': drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_iflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_iflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_iflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: type defaults to `int' in declaration of `type name' drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_oflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_oflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_oflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: type defaults to `int' in declaration of `type name' drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_cflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: type defaults to `int' in declaration of `type name' drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_lflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_lflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_lflag' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: type defaults to `int' in declaration of `type name' drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_line' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_line' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_line' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: type defaults to `int' in declaration of `type name' drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: type defaults to `int' in declaration of `type name' drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: type defaults to `int' in declaration of `type name' drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: type defaults to `int' in declaration of `type name' drivers/usb/serial/funsoft.c:35: warning: dereferencing `void *' pointer drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: error: request for member `c_cc' in something not a structure or union drivers/usb/serial/funsoft.c:35: warning: type defaults to `int' in declaration of `type name' Cc: David Clare Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 8c1527132c25512563b197b35453c7da22b4d699 Author: Miguel Angel Alvarez Date: Thu Dec 14 19:49:35 2006 +0100 USB: fix interaction between different interfaces in an "Option" usb device Just the serial port in the first interface should control DTR and RTS lines. This way, the closing of the rest of the ports does not produce a= hangup in the communication. Signed-off-by: Miguel Angel Alvarez Signed-off-by: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit 25c77b329467d563ec1fa5c3efab0b13996ce810 Author: Alan Stern Date: Fri Dec 15 16:08:13 2006 -0500 UHCI: support device_may_wakeup This patch (as831) adds device_may_wakeup() support to uhci-hcd; it has been lacking for a long time. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c80a70d53fa0ca47ad122cd75fe32b6f41c04eb1 Author: Alan Stern Date: Fri Dec 15 16:06:25 2006 -0500 UHCI: make test for ASUS motherboard more specific Instead of matching all motherboards whose name contains "A7V8X" for a remote-wakeup hardware bug, this patch (as829) matches only those boards whose name is exactly equal to "A7V8X". Later motherboards don't seem to have the bug. (In fact, it's possible that only one motherboard in the world has the bug. With only one user reporting problems, it's hard to tell.) Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 81ffbc04a8ea06c4bea534154f49ed598013ee6b Author: Philippe De Muyter Date: Fri Jan 5 17:54:05 2007 +0100 i2c/m41t00: Do not forget to write year m41t00.c forgets to set the year field in set_rtc_time; fix that. Signed-off-by: Philippe De Muyter Signed-off-by: Andrew Morton Acked-by: Mark A. Greer Signed-off-by: Jean Delvare commit 3269bb63eb076318ce4fb554851d047e1c9aa1a5 Author: Maxime Bizon Date: Fri Jan 5 17:54:05 2007 +0100 i2c-mv64xxx: Fix random oops at boot I have a Marvell board which has the same i2c hw block than mv64xxx, so I'm trying to use i2c-mv64xxx driver. But I get the following random oops at boot: Unable to handle kernel NULL pointer dereference at virtual address 00000002 Backtrace: [] (mv64xxx_i2c_intr+0x0/0x2b8) from [] (__do_irq+0x4c/0x8c) [] (__do_irq+0x0/0x8c) from [] (do_level_IRQ+0x68/0xc0) r8 = C0501E08 r7 = 00000005 r6 = C0501E08 r5 = 00000005 r4 = C048BB78 [] (do_level_IRQ+0x0/0xc0) from [] (asm_do_IRQ+0x50/0x134) r6 = C0449C78 r5 = F1020000 r4 = FFFFFFFF [] (asm_do_IRQ+0x0/0x134) from [] (__irq_svc+0x24/0x100) r8 = C1CAC400 r7 = 00000005 r6 = 00000002 r5 = F1020000 r4 = FFFFFFFF [] (setup_irq+0x0/0x124) from [] (request_irq+0xb0/0xd0) r7 = C041B2AC r6 = C0397E4C r5 = 00000000 r4 = 00000005 [] (request_irq+0x0/0xd0) from [] (mv64xxx_i2c_probe+0x148/0x244) [] (mv64xxx_i2c_probe+0x0/0x244) from [] (platform_drv_probe+0x20/0x24) The oops is caused by a spurious interrupt that occurs when request_irq is called. mv64xxx_i2c_fsm() tries to read drv_data->msg, which is NULL. I noticed that hardware init is done after requesting irq. Thus any pending irq from previous hardware usage may cause this. The following patch fixes it: Signed-off-by: Maxime Bizon Acked-by: Mark A. Greer Signed-off-by: Jean Delvare commit 46707e96b7254663139225ab6c9ab9922cd8c435 Author: Michael S. Tsirkin Date: Wed Jan 3 14:46:30 2007 +0200 IB/mthca: Fix off-by-one in FMR handling on memfree mthca_table_find() will return the wrong address when the table entry being searched for is exactly at the beginning of a sglist entry (other than the first), because it uses >= when it should use >. Example: assume we have 2 entries in scatterlist, 4K each, offset is 4K. The current code will return first entry + 4K when we really want the second entry. In particular this means mapping an FMR on a memfree HCA may end up writing the page table into the wrong place, leading to memory corruption and also causing the HCA to use an incorrect address translation table. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 30c4cf577fb5b68c16e5750d6bdbd7072e42b279 Author: David L Stevens Date: Thu Jan 4 12:31:14 2007 -0800 [IPV4/IPV6]: Fix inet{,6} device initialization order. It is important that we only assign dev->ip{,6}_ptr only after all portions of the inet{,6} are setup. Otherwise we can receive packets before the multicast spinlocks et al. are initialized. Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 0d630cc0a6cb8ad544b5913a26ff1349ed7c8587 Author: Gerrit Renker Date: Thu Jan 4 12:25:16 2007 -0800 [TCP]: Use old definition of before This reverts the new (unambiguous) definition of the TCP `before' relation. As pointed out in an example by Herbert Xu, there is existing code which implicitly requires the old definition in order to work correctly. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 44f9a2fdc48ccb8bb510b6e1210bf15b3e10afdb Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Thu Jan 4 12:17:44 2007 -0800 [NETFILTER]: ebtables: don't compute gap before checking struct type We cannot compute the gap until we know we have a 'struct ebt_entry' and not 'struct ebt_entries'. Failure to check can cause crash. Tested-by: Santiago Garcia Mantinan Acked-by: Al Viro Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bbdc176a2f39913063aaaf95bc27e4b18fd14953 Author: Martin Josefsson Date: Thu Jan 4 12:16:54 2007 -0800 [NETFILTER]: nf_nat: fix MASQUERADE crash on device down Check the return value of nfct_nat() in device_cmp(), we might very well have non NAT conntrack entries as well (Netfilter bugzilla #528). Signed-off-by: Martin Josefsson Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c9386cfddc11e331fa7c860cccaedc2ae8f459f8 Author: Patrick McHardy Date: Thu Jan 4 12:16:06 2007 -0800 [NETFILTER]: New connection tracking is not EXPERIMENTAL anymore Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c68b8b687f9e3afff14b88327e17901fff0478ca Author: Patrick McHardy Date: Thu Jan 4 12:15:34 2007 -0800 [NETFILTER]: Fix routing of REJECT target generated packets in output chain Packets generated by the REJECT target in the output chain have a local destination address and a foreign source address. Make sure not to use the foreign source address for the output route lookup. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e5b5ef7d2b3fa364cb03407c432ae9979657aa6c Author: Dmitry Mishin Date: Thu Jan 4 12:14:41 2007 -0800 [NETFILTER]: compat offsets size change Used by compat code offsets of entries should be 'unsigned int' as entries array size has this dimension. Signed-off-by: Dmitry Mishin Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3948ec9406f9a60a43d63f23f6f5284db6529b9c Author: John Keller Date: Fri Dec 22 11:50:04 2006 -0600 ACPI: Altix: ACPI _PRT support Provide ACPI _PRT support for SN Altix systems. The SN Altix platform does not conform to the IOSAPIC IRQ routing model, so a new acpi_irq_model (ACPI_IRQ_MODEL_PLATFORM) has been defined. The SN platform specific code sets acpi_irq_model to this new value, and keys off of it in acpi_register_gsi() to avoid the iosapic code path. Signed-off-by: John Keller Signed-off-by: Len Brown commit b119dc3f992183a04e508fc0a09f550eb19bf30e Author: David Brownell Date: Thu Jan 4 13:07:04 2007 +0100 i2c: Migration aids for i2c_adapter.dev removal Flag i2c_adapter.dev for removal after userspace tools get upgraded, and include a near-term code migration aid to facilitate this: - The class device gets the name attribute it should have had. This was previously (wrongly) associated with the i2c_adapter.dev node. Sysfs based tools and libraries can start converting right away. - Issue a warning for legacy adapter drivers that don't provide any physical device node; so systems with those drivers will know to fix this problem earlier. This is one of a series of patches to help the I2C stack become a better citizen of the Linux Driver Model world. Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit 999445d4372812f361807b76411c158099e8e93e Author: Vitaly Wool Date: Thu Jan 4 13:07:03 2007 +0100 i2c-pnx: Add entry to MAINTAINERS Add me to MAINTAINERS for i2c-pnx. Signed-off-by: Vitaly Wool Signed-off-by: Jean Delvare commit 6c566fb7b3cda741dd6ed60c7d6aae0e17c9c8fe Author: Vitaly Wool Date: Thu Jan 4 13:07:03 2007 +0100 i2c-pnx: Fix interrupt handler, get rid of EARLY config option This fixes two issues raised by David Brownell on the i2c list: << Someone needs to update i2c-pnx.c to handle the IRQ handler doesn't expect pt_regs (gone now for a while), and so it doesn't try to reference "mudule_init()" if I2C isn't initialized "early". For that matter, to get rid of that _option_ to initialize then, and always init that driver with subsystem_init() ... it's common with embedded systems to need I2C access to tweak a GPIO expander or do some other work when bringing up drivers, that's not specific to USB stacks. >> Signed-off-by: Vitaly Wool Signed-off-by: Jean Delvare commit 69e4d94818cabf44d845b9f4b46d88de6e518dcf Author: Jiri Kosina Date: Wed Jan 3 23:03:14 2007 +0100 HID: fix help texts in Kconfig The help text for CONFIG_HID might imply for someone that it's necessary to enable it for any keyboard or mouse attached to the system. This is obviously not correct, so fix it to avoid confusing the users. Signed-off-by: Jiri Kosina commit c96c9d7b618806a0b9256503cec2755291d60cf6 Author: Russell King Date: Fri Dec 22 17:09:16 2006 +0000 Fix some ARM builds due to HID brokenness HID it defaults to 'y'. When you have input deselected, this causes the kernel to fail to link. Fix it by making it depend on INPUT. Signed-off-by: Russell King Signed-off-by: Jiri Kosina commit a26b498c96f87130559005151539f5fd9e43fff6 Author: David Brownell Date: Tue Dec 26 14:45:26 2006 -0800 MMC: at91 mmc linkage updates Linker level tweaks for the AT91 MMC driver: - fix a wrongly-exported symbol - move probe() to init section - move remove() to exit section When this driver is statically linked, this patch shrinks the driver's runtime I-space footprint by over 20% (950 bytes). Signed-off-by: David Brownell Signed-off-by: Pierre Ossman commit 3947a3907f9cb88ebd492b6348a251036c4e81c7 Author: Kyungmin Park Date: Thu Jan 4 07:03:16 2007 +0100 ARM: OMAP: fix MMC workqueue changes fix OMAP MMC workqueue in recent workqueue change Signed-off-by: Kyungmin Park Signed-off-by: Tony Lindgren Signed-off-by: Pierre Ossman commit 63ea998a26d4e03d390fbe31818cc552994d16fd Author: Benjamin Herrenschmidt Date: Wed Jan 3 18:54:43 2007 -0800 [SUNGEM]: PHY updates & pause fixes (#2) This patch adds support for a few more PHYs used by Apple and fixes advertising and detecting of Pause (we were missing setting the bit in MII_ADVERTISE and weren't testing in LPA for all PHYs). Note that I currently only advertise pause, not asymetric pause. I don't know for sure the details there, I suppose I should read a bit more 802.3 references, and I don't now what sungem is capable of, but I noticed the PCS code (originated from you) does the same. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David S. Miller commit f9af1d9deaaffe6803dec693748498886915d766 Author: David S. Miller Date: Wed Jan 3 18:51:54 2007 -0800 [SOUND] Sparc CS4231: Use 64 for period_bytes_min This matches what the ISA cs4231 driver uses. Tested by Georg Chini. Signed-off-by: David S. Miller commit 7f18ba6248625a587559ed1206d12ccaa3ad045e Author: Adrian Bunk Date: Wed Jan 3 18:48:13 2007 -0800 [X25]: proper prototype for x25_init_timers() This patch adds a proper prototype for x25_init_timers() in include/net/x25.h Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 5e7c001c6279f38b15fef5369496fe1043765727 Author: Mariusz Kozlowski Date: Tue Jan 2 15:24:30 2007 -0800 [AF_NETLINK]: module_put cleanup This patch removes redundant argument check for module_put(). Signed-off-by: Mariusz Kozlowski Signed-off-by: David S. Miller commit 22e700502380b80cc81a44e219282762429ebe71 Author: Christoph Hellwig Date: Tue Jan 2 15:22:30 2007 -0800 [XFRM_USER]: avoid pointless void ** casts All ->doit handlers want a struct rtattr **, so pass down the right type. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 9c2440bbe82892c8e3cd541632ac71bd765757a3 Author: Alexey Dobriyan Date: Tue Jan 2 00:42:00 2007 -0800 [NETFILTER] xt_hashlimit.c: fix typo Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 60903f2c6616939afd0335b49697beeb7219657e Author: Adrian Bunk Date: Tue Jan 2 00:35:48 2007 -0800 [NET] drivers/net/loopback.c: convert to module_init() This patch converts drivers/net/loopback.c to using module_init(). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit ee74baa7d83e9e0c2fdaff8122ee9cefd06cddc5 Author: David S. Miller Date: Mon Jan 1 20:51:53 2007 -0800 [PKTGEN]: Convert to kthread API. Based upon a suggestion from Christoph Hellwig. This fixes various races in module load/unload handling too. Signed-off-by: David S. Miller commit 3136dcb3cd6e5b4ed4bd34d422f8cdeec4da6836 Author: dean gaudet Date: Mon Jan 1 19:39:09 2007 -0800 [NET]: ifb double-counts packets Signed-off-by: dean gaudet Signed-off-by: David S. Miller commit d35a1b9e10481c9f1d3b87e778a0f1f6a0a2dd48 Author: Georg Chini Date: Tue Jan 2 21:28:17 2007 -0800 [SOUND] Sparc CS4231: Fix IRQ return value and initialization. SBUS: Change IRQ-handler return value from 0 to IRQ_HANDLED and fix some initialisation problems. Change period_bytes_min from 4096 to 256 to allow driver to work with low latency (VOIP) applications. Hope this does not break EBUS. Signed-off-by: Georg Chini Signed-off-by: David S. Miller commit 9c5b0ce43d0e4e4799c6cdc77c5ed7a95b763035 Author: Jens Axboe Date: Wed Jan 3 18:15:20 2007 +0100 [PATCH] ide-cd maintainer Alan agreed to take over casual maintenance of the ide-cd atapi cdrom driver, so I'm happy to sign it over to him. Alan, I hope the address is the one you want to use. I also changed the list to linux-ide as that seems more appropriate. Signed-off-by: Jens Axboe Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 2e11c207b029cfaf57159cabac4b002204445258 Author: Jens Axboe Date: Wed Jan 3 08:10:35 2007 +0100 [PATCH] cdrom: set default timeout to 7 seconds It's a known fact that Windows times out commands after 7 seconds, so drives generally try and respond if they can before that happens. We default to 5 seconds, which sometimes is a bit too short. Jeremy Higdon reported here: http://lkml.org/lkml/2007/1/1/145 that his drive takes longer than 5 seconds for a "read track information" command, later confirming that it is about 6.7 seconds. So just do the sane thing and change the default command timeout to 7 seconds to avoid other surprises. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 03c1c39680f949e0a944d540949b2d3d6887cdc0 Author: Andrew Vasquez Date: Wed Dec 13 19:20:33 2006 -0800 [SCSI] qla2xxx: Update version number to 8.01.07-k4. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 96ca5cad09edd86da9c8fd613c9406cdf978cd6d Author: Andrew Vasquez Date: Wed Dec 13 19:20:32 2006 -0800 [SCSI] qla2xxx: Use generic isp_ops.fw_dump() function. Rather than a direct call, as was done in the case of a RISC-paused state within the ISP24xx interrupt handler. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 07f31805e1fa98f802f60433cdd1c0461120ef0e Author: Andrew Vasquez Date: Wed Dec 13 19:20:31 2006 -0800 [SCSI] qla2xxx: Perform a fw-dump when an ISP23xx RISC-paused state is detected. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 0c8c39af1699227e5a5d13e54a71f93347fe4f61 Author: Andrew Vasquez Date: Wed Dec 13 19:20:30 2006 -0800 [SCSI] qla2xxx: Correct reset handling logic. - honor ISP24XX NVRAM settings for lip-reset, full-login-lip, and device-reset. - correct LIP_FULL_LOGIN mailbox command issuance. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 8bc69e7dc307d6195d92fa87da1fcbae6e5dda69 Author: Andrew Vasquez Date: Wed Dec 13 19:20:29 2006 -0800 [SCSI] qla2xxx: Correct IOCB queueing mechanism for ISP54XX HBAs. Original code would incorrectly use non-24xx code-paths. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 4346b14942dbb65e5d4fa7ec0e6567c39861ae6c Author: Andrew Vasquez Date: Wed Dec 13 19:20:28 2006 -0800 [SCSI] qla2xxx: Detect GPSC capabilities within a fabric. Disable subsequent GPSC queries if Fabric Management services do not support the operation. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 71ea9949a307e92fd5f8b4107814014464f38f91 Author: Andrew Vasquez Date: Wed Dec 13 19:20:27 2006 -0800 [SCSI] qla2xxx: Use proper prep_ms_iocb() function during GFPN_ID. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit cdfc82ade68ca11aafc900c56ef2be2b4aea8f58 Author: Andrew Vasquez Date: Wed Dec 13 19:20:26 2006 -0800 [SCSI] qla2xxx: Correct endianess issue while interrogating MS status. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 87b2380fcc6ff97c6ff5afd66ff50e94e6188d6b Author: Andrew Vasquez Date: Wed Dec 13 19:20:25 2006 -0800 [SCSI] qla2xxx: Don't log trace-control async-events. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 9ef3c10e2009d8479b27e3ff39a7779fbca5711c Author: James Bottomley Date: Wed Dec 13 09:19:49 2006 -0600 [SCSI] seagate: remove BROKEN tag Apparently the driver compiles and runs, so tidy up some macro warnings and bring it back as unBROKEN. Signed-off-by: James Bottomley commit 4ed381ee559ebfab32d3b21896c204992c36179a Author: James Bottomley Date: Mon Dec 11 09:47:06 2006 -0600 [SCSI] scsi_transport_spi: fix sense buffer size error The code does this: unsigned char sense[SCSI_SENSE_BUFFERSIZE]; ... scsi_normalize_sense(sense, sizeof(*sense), sshdr) however the sizeof will return 1 not 96 which means the sense data will have no valid ASC/ASCQ values. Fix by putting the correct sense size. The only affected case for this would have been the DV buffer sanity check failure, which is fortunately quite rare. Signed-off-by: James Bottomley commit 8bcc24127be12967588db0ad0e614be937ee1d5a Author: Matthew Wilcox Date: Thu Dec 7 19:29:27 2006 -0700 [SCSI] Add missing completion to scsi_complete_async_scans() If either scsi_complete_async_scans() is called a second time before the first call has finished, or a host scan is started while scsi_complete_async_scans() is still sleeping, it would fail to wake up the other task, which would sleep forever. I've changed the kernel-doc to make it clear that scsi_complete_async_scans() only guarantees that scans which started before it was called are guaranteed to have finished when it returns. I considered making it wait until all scans are completed, but it can't guarantee that no more scans will start before it returns anyway, and it runs the risk of confusing other callers of scsi_complete_async_scans() for hosts actually scanning. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 23be331d9e5077edf07d73813f870d3b895c8593 Author: Adrian Bunk Date: Fri Nov 24 02:46:01 2006 +0100 [SCSI] qla2xxx: make qla2x00_reg_remote_port() static Signed-off-by: Adrian Bunk Acked-by: Andrew Vasquez Signed-off-by: James Bottomley commit d8dafd8ccde06f16095234dc3addf52b511805b3 Author: Randy Dunlap Date: Tue Nov 21 13:50:47 2006 -0800 [SCSI] advansys: wrap PCI table inside ifdef CONFIG_PCI The Advansys ISA/EISA/PCI driver has a compile error when CONFIG_PCI=n, so wrap the pci_device_id table inside ifdef CONFIG_PCI. drivers/scsi/advansys.c: At top level: drivers/scsi/advansys.c:18219: error: array type has incomplete element type drivers/scsi/advansys.c:18221: error: 'PCI_ANY_ID' undeclared here (not in a function) make[2]: *** [drivers/scsi/advansys.o] Error 1 make[1]: *** [drivers/scsi] Error 2 make: *** [drivers] Error 2 Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley commit 7523c4dd9923cab748dad9b79d0165e118e3d03b Author: OGAWA Hirofumi Date: Thu Jan 4 01:21:28 2007 +0900 [PATCH] x86_64: Fix dump_trace() If caller passed the tsk, we should use it to validate a stack ptr. Otherwise, sysrq-t and other debugging stuff doesn't work. Signed-off-by: OGAWA Hirofumi Signed-off-by: Linus Torvalds commit 43c8f12f9f4a7cb4140693fc9baed35a02165898 Author: Dave Jones Date: Tue Jan 2 23:42:16 2007 -0500 [CPUFREQ] longhaul: Kill off warnings introduced by recent changes. Bunch of unused vars + one case where gcc isn't smart enough. Signed-off-by: Dave Jones commit 76ff28c941e73a0de0db12bd5009124e8dc010e7 Author: Guillaume Chazarain Date: Tue Jan 2 19:58:13 2007 +0100 [CPUFREQ] Uninitialized use of cmd.val in arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c:acpi_cpufreq_target() cmd.val was used uninitialized on the line below. Signed-off-by: Guillaume Chazarain Acked-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 24ebead82bbf9785909d4cf205e2df5e9ff7da32 Author: Rafa³ Bilski Date: Mon Jan 1 23:49:34 2007 +0100 [CPUFREQ] Longhaul - Always guess FSB This is patch that solves Ebox mini PC issue and make FSB code more specification compilant. At start guess_fsb function is guessing 200MHz FSB too. It is better to make it in this way because, thanks to this function, driver will fail for bogus FSB values caused by bogus multiplier value. For PowerSaver processors we can't depend on Max / MinMHzFSB because these values are only used for PowerSaver 2.0 and 3.0. Most processors on which Longhaul is used are PowerSaver 1.0 only. I'm changing code for older CPU's too, but not so much as previously, and this code was already used for Ezra. Using MinMHzBR for Ezra-T is outside spec. It is for voltage scaling purpose and don't have to be equal to minmult (but it is). Same for Nehemiah (it isn't for sure). Added mult - current multiplier value. Signed-off-by: Rafa³ Bilski Signed-off-by: Dave Jones commit 7b37b064c294af350c462f77d7a9a44485a93684 Author: akpm@osdl.org Date: Tue Jan 2 14:44:31 2007 -0800 [AGPGART] drivers/char/agp/sgi-agp.c: check kmalloc() return value drivers/char/agp/sgi-agp.c: check kmalloc() return value Signed-off-by: Amit Choudhary Signed-off-by: Dave Jones Signed-off-by: Andrew Morton commit fe5f8e2a1c5c040209c598a28e19c55f30e1040d Author: Zhu Yi Date: Wed Dec 20 16:11:58 2006 +0800 [PATCH] ipw2100: Fix dropping fragmented small packet problem The rx_data.header struct is ieee80211_hdr_4addr. If a wireless frame uses ieee80211_hdr_3addr header and is less than 6 bytes, it will be discarded. This is not likely going to happen for normal packets (since there is TCP, IP headers). But if fragmentation is used, there will be such small trailing packets. And they will be lost for ever. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 3eb546057dd65ec75c900c9948684ffd5e617630 Author: Zhu Yi Date: Mon Dec 18 17:26:13 2006 +0800 [PATCH] ieee80211: WLAN_GET_SEQ_SEQ fix (select correct region) The WLAN_GET_SEQ_SEQ(seq) macro in ieee80211 is selecting the wrong region. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d02b161eda65528ad3e89d642e416c265c17ceb8 Author: Philipp Zabel Date: Tue Jan 2 21:06:57 2007 +0100 [ARM] 4081/1: Add definition for TI Sync Serial Protocol Of the possible SSP frame formats (FRF bits in SSCR0), only SSCR0_PSP is defined. Other possible formats are Motorola SPI (0<<4), TI SSP (1<<4) and Microwire (2<<4). Attached patch adds a definition SSCR0_TISSP. This mode is used for the sound codec attached to the PXA272 SSP1 of some HTC PDA phones. Signed-off-by: Philipp Zabel Signed-off-by: Russell King commit f566b2b22d89c4785f25e6e4d60163b5ae6251f4 Author: Philipp Zabel Date: Tue Jan 2 20:59:38 2007 +0100 [ARM] 4080/1: Fix for the SSCR0_SlotsPerFrm macro The SSCR0_SlotsPerFrm macro writes a 3-bit value to bits [2:0], while the correct location of FRDC in SSCR0 is at bits [26:24]. This patch adds the missing "<< 24". Signed-off-by: Philipp Zabel Signed-off-by: Russell King commit 8e140362f71ed801c69c5df63a68fc2cd07da3a9 Author: Russell King Date: Tue Jan 2 23:40:30 2007 +0000 [ARM] Fix VFP initialisation issue for SMP systems When we install the handlers for context switching, we must enable VFP on all CPU cores, otherwise undefined (and random) effects occur. Signed-off-by: Russell King commit c6b33cc4e9882b44f1b0c36396f420076e04a4e2 Author: Segher Boessenkool Date: Tue Jan 2 11:41:47 2007 +0530 [PATCH] Fix insta-reboot with "i386: Relocatable kernel support" Commit 968de4f02621db35b8ae5239c8cfc6664fb872d8 ("i386: Relocatable kernel support") caused problems for people with old binutils versions that didn't mark ".text.*" sections automatically allocated. So we should use .section command to specifically mark .text.head section as AX (allocatable and executable) to solve the problem. This should be unnecessary with binutils 2.15 and later, which is already three years old, but it doesn't hurt supporting older toolchains where possible. Signed-off-by: Vivek Goyal Acked-by: Jean Delvare Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Linus Torvalds commit 9883a13c72dbf8c518814b6091019643cdb34429 Author: Parag Warudkar Date: Tue Jan 2 21:09:31 2007 +0100 [PATCH] selinux: fix selinux_netlbl_inode_permission() locking do not call a sleeping lock API in an RCU read section. lock_sock_nested can sleep, its BH counterpart doesn't. selinux_netlbl_inode_permission() needs to use the BH counterpart unconditionally. Compile tested. From: Ingo Molnar added BH disabling, because this function can be called from non-atomic contexts too, so a naked bh_lock_sock() would be deadlock-prone. Boot-tested the resulting kernel. Signed-off-by: Parag Warudkar Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 85de3d9bc779c198f8667cffc291b0ecad082b5e Author: Amit Choudhary Date: Tue Jan 2 21:16:10 2007 +0000 [JFFS2] Fix error-path leak in summary scan Signed-off-by: Amit Choudhary Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit ec8acb6904fabb8e741f741ec99bb1c18f2b3dee Author: Jens Axboe Date: Tue Jan 2 18:32:11 2007 +0100 [PATCH] cfq-iosched: merging problem Two issues: - The final return 1 should be a return 0, otherwise comparing cfqq is a noop. - bio_sync() only checks the sync flag, while rq_is_sync() checks both for READ and sync. The latter is what we want. Expand the bio check to include reads, and relax the restriction to allow merging of async io into sync requests. In the future we want to clean up the SYNC logic, right now it means both sync request (such as READ and O_DIRECT WRITE) and unplug-on-issue. Leave that for later. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit dc3c3377f03634d351fafdfe35b237b283586c04 Author: Alan Date: Tue Jan 2 11:58:34 2007 +0000 [PATCH] libata: fix combined mode This is a slight variant on the patch I posted December 16th to fix libata combined mode handling. The only real change is that we now correctly also reserve BAR1,2,4. That is basically a neatness issue. Jeff was unhappy about two things 1. That it didn't work in the case of one channel native one channel legacy. This is a silly complaint because the SFF layer in libata doesn't handle this case yet anyway. 2. The case where combined mode is in use and IDE=n. In this case the libata quirk code reserves the resources in question correctly already. Once the combined mode stuff is redone properly (2.6.21) then the entire mess turns into a single pci_request_regions() for all cases and all the ugly resource hackery goes away. I'm sending this now rather than after running full test suites so that it can get the maximal testing in a short time. I'll be running tests on this after lunch. Signed-off-by: Alan Cox Cc: Jeff Garzik Acked-by: Alessandro Suardi Acked-by: Theodore Tso Signed-off-by: Linus Torvalds commit 0b67d94659a72734584a40b5e113e9261f97ae8c Author: Len Brown Date: Fri Dec 22 21:18:56 2006 -0500 ACPI: asus_acpi: new MAINTAINER Signed-off-by: Len Brown commit e82c354bb26a9da6fed1fadf7082d68055b7d1db Author: Len Brown Date: Thu Dec 21 01:29:59 2006 -0500 ACPI: fix section mis-match build warning Dunno why this pops out in only in the allmodconfig build. Though the warning is accurate, all the callers of the flagged non __init function are __init, this is not a functional change. WARNING: vmlinux - Section mismatch: reference to .init.data:acpi_sci_flags from .text between 'acpi_sci_ioapic_setup' (at offset 0xc010f0a 6) and 'acpi_gsi_to_irq' WARNING: vmlinux - Section mismatch: reference to .init.text:mp_override_legacy_irq from .text between 'acpi_sci_ioapic_setup' (at offset 0 xc010f0de) and 'acpi_gsi_to_irq' WARNING: vmlinux - Section mismatch: reference to .init.data:acpi_sci_override_gsi from .text between 'acpi_sci_ioapic_setup' (at offset 0x c010f0e4) and 'acpi_gsi_to_irq' Signed-off-by: Len Brown commit 9a654b522234615a76717f35365ca4a8beb757df Author: Doug Chapman Date: Thu Dec 21 12:11:43 2006 -0500 ACPI: increase ACPI_MAX_REFERENCE_COUNT for larger systems We have some new larger ia64 systems in HP that trip over the ACPI_MAX_REFERENCE_COUNT limit which triggers a large number of these debug messages: ACPI Warning (utdelete-0397): Large Reference Count (XXX) in object e0000a0ff6797ab0 [20060707] This was increased once in the past as described in this very brief thread: http://www.mail-archive.com/linux-acpi@vger.kernel.org/msg00890.html Signed-off-by: Doug Chapman Signed-off-by: Len Brown commit c6e19194b6e1a565f8fe18d56d509e9892c32ee1 Author: Guillaume Chazarain Date: Sun Dec 24 22:19:02 2006 +0100 ACPI: EC: move verbose printk to debug build only The recent EC cleanup left a printk enabled on handler evaluation resulting in a bunch of messages on normal operation, like so: ACPI: EC: evaluating _Q60 Signed-off-by: Len Brown commit 27c5d745ac685c3f48cebd7a9c07707755b4b711 Author: Richard Purdie Date: Sat Dec 30 15:40:11 2006 +0000 backlight: fix backlight_device_register compile failures Fix breakage from commit 519ab5f2be65b72cf12ae99c89752bbe79b44df6 which didn't update all references to backlight_device_register causing compile failures. Signed-off-by: Richard Purdie Signed-off-by: Len Brown commit e22a9a8b703d05f13366c3f2e7e1aa0550bb5ca6 Author: Leonard NorrgÃ¥rd Date: Mon Jan 1 19:00:54 2007 +0200 [PATCH] sound: hda: detect ALC883 on MSI K9A Platinum motherboards (MS-7280) Recognize the Realtek ALC883 chip on MSI K9A Platinum motherboards (model no. MS-7280), enabling full sound capabilities. Signed-off-by: Leonard NorrgÃ¥rd Signed-off-by: Linus Torvalds commit 36f696cd7ffc82c48bf5826bbb4e005370fb9c6a Author: Linus Torvalds Date: Mon Jan 1 10:55:45 2007 -0800 Revert "[PATCH] x86_64: fix boot hang caused by CALGARY_IOMMU_ENABLED_BY_DEFAULT" This reverts commit a9622f6219ce58faba1417743bf3078501eb3434. Now that the Calgary code apparently detects itself properly, it's not needed any more. Signed-off-by: Linus Torvalds commit 669df1b478803f49a356528d290af7bf442eb3be Author: Linus Torvalds Date: Sun Dec 31 16:53:20 2006 -0800 Linux 2.6.20-rc3 ...because it's always a good idea to cut a release *before* you go out to party and get drunk. Remember kids: "Don't Drink and Release!" commit 241ceee0b442c69226fb882d61d9b9785743898f Author: Oleg Nesterov Date: Sun Dec 24 23:30:44 2006 +0300 [PATCH] restore ->pdeath_signal behaviour Commit b2b2cbc4b2a2f389442549399a993a8306420baf introduced a user- visible change: ->pdeath_signal is sent only when the entire thread group exits. While this change is imho good, it may break things. So restore the old behaviour for now. Signed-off-by: Oleg Nesterov To: Albert Cahalan Cc: Eric W. Biederman Cc: Andrew Morton Cc: Linus Torvalds Cc: Ingo Molnar Cc: Qi Yong Cc: Roland McGrath Signed-off-by: Linus Torvalds commit b836267aa79c1c5e23e00d9cec047b6870ae0db1 Author: Martin Willi Date: Thu Dec 28 21:27:48 2006 -0800 [XFRM]: Algorithm lookup using .compat name Installing an IPsec SA using old algorithm names (.compat) does not work if the algorithm is not already loaded. When not using the PF_KEY interface, algorithms are not preloaded in xfrm_probe_algs() and installing a IPsec SA fails. Signed-off-by: Martin Willi Acked-by: Herbert Xu Signed-off-by: David S. Miller commit cb4db4c22182163f66325053331a4e7096f663cd Author: David Woodhouse Date: Thu Dec 28 21:21:55 2006 -0800 [NET]: Don't export linux/random.h outside __KERNEL__. Don't add it there please; add it lower down inside the existing #ifdef __KERNEL__. You just made the _userspace_ net.h include random.h, which then fails to compile unless was already included. Signed-off-by: David Woodhouse Signed-off-by: David S. Miller commit e44c39bd8478bf9e41cbc611c74b5879a7b29f58 Author: David S. Miller Date: Thu Dec 28 21:14:52 2006 -0800 [NET]: Add memory barrrier to netif_poll_enable() When a driver writer calls this, they generally expect that all previous stores and modifications they've made will be visible before netif_poll_enable() executes, so ensure this. Noticed by Ben H. Signed-off-by: David S. Miller commit f4060c0dbbe9ad7b8c0aeefa142398c8d3468bac Author: David S. Miller Date: Thu Dec 28 21:43:51 2006 -0800 [SPARC64]: Handle ISA devices with no 'regs' property. And this points out that the return value from isa_dev_get_resource() and the 'pregs' arg to isa_dev_get_irq() are totally unused. Based upon a patch from Richard Mortimer Signed-off-by: David S. Miller commit 55d0bef587aa438fe5e8bed2ecce8611ebcd4c1a Author: David S. Miller Date: Thu Dec 28 21:16:40 2006 -0800 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit e3a411a3dfc1d633504aa63efab32b7e00318454 Author: David S. Miller Date: Thu Dec 28 21:01:32 2006 -0800 [SPARC64]: Fix of_iounmap() region release. We need to pass in the resource otherwise we cannot release the region properly. We must know whether it is an I/O or MEM resource. Spotted by Eric Brower. Signed-off-by: David S. Miller commit 6fc5bae797a6632bbccdd49a1b6a96121368a4b9 Author: David S. Miller Date: Thu Dec 28 21:00:23 2006 -0800 [SPARC64]: Fix "mem=xxx" handling. We were not being careful enough. When we trim the physical memory areas, we have to make sure we don't remove the kernel image or initial ramdisk image ranges. Signed-off-by: David S. Miller commit 91f6e54b6e534edbf6208e1c750fff9e0491dfcc Author: Alexey Dobriyan Date: Fri Dec 29 16:50:08 2006 -0800 [PATCH] fuse: fix typo Signed-off-by: Thomas Hisch Signed-off-by: Alexey Dobriyan Cc: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbc1333a347745bd55844649c19eb7d28f383a84 Author: Jan Andersson Date: Fri Dec 29 16:50:04 2006 -0800 [PATCH] sparc32: add offset in pci_map_sg() Add sg->offset to sg->dvma_address in pci_map_sg() on sparc32. Without the offset, transfers to buffers that do not begin on a page boundary will not work as expected. Signed-off-by: Jan Andersson Cc: "David S. Miller" Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8018c27b26af56af18eb8b2dc600eba825792d8f Author: Ingo Molnar Date: Fri Dec 29 16:50:01 2006 -0800 [PATCH] kvm: fix GFP_KERNEL allocation in atomic section in kvm_dev_ioctl_create_vcpu() fix an GFP_KERNEL allocation in atomic section: kvm_dev_ioctl_create_vcpu() called kvm_mmu_init(), which calls alloc_pages(), while holding the vcpu. The fix is to set up the MMU state in two phases: kvm_mmu_create() and kvm_mmu_setup(). (NOTE: free_vcpus does an kvm_mmu_destroy() call so there's no need for any extra teardown branch on allocation/init failure here.) Signed-off-by: Ingo Molnar Cc: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55a54f79e091d52c3c2835985c347ea4d2e1c21f Author: Avi Kivity Date: Fri Dec 29 16:49:58 2006 -0800 [PATCH] KVM: Fix oops on oom __free_page() doesn't like a NULL argument, so check before calling it. A NULL can only happen if memory is exhausted during allocation of a memory slot. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c68876fd2846d2aaf9770276db244b46f2bf52c7 Author: Nguyen Anh Quynh Date: Fri Dec 29 16:49:54 2006 -0800 [PATCH] KVM: Rename some msrs No need to append _MSR to msr names, a prefix should suffice. Signed-off-by: Nguyen Anh Quynh Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8d13ea28bcb63baf69aba84b61cad4c3ff7adb9 Author: Avi Kivity Date: Fri Dec 29 16:49:51 2006 -0800 [PATCH] KVM: More msr misery These msrs are referenced by benchmarking software when pretending to be an Intel cpu. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bab1f5dda3443043cc8fe68c5ae75530339f28f Author: Avi Kivity Date: Fri Dec 29 16:49:48 2006 -0800 [PATCH] KVM: Move common msr handling to arch independent code Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 671d6564796e0c90398aab30f89b5e48fc5a3fbe Author: Avi Kivity Date: Fri Dec 29 16:49:45 2006 -0800 [PATCH] KVM: Implement a few system configuration msrs Resolves sourceforge bug 1622229 (guest crashes running benchmark software). Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09db28b8a3765a7ec35eba80420c71a7973f5a88 Author: Yoshimi Ichiyanagi Date: Fri Dec 29 16:49:41 2006 -0800 [PATCH] KVM: Initialize kvm_arch_ops on unload The latest version of kvm doesn't initialize kvm_arch_ops in kvm_init(), which causes an error with the following sequence. 1. Load the supported arch's module. 2. Load the unsupported arch's module.$B!!(B(loading error) 3. Unload the unsupported arch's module. You'll get the following error message after step 3. "BUG: unable to handle to handle kernel paging request at virtual address xxxxxxxx" The problem here is that the unsupported arch's module overwrites kvm_arch_ops of the supported arch's module at step 2. This patch initializes kvm_arch_ops upon loading architecture specific kvm module, and prevents overwriting kvm_arch_ops when kvm_arch_ops is already set correctly. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9058ecd3cd72634cf548588ce79b3f225c9ca32 Author: Avi Kivity Date: Fri Dec 29 16:49:37 2006 -0800 [PATCH] KVM: Simplify is_long_mode() Instead of doing tricky stuff with the arch dependent virtualization registers, take a peek at the guest's efer. This simlifies some code, and fixes some confusion in the mmu branch. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e885461f02259d75e7480a70d291d2d8aaa938e Author: Avi Kivity Date: Fri Dec 29 16:49:34 2006 -0800 [PATCH] KVM: Use boot_cpu_data instead of current_cpu_data current_cpu_data invokes smp_processor_id(), which is inadvisable when preemption is enabled. Switch to boot_cpu_data instead. Resolves sourceforge bug 1621401. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b7a52a459cb09864b736265bee1af5cef42af66 Author: Lennert Buytenhek Date: Fri Dec 29 16:49:30 2006 -0800 [PATCH] Update CREDITS and MAINTAINERS entries for Lennert Buytenhek Signed-off-by: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44854add66811124a5667466245b6824f751143a Author: Sergei Shtylyov Date: Fri Dec 29 16:49:26 2006 -0800 [PATCH] PIIX/SLC90E66: PIO mode fallback fix The fallback to PIO mode in the hwif->dma_check() handler doesn't work in the Intel PIIX and SMsC SLC90E66 IDE drivers because: - config_drive_for_dma() calls the hwif->speedproc() handler with a wrong mode number (unbiased by XFER_PIO_0) in case of the PIO fallback; - hwif->tuneproc() handler doesn't really set the drive's own speed (this is not fixed as yet). Signed-off-by: Sergei Shtylyov Cc: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 242ce41fc92214c3430495edd43783c3ba3dcd2b Author: Sergei Shtylyov Date: Fri Dec 29 16:49:18 2006 -0800 [PATCH] PIIX: remove check for broken MW DMA mode 0 There's no need to check in piix_config_drive_for_dma() for broken MW DMA mode 0 as this mode is not supported by the driver (it sets hwif->mwdma_mask to 0x6), and hence can't be selected by ide_dma_speed(). (Alan sayeth "Probably right but if not you've got a subtle corruptor. Should at least stick a BUG_ON mode 0 setting right close when the mode is set.") Signed-off-by: Sergei Shtylyov Cc: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 755cd90029b61b96816b8ac0ab6a33a197f842d0 Author: Andrew Morton Date: Fri Dec 29 16:49:14 2006 -0800 [PATCH] lockdep: printk warning fix kernel/lockdep.c: In function `lookup_chain_cache': kernel/lockdep.c:1339: warning: long long unsigned int format, u64 arg (arg 2) kernel/lockdep.c:1344: warning: long long unsigned int format, u64 arg (arg 2) Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2a5d2f9b3e6011093a7587e0e18d653fb050a36 Author: Arnaud Patard (Rtp Date: Fri Dec 29 16:49:10 2006 -0800 [PATCH] spi_s3c24xx_gpio: use right header Russel King recently reminded us that one shouldn't use asm/arch/hardware.h but one should use asm/hardware.h. Unfortunately, the spi_s3c24xx_gpio driver is using the wrong header. This patch is fixing that. Signed-off-by: Arnaud Patard Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 829ad751ab3e369ee85af83f1dee45640d3e2d29 Author: Mike Frysinger Date: Fri Dec 29 16:49:07 2006 -0800 [PATCH] respect srctree/objtree in Documentation/DocBook/Makefile The KERNELDOC and DOCPROC variables are relative to the $(srctree)/$(objtree) and expect to be run only from there ... attached patch adds proper srctree/objtree prefixes to both variables. Acked-by: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 089e34b60033863549fbe561d31ac8c778a20e7f Author: Andrew Morton Date: Fri Dec 29 16:49:04 2006 -0800 [PATCH] cpuset procfs warning fix fs/proc/base.c:1869: warning: initialization discards qualifiers from pointer target type fs/proc/base.c:2150: warning: initialization discards qualifiers from pointer target type Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 918d3f90e8d5657491024f64427e9a5ea632d284 Author: Shantanu Goel Date: Fri Dec 29 16:48:59 2006 -0800 [PATCH] Buglet in vmscan.c Fix a rather obvious buglet. Noticed while instrumenting the VM using /proc/vmstat. Cc: Christoph Lameter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 463cab36926a39d5e690664ebb5560a8b119fc71 Author: Kyungmin Park Date: Fri Dec 29 16:48:56 2006 -0800 [PATCH] ARM: OMAP: fix missing header on apollon board Fix apollon board compiler error Signed-off-by: Kyungmin Park Signed-off-by: Tony Lindgren Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f24516240c78760d0b19e6160dcab893ef81918 Author: Kyungmin Park Date: Fri Dec 29 16:48:51 2006 -0800 [PATCH] ARM: OMAP: fix GPMC compiler errors Fix GPMC compiler errors on OMAP2 Signed-off-by: Kyungmin Park Signed-off-by: Tony Lindgren Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de4fa99266b2e1f6771644b9b50f33fe8f82d728 Author: David Brownell Date: Fri Dec 29 16:48:47 2006 -0800 [PATCH] SPI/MTD: mtd_dataflash oops prevention Return a fault code if the Dataflash driver runs into a "no device present" error when the MISO line has a pulldown (it currently expects a pullup), so that rmmod won't oops. Signed-off-by: David Brownell Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17c65d69906a6e2e6df4822b00a9e5e00e35ea9a Author: David Brownell Date: Fri Dec 29 16:48:44 2006 -0800 [PATCH] m25p80 build fixes (with MTD debug) Fix build issues that show up with the m25p80 SPI flash driver when building with MTD debug enabled. Signed-off-by: David Brownell Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b1badf5d9ddfc46ad075ca5bfc465972c85cc7c Author: David Brownell Date: Fri Dec 29 16:48:39 2006 -0800 [PATCH] SPI: define null tx_buf to mean "shift out zeroes" Some issues were recently turned up with the current specification of what it means for spi_transfer.tx_buf to be null, as part of transfers which are (from the SPI protocol driver perspective) pure reads. Specifically, that it seems better to change the TX behaviour there from "undefined" to "will shift zeroes". This lets protocol drivers (like the ads7846 driver) depend on that behavior. It's what most controller drivers in the tree are already doing (with one exception and one case of driver wanting-to-oops), it's what Microwire hardware will necessarily be doing, and it removes an issue whereby certain security audits would need to define such a value anyway as part of removing covert channels. This patch changes the specification to require shifting zeroes, and updates all currently merged SPI controller drivers to do so. Signed-off-by: David Brownell Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6e88e671ac12888df2d533dd4ddef705431a32a Author: Al Viro Date: Fri Dec 29 16:48:35 2006 -0800 [PATCH] page_mkclean_one(): fix call to set_pte_at() (akpm: macros are wonderful) Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f5486ecf7d510595c2af630aae31ed5846bdbeb Author: Randy Dunlap Date: Fri Dec 29 16:48:31 2006 -0800 [PATCH] cciss: build with PROC_FS=n RAID_UNKNOWN is used even when PROC_FS=n, so move it outside of the CONFIG_PROC_FS block. drivers/block/cciss.c:1910: error: 'RAID_UNKNOWN' undeclared (first use in this function) Signed-off-by: Randy Dunlap Cc: Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcb4ddb46a4c66d64d091e7ffa951b2aa1ba537f Author: Dimitri Gorokhovik Date: Fri Dec 29 16:48:28 2006 -0800 [PATCH] MM: SLOB is broken by recent cleanup of slab.h Recent cleanup of slab.h broke SLOB allocator: the routine kmem_cache_init has now the __init attribute for both slab.c and slob.c. This routine cannot be removed after init in the case of slob.c -- it serves as a timer callback. Provide a separate timer callback routine, call it once from kmem_cache_init, keep the __init attribute on the latter. Signed-off-by: Dimitri Gorokhovik Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 131612dfe7923bd0ce5f82d6ed8303a7ef96e574 Author: Dimitri Gorokhovik Date: Fri Dec 29 16:48:24 2006 -0800 [PATCH] ramfs breaks without CONFIG_BLOCK ramfs doesn't provide the .set_dirty_page a_op, and when the BLOCK layer is not configured in, 'set_page_dirty' makes a call via a NULL pointer. Signed-off-by: Dimitri Gorokhovik Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3f99f8ba8cbd2d4e231b767b3d6236a555da38c Author: Akinobu Mita Date: Fri Dec 29 16:48:20 2006 -0800 [PATCH] module: fix mod_sysfs_setup() return value mod_sysfs_setup() doesn't return error when kobject_add_dir() failed. Signed-off-by: Akinobu Mita Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96ceeaf4ab66315a5149296bb58d8e1a9e6f2f6d Author: Andreas Schwab Date: Fri Dec 29 16:48:16 2006 -0800 [PATCH] Fix compilation of via-pmu-backlight Signed-off-by: Andreas Schwab Cc: "Yu, Luming" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9414232fa0cc28e2f51b8c76d260f2748f7953fc Author: Ingo Molnar Date: Fri Dec 29 16:48:13 2006 -0800 [PATCH] sched: fix cond_resched_softirq() offset Remove the __resched_legal() check: it is conceptually broken. The biggest problem it had is that it can mask buggy cond_resched() calls. A cond_resched() call is only legal if we are not in an atomic context, with two narrow exceptions: - if the system is booting - a reacquire_kernel_lock() down() done while PREEMPT_ACTIVE is set But __resched_legal() hid this and just silently returned whenever these primitives were called from invalid contexts. (Same goes for cond_resched_locked() and cond_resched_softirq()). Furthermore, the __legal_resched(0) call was buggy in that it caused unnecessarily long softirq latencies via cond_resched_softirq(). (which is only called from softirq-off sections, hence the code did nothing.) The fix is to resurrect the efficiency of the might_sleep checks and to only allow the narrow exceptions. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d449db98d5d7d90f29f9f6e091b0e1d996184df1 Author: Mikael Pettersson Date: Fri Dec 29 16:48:09 2006 -0800 [PATCH] fix mrproper incompleteness include/linux/utsrelease.h and include/linux/version.h aren't removed any more by mrproper in kernel 2.6.20-rc2. The patch below fixes this. The definition of MRPROPER_FILES looks weird: generated-headers looks like a misspelling of generated_headers, but that one is a Makefile target, not a variable or a file, so I don't see how including it in MRPROPER_FILES could have any effect. Signed-off-by: Mikael Pettersson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f59c140f8387d32b8fe137eb02da40630b618e8 Author: Tilman Schmidt Date: Fri Dec 29 16:48:03 2006 -0800 [PATCH] Update to Documentation/tty.txt on line disciplines While trying to develop a line discipline I found a couple of things worth mentioning in Documentation/tty.txt which weren't, so I decided to add them. It would be nice if someone more knowledgeable than me in that area would look over them, in case I got something wrong. Signed-off-by: Tilman Schmidt Cc: Alan Cox Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfe7c09ac2be2a89aa46bb23d480d9d908e8c041 Author: Jiri Slaby Date: Fri Dec 29 16:48:00 2006 -0800 [PATCH] Char: isicom, eliminate spinlock recursion Many spinlock recursion was in the isicom driver. Eliminate it. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10f549fa1538849548787879d96bbb3450f06117 Author: Soeren Sonnenburg Date: Fri Dec 29 16:47:46 2006 -0800 [PATCH] make fn_keys work again on power/macbooks The apple fn keys don't work anymore with 2.6.20-rc1. The reason is that USB_HID_POWERBOOK appears in several files although USB_HIDINPUT_POWERBOOK is the thing to be used. The patch fixes this. Cc: Greg KH Cc: Dmitry Torokhov Cc: Benjamin Herrenschmidt Cc: Jiri Kosina Cc: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8a82d7b0a22495023e90856e58639412a5ee3f7 Author: Eric Moore Date: Fri Dec 29 16:47:43 2006 -0800 [PATCH] MAINTAINERS: email addr change for Eric Moore Update to maintainers list. My employer has changed the domain from lsil to lsi. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d79f1b4677cfe503f721000529f1462ca7b6f6d Author: Michael S. Tsirkin Date: Fri Dec 29 16:47:37 2006 -0800 [PATCH] IB/mthca: Fix FMR breakage caused by kmemdup() conversion Commit bed8bdfd ("IB: kmemdup() cleanup") introduced one bad conversion to kmemdup() in mthca_alloc_fmr(), where the structure allocated and the structure copied are not the same size. Revert this back to the original kmalloc()/memcpy() code. Reported-by: Dotan Barak . Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31f87cf48d54f5930e6e8e827989c18b0069c94a Author: Jiri Slaby Date: Fri Dec 29 16:47:34 2006 -0800 [PATCH] Char: mxser, fix oops when removing opened tty_driver->owner is not set, so if somebody remove mxser_module, it might oops (and doesn't tell the user: no way, it's in use). Set the .owner value. Cc: Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76e6a1d6607e5b58003bb87e3b3220d5fdb7568d Author: Randy Dunlap Date: Fri Dec 29 16:47:29 2006 -0800 [PATCH] pci/probe: fix macro that confuses kernel-doc Don't have macros between a function's kernel-doc block and the function definition. This is not valid for kernel-doc. Warning(/var/linsrc/linux-2.6.20-rc1-git8//drivers/pci/probe.c:653): No description found for parameter 'IORESOURCE_PCI_FIXED' Signed-off-by: Randy Dunlap Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29263fbf9ecfcf294efdd8a51aa9191f423515ed Author: Thomas Meyer Date: Fri Dec 29 16:47:25 2006 -0800 [PATCH] Add .gitignore file for relocs in arch/i386 Due to the changes to make the kernel relocateable a new file is created during the build process. [jirislaby@gmail.com: The .gitigonre was intended to be in arch/ subtree] Signed-off-by: Thomas Meyer Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96ac5913f4e45c6a1b98350f2c0a8bb3abe2646a Author: KAMEZAWA Hiroyuki Date: Fri Dec 29 16:47:20 2006 -0800 [PATCH] fix oom killer kills current every time if there is memory-less-node take2 constrained_alloc(), which is called to detect where oom is from, checks passed zone_list(). If zone_list doesn't include all nodes, it thinks oom is from mempolicy. But there is memory-less-node. memory-less-node's zones are never included in zonelist[]. contstrained_alloc() should get memory_less_node into count. Otherwise, it always thinks 'oom is from mempolicy'. This means that current process dies at any time. This patch fix it. Signed-off-by: KAMEZAWA Hiroyuki Cc: Paul Jackson Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4e6bdbb426d1ecd9e4587f22115f8d0d426d21f Author: Ingo Molnar Date: Fri Dec 29 16:47:14 2006 -0800 [PATCH] rcu: rcutorture suspend fix Fix suspend hang: rcutorture threads need to be nofreeze. Signed-off-by: Ingo Molnar Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52e88f5d4a6b06f3a945728dd3bc403632afe069 Author: Ingo Molnar Date: Fri Dec 29 16:47:10 2006 -0800 [PATCH] change WARN_ON back to "BUG: at ..." WARN_ON() ever triggering is a kernel bug. Do not try to paper over this fact by suggesting to the user that this is 'only' a warning, as the following recent commit does: commit 30e25b71e725b150585e17888b130e3324f8cf7c Author: Jeremy Fitzhardinge Date: Fri Dec 8 02:36:24 2006 -0800 [PATCH] Fix generic WARN_ON message A warning is a warning, not a BUG. ( it might make sense to rename BUG() to CRASH() and BUG_ON() to CRASH_ON(), but that does not change the fact that WARN_ON() signals a kernel bug. ) i and others objected to this change during lkml review: http://marc.theaimsgroup.com/?l=linux-kernel&m=116115160710533&w=2 still the change slipped upstream - grumble :) Also, use the standard "BUG: " format to make it easier to grep logs and to make it easier to google for kernel bugs. Signed-off-by: Ingo Molnar Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76598ebe081b04132f272440183e0aeb6507a079 Author: Judith Lebzelter Date: Fri Dec 29 16:47:06 2006 -0800 [PATCH] powerpc iseries link error in allmodconfig Choose rpa_vscsi.c over iseries_vscsi.c when building both pseries and iseries. This fixes a link error. Signed-off-by: Judith Lebzelter Acked-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ebb1101c556b1915ff041655e629a072e64dcda Author: Zach Brown Date: Fri Dec 29 16:47:02 2006 -0800 [PATCH] Fix lock inversion aio_kick_handler() lockdep found a AB BC CA lock inversion in retry-based AIO: 1) The task struct's alloc_lock (A) is acquired in process context with interrupts enabled. An interrupt might arrive and call wake_up() which grabs the wait queue's q->lock (B). 2) When performing retry-based AIO the AIO core registers aio_wake_function() as the wake funtion for iocb->ki_wait. It is called with the wait queue's q->lock (B) held and then tries to add the iocb to the run list after acquiring the ctx_lock (C). 3) aio_kick_handler() holds the ctx_lock (C) while acquiring the alloc_lock (A) via lock_task() and unuse_mm(). Lockdep emits a warning saying that we're trying to connect the irq-safe q->lock to the irq-unsafe alloc_lock via ctx_lock. This fixes the inversion by calling unuse_mm() in the AIO kick handing path after we've released the ctx_lock. As Ben LaHaise pointed out __put_ioctx could set ctx->mm to NULL, so we must only access ctx->mm while we have the lock. Signed-off-by: Zach Brown Signed-off-by: Suparna Bhattacharya Acked-by: Benjamin LaHaise Cc: "Chen, Kenneth W" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43cdff92ad47e0ca024c8a07d29f9bb6119e759c Author: Sebastien Dugué Date: Fri Dec 29 16:46:53 2006 -0800 [PATCH] Fix IPMI watchdog set_param_str() using kstrdup set_param_str() cannot use kstrdup() to duplicate the parameter. That's fine when the driver is compiled as a module but it sure is not when built into the kernel as the kernel parameters are parsed before the kmalloc slabs are setup. Signed-off-by: Sebastien Dugué Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c9d3df5e88ad7db23f5b22f4341c39722a904a4 Author: Richard Purdie Date: Sat Dec 30 16:08:50 2006 +0100 [ARM] 4078/1: Fix ARM copypage cache coherency problems If PG_dcache_dirty is set for a page, we need to flush the source page before performing any copypage operation using a different virtual address. This fixes the copypage implementations for XScale, StrongARM and ARMv6. This patch fixes segmentation faults seen in the dynamic linker under the usage patterns in glibc 2.4/2.5. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit b0b1d60a64054697ef828e0565f006cc0f823590 Author: Dan Williams Date: Fri Dec 29 01:30:24 2006 +0100 [ARM] 4077/1: iop13xx: fix __io() macro Since iop13xx defines the PCI I/O spaces with physical resource addresses the __io macro needs to perform the physical to virtual conversion. I incorrectly assumed that this would be handled by ioremap, but drivers (like e1000) directly dereference the address returned from __io. Signed-off-by: Dan Williams Signed-off-by: Russell King commit 4cc2f7a84d64d25a16bb9383148c1467284e2356 Author: Paul Brook Date: Thu Dec 28 01:54:16 2006 +0100 [ARM] 4074/1: Flat loader stack alignment The ARM EABI requires doubleword (8-byte) stack alignment at all public entry points. The patch below makes the bFLT loader honour this. It's always safe to start with a doubleword aligned stack so it doesn't seem worth making this conditional on CONFIG_AEABI. Paul Signed-off-by: Paul Brook Signed-off-by: Russell King commit 431d2cd99f9721ad09f859dc65895f30385cc5c6 Author: Arnaud Patard Date: Wed Dec 27 22:56:44 2006 +0100 [ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h As reminded in http://lkml.org/lkml/2006/12/23/26, one should use asm/hardware.h and asm/irq.h but absent-minded devs like me tends to use asm/arch/hardware.h and/or asm/arch/irqs.h. This patch aims at preventing such things. In order to make it work, I had to modify asm-arm/irq.h too so that it can be included from assembly files. Also, as a side effect, I had to modify some headers who were using the asm/arch/hardware.h or asm/arch/irqs.h. Signed-off-by: Arnaud Patard Signed-off-by: Russell King commit eb3b4783ba664fd80d337ae6649f6489493b2387 Author: Ben Dooks Date: Sun Dec 24 10:08:09 2006 +0100 [ARM] 4071/1: S3C24XX: Documentation update Add documentation for the following items: - new machines (AML M5900, VMTS, NexVision) - updated rtc section - removed comments about mtd cvs - added spi section - led section Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 0c48d314b16f485e89e0f13fa37c9bd98b6a064d Author: Nicolas Pitre Date: Fri Dec 22 18:52:56 2006 +0100 [ARM] 4066/1: correct a comment about PXA's sched_clock range Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit ae2aa9073acf8f810f18297f586e03d4b2b97588 Author: Arnaud Patard Date: Fri Dec 22 18:44:42 2006 +0100 [ARM] 4065/1: S3C24XX: dma printk fixes The commit 505788cccbb96cd496b646594c8a5fcdc26bc2d9 in linus kernel tree introduced some printks (for debugging ?) which are flooding the logs on my h1940. This patch replace them with pr_debug calls. Signed-off-by: Arnaud Patard Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 35108fb9b3f291b594a8019cb9188da6be2f7990 Author: Nicolas Pitre Date: Fri Dec 22 18:36:30 2006 +0100 [ARM] 4064/1: make pxa_get_cycles() static ... and fix a comment as well. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 2ca2c570b0e38b0c214426b1708ee1b0c3a5067d Author: Lennert Buytenhek Date: Fri Dec 22 14:33:18 2006 +0100 [ARM] 4063/1: ep93xx: fix IRQ_EP93XX_GPIO?MUX numbering Fix incorrect IRQ numbering in arch-ep93xx/irqs.h (source: Applied Data Systems 2.6.17 kernel tree.) Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 97d552e35d9404df3254e1157df3340e4e2eaedc Author: Stefan Richter Date: Fri Dec 29 23:47:04 2006 +0100 ieee1394: sbp2: fix bogus dma mapping Need to use a PCI device, not a FireWire host device. Problem found by Andreas Schwab, mistake pointed out by Benjamin Herrenschmidt. http://ozlabs.org/pipermail/linuxppc-dev/2006-December/029595.html Signed-off-by: Stefan Richter Tested-by: Andreas Schwab commit b2bb550c4a10c44e99fe469cfaee81e2e3109994 Author: Stefan Richter Date: Thu Dec 28 19:57:49 2006 +0100 ieee1394: sbp2: pass REQUEST_SENSE through to the target Delete some incorrect code, left over from the initial driver submission in March 2001. SBP-2 targets should provide sense data via the SBP-2 status block (autosense). We have to pass the REQUEST_SENSE command through to targets which don't implement autosense, if there are any, and to accomodate application clients which use this command. Signed-off-by: Stefan Richter commit 264166e604a7e14c278e31cadd1afb06a7d51a11 Author: Rafa³ Bilski Date: Sun Dec 24 14:04:23 2006 +0100 [CPUFREQ] Longhaul - Fix up powersaver assumptions. ACPI PM2 register was fallback for "Longhaul ver. 1" CPU's. My assumption that this register isn't present at "PowerSaver" motherboards is so far true, but current code will not work correctly in other case. There are three possible supports: ACPI C3, PM2 and northbridge. That was my assumption that ACPI C3 and northbridge is for PS and northbridge and PM2 is for V1. In current code we can only check if it is ACPI support or not by port22_en. So remove port22_en and add longhaul_flags. If USE_ACPI_C3 and USE_NORTHBRIDGE are both clear then it means ACPI PM2 support. Also change order of support probe from ACPI C3, PM2, northbridge to ACPI C3, northbridge, ACPI PM2. Paranoid protection against port 0x22 cast as ACPI PM2 register. Bit 1 clear in such case - lockup on AGP DMA. And obvious (now) fixup for do_powersaver. Use cx->address only for ACPI C3 ("PowerSaver" processor using PM2 support). Signed-off-by: Rafa¿ Bilski Signed-off-by: Dave Jones commit 7658cc289288b8ae7dd2c2224549a048431222b3 Author: Linus Torvalds Date: Fri Dec 29 10:00:58 2006 -0800 VM: Fix nasty and subtle race in shared mmap'ed page writeback The VM layer (on the face of it, fairly reasonably) expected that when it does a ->writepage() call to the filesystem, it would write out the full page at that point in time. Especially since it had earlier marked the whole page dirty with "set_page_dirty()". But that isn't actually the case: ->writepage() does not actually write a page, it writes the parts of the page that have been explicitly marked dirty before, *and* that had not got written out for other reasons since the last time we told it they were dirty. That last caveat is the important one. Which _most_ of the time ends up being the whole page (since we had called "set_page_dirty()" on the page earlier), but if the filesystem had done any dirty flushing of its own (for example, to honor some internal write ordering guarantees), it might end up doing only a partial page IO (or none at all) when ->writepage() is actually called. That is the correct thing in general (since we actually often _want_ only the known-dirty parts of the page to be written out), but the shared dirty page handling had implicitly forgotten about these details, and had a number of cases where it was doing just the "->writepage()" part, without telling the low-level filesystem that the whole page might have been re-dirtied as part of being mapped writably into user space. Since most of the time the FS did actually write out the full page, we didn't notice this for a loong time, and this needed some really odd patterns to trigger. But it caused occasional corruption with rtorrent and with the Debian "apt" database, because both use shared mmaps to update the end result. This fixes it. Finally. After way too much hair-pulling. Acked-by: Nick Piggin Acked-by: Martin J. Bligh Acked-by: Martin Michlmayr Acked-by: Martin Johansson Acked-by: Ingo Molnar Acked-by: Andrei Popa Cc: High Dickins Cc: Andrew Morton , Cc: Peter Zijlstra Cc: Segher Boessenkool Cc: David Miller Cc: Arjan van de Ven Cc: Gordon Farquharson Cc: Guillaume Chazarain Cc: Theodore Tso Cc: Kenneth Cheng Cc: Tobias Diedrich Signed-off-by: Linus Torvalds commit 1cfe2014263a879691d0262935a2649c97a02559 Author: Dave Jones Date: Thu Dec 28 22:30:16 2006 -0500 [CPUFREQ] longhaul: Fix up unreachable code. Signed-off-by: RafaÅ‚ Bilski Signed-off-by: Dave Jones commit 7f02d687b44aba0cfc393102ea1ccc78eadf8a04 Author: Thomas Hellstrom Date: Wed Dec 27 13:16:49 2006 +0100 [AGPGART] Fix PCI-posting flush typo. Unfortunately there was a typo in one of the patches I sent, (The one now committed to the agpgart tree). It may cause a bus error on i810 type hardware. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Jones commit 92efc15241ceebc23451691971897020e8563a70 Author: Zhen Wei Date: Fri Dec 8 00:48:17 2006 -0700 ocfs2: export heartbeat thread pid via configfs The patch allows the ocfs2 heartbeat thread to prioritize I/O which may help cut down on spurious fencing. Most of this will be in the tools - we can have a pid configfs attribute and let userspace (ocfs2_hb_ctl) calls the ioprio_set syscall after starting heartbeat, but only cfq scheduler supports I/O priorities now. Signed-off-by: Zhen Wei Signed-off-by: Mark Fasheh commit 7f4a2a97e324e8c826d1d983bc8efb5c59194f02 Author: Mark Fasheh Date: Mon Dec 11 11:06:36 2006 -0800 ocfs2: always unmap in ocfs2_data_convert_worker() Mmap-heavy clustered workloads were sometimes finding stale data on mmap reads. The solution is to call unmap_mapping_range() on any down convert of a data lock. Signed-off-by: Mark Fasheh commit 6c2aad0567e693f9588d0a0683f96ed872fb4641 Author: Mark Fasheh Date: Tue Dec 19 15:25:52 2006 -0800 ocfs2: ignore NULL vfsmnt in ocfs2_should_update_atime() This can come from NFSD. Signed-off-by: Mark Fasheh commit 564f8a3228879d6962edb3432d01bcd7499a67ec Author: Mark Fasheh Date: Thu Dec 14 13:01:05 2006 -0800 ocfs2: Allow direct I/O read past end of file ocfs2_direct_IO_get_blocks() was incorrectly returning -EIO for a direct I/O read whose start block was past the end of the file allocation tree. Fix things so that we return a hole instead. do_direct_IO() will then notice that the range start is past eof and return a short read. While there, remove the unused vbo_max variable. Signed-off-by: Mark Fasheh commit 0333394bff439c3fb09264303de42e7038b3e709 Author: Mark Fasheh Date: Thu Dec 14 15:29:25 2006 -0800 ocfs2: don't print error in ocfs2_permission() Errors from generic_permission() can happen in valid cases and shouldn't be reported. Signed-off-by: Mark Fasheh commit aa77015c4e94cb1d30680646c163d7ae1f93f941 Author: Michael Holzheu Date: Thu Dec 28 00:35:36 2006 +0100 [S390] cio: fix stsch_reset. Copy inline assembly of stsch and add "memory" to clobber list in order to prevent gcc from optimizing away the checking of the global variable "pgm_check_occured". Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 524a237e4512038d6e07ad3b2e44e70902b76738 Author: Melissa Howland Date: Thu Dec 28 00:35:25 2006 +0100 [S390] Change max. buffer size for monwriter device. Reduce the max. buffer size for the monwriter device to prevent a possible problem with the z/VM monitor service. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit 69f7e75a9d45e5eaca16917a8d0dedf76149f13f Author: Jean Delvare Date: Sat Dec 23 14:11:03 2006 -0300 V4L/DVB (5010): Cx88: Fix leadtek_eeprom tagging reference to .init.text: from .text between 'cx88_card_setup' (at offset 0x68c) and 'cx88_risc_field' Caused by leadtek_eeprom() being declared __devinit and called from a non-devinit context. Signed-off-by: Jean Delvare Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 70bdd9c83a6e757e5fb9cc3195f27d2c1d0a4c39 Author: Alexey Dobriyan Date: Tue Dec 26 07:43:25 2006 -0300 V4L/DVB (5012): Usbvision fix: It was using "&&" instead "&" Signed-off-by: Alexey Dobriyan Signed-off-by: Mauro Carvalho Chehab commit 0b778a56e342e0e1d274298ad47d9af22a9de633 Author: Mauro Carvalho Chehab Date: Wed Dec 27 14:04:09 2006 -0200 V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1 include/media/ir-common.h:78: error: field 'work' has incomplete type drivers/media/common/ir-functions.c: In function 'ir_rc5_timer_end': drivers/media/common/ir-functions.c:301: error: 'jiffies' undeclared (first use in this function) drivers/media/common/ir-functions.c:301: error: (Each undeclared identifier is reported only once) drivers/media/common/ir-functions.c:301: error: for each function it appears in.) drivers/media/common/ir-functions.c:347: error: 'HZ' undeclared (first use in this function) Signed-off-by: Mauro Carvalho Chehab commit 9a2816c1c4ca7f5d02de4339589913701251dd5a Author: David Brownell Date: Wed Dec 27 09:53:44 2006 -0300 V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch - CAFE_CCIC needs to depend on PCI, else "allyesconfig" breaks on systems without PCI - em28xx-video can't udelay(2500) else "allyesconfig" breaks on systems that refuse to spin that long (I saw it on ARM) Signed-off-by: David Brownell Signed-off-by: Mauro Carvalho Chehab commit 5f1693fe82b499a3306993020ef14011ed0420d0 Author: Akinobu Mita Date: Wed Dec 20 10:08:56 2006 -0300 V4L/DVB (4997): Bttv: delete duplicated ioremap() ioremap() is called twice to same resource. The returen value of first one is not error-checked. second one is complely ignored. Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit 25821400359d2b3daacfb93303944211b8411ac3 Author: Akinobu Mita Date: Wed Dec 20 10:07:30 2006 -0300 V4L/DVB (4996): Msp3400: fix kthread_run error check The return value of kthread_run() should be checked by IS_ERR(). Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit 054afee4736677a00982f6414a983dec8ee511db Author: Akinobu Mita Date: Wed Dec 20 10:04:00 2006 -0300 V4L/DVB (4995): Vivi: fix kthread_run() error check The return value of kthread_run() should be checked by IS_ERR(). Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit 72f678c30185df18ac38ef14c9045d139c2263bc Author: Akinobu Mita Date: Wed Dec 20 10:03:53 2006 -0300 V4L/DVB (4994): Vivi: fix use after free in list_for_each() Freeing data including list_head in list_for_each() is not safe. Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit b331daa03cd949b1b0a4b761b4b4a92d71f7d626 Author: Stephan Berberig Date: Wed Dec 20 09:37:05 2006 -0300 V4L/DVB (4992): Fix typo in saa7134-dvb.c Fix a typo (use_frontent -> use_frontend) in saa7134-dvb.c. Signed-off-by: Stephan Berberig Signed-off-by: Mauro Carvalho Chehab commit d4f60baf7827c6a46b7ee2ed0a2a32a373febfcb Author: Adrian Bunk Date: Wed Dec 20 09:34:32 2006 -0300 V4L/DVB (4991): Cafe_ccic.c: fix NULL dereference We shouldn't dereference "cam" when we already know it's NULL. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit d82d418a3af4d7d07151f9d45ca20f2ce61289a0 Author: Amit Choudhary Date: Wed Dec 20 09:30:45 2006 -0300 V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak Free previously allocated memory (in array elements) if kmalloc() returns NULL in submit_urbs(). Signed-off-by: Amit Choudhary Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit cb2c7b4927c8f376b7ba9557978d8c59ed472664 Author: Hans Verkuil Date: Wed Dec 20 06:51:37 2006 -0300 V4L/DVB (4988): Cx2341x audio_properties is an u16, not u8 This bug broke the MPEG audio mode controls. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 83aaf13c5ba5e1e244339807d8a752808e763cdd Author: Hans Verkuil Date: Mon Dec 18 13:40:23 2006 -0300 V4L/DVB (4984): LOG_STATUS should show the real temporal filter value. The temporal filter is forced off when scaling. The VIDIOC_LOG_STATUS handler still showed the old temporal filter. It is now consistent with the real temporal filter value. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 12b896e436a3b1bc83856962388ae1ab154742a6 Author: Hans Verkuil Date: Mon Dec 18 13:37:50 2006 -0300 V4L/DVB (4983): Force temporal filter to 0 when scaling to prevent ghosting. Change the code to unconditionally turn off the temporal filter when scaling. If the window is not full screen the filter will introduce a nasty ghosting effect. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b331def2d382d7a51c379f336fe80ef87d6674e3 Author: Hans Verkuil Date: Mon Dec 18 13:18:28 2006 -0300 V4L/DVB (4982): Fix broken audio mode handling for line-in in msp3400. The wrong matrix was used when an external input was selected instead of the tuner input. The rxsubchans field was also not initialized to STEREO for an external input. And finally the msp34xxg_detect_stereo() should not try to detect stereo for an external input, that code is for the tuner input only. Together these bugs made it hit 'n miss whether you ever got stereo out of the msp3400 for an external input. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 315eb962d2e9438bc10da2488b604f04a1c0006f Author: Mauro Carvalho Chehab Date: Sun Dec 17 23:30:47 2006 -0300 V4L/DVB (4980): Fixes bug 7267: PAL/60 is not working On cx88 driver, sampling rate should be at chroma subcarrier freq (FSC). However, driver were programming wrong values for PAL/60, PAL/Nc and NTSC 4.43. This patch do the proper calculation. It also calculates htotal, hdelay and hactive constants, according with the sampling rate. It is tested with PAL/60 by Piotr Maksymuk and Olivier. Also tested with the already-supported standards. Test is still required for PAL/Nc. Signed-off-by: Mauro Carvalho Chehab commit ed00b41dc8bc286682d31ad64060ccc70513e90b Author: Dwaine Garden Date: Wed Dec 27 10:23:28 2006 -0200 V4L/DVB (4979): Fixes compilation when CONFIG_V4L1_COMPAT is not selected - SYSFS: Replaced all to_video_device(cd), video_device_create_file, video_device_remove_file and add the proper checks at create_file - Converted old norm values to V4L2 ones. - Robustness on sysfs hue/contrast/saturation queries. Additional check in order to return 0 if the driver is not opened. - Whitespace cleanups in usbvision-cards.c This patch merges two fixes by Thierry MERLE and Mauro Chehab, and adds additional checks. Signed-off-by: Dwaine Garden Signed-off-by: Mauro Carvalho Chehab commit 5ef35be42dfaa155e02718a9bd34cc341f327883 Author: Michael Krufky Date: Thu Dec 14 13:53:33 2006 -0300 V4L/DVB (4973): Dvb-core: fix printk type warning dvb_net.c: In function 'dvb_net_ule': dvb_net.c:628: warning: format '%#lx' expects type 'long unsigned int', but argument 3 has type 'u32' dvb_net.c:628: warning: format '%#lx' expects type 'long unsigned int', but argument 4 has type 'u32' Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit dedcefb085fe98a1feaf63590fe2fc7e0ecb1987 Author: Ang Way Chuang Date: Thu Dec 14 13:51:44 2006 -0300 V4L/DVB (4972): Dvb-core: fix bug in CRC-32 checking on 64-bit systems CRC-32 checking during ULE decapsulation always failed on x86_64 systems due to the size of a variable used to store CRC. This bug was discovered on Fedora Core 6 with kernel-2.6.18-1.2849. The i386 counterpart has no such problem. This patch has been tested on 64-bit system as well as 32-bit system. Signed-off-by: Ang Way Chuang Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 38284ba361d69eca34a3bfc553ebfac81fea2698 Author: Thierry MERLE Date: Fri Dec 15 16:46:53 2006 -0300 V4L/DVB (4970): Usbvision memory fixes - fix decompression buffer allocation not done at first driver open - simplification of USB sbuf allocation (use of usb_buffer_alloc) - replaced