commit db98e0b434a6265c451ffe94ec0a29b8d0aaf587 Author: Linus Torvalds Date: Thu Mar 15 17:20:01 2007 -0700 Linux 2.6.21-rc4 Signed-off-by: Linus Torvalds commit e7b0d26a86943370c04d6833c6edba2a72a6e240 Author: Alan Stern Date: Thu Mar 15 15:51:28 2007 -0400 [PATCH] sysfs: reinstate exclusion between method calls and attribute unregistration This patch (as869) reinstates the mutual exclusion between sysfs attribute method calls and attribute unregistration. The previously-reported deadlocks have been fixed, and this exclusion is by far the simplest way to avoid races during driver unbinding. The check for orphaned read-buffers has been moved down slightly, so that the remainder of a partially-read buffer will still be available to userspace even after the attribute has been unregistered. Signed-off-by: Alan Stern Cc: Hugh Dickins Cc: Cornelia Huck Cc: Oliver Neukum Signed-off-by: Linus Torvalds commit d9a9cdfb078d755e648d53ec25b7370f84ee5729 Author: Alan Stern Date: Thu Mar 15 15:50:34 2007 -0400 [PATCH] sysfs and driver core: add callback helper, used by SCSI and S390 This patch (as868) adds a helper routine for device drivers that need to set up a callback to perform some action in a different process's context. This is intended for use by attribute methods that want to unregister themselves or their parent device. Attribute method calls are mutually exclusive with unregistration, so such actions cannot be taken directly. Two attribute methods are converted to use the new helper routine: one for SCSI device deletion and one for System/390 ccwgroup devices. Signed-off-by: Alan Stern Cc: Hugh Dickins Cc: Cornelia Huck Cc: Oliver Neukum Signed-off-by: Linus Torvalds commit d2a900365b8963d7ca46f05d8e7176d1be3cc71d Author: broonie@sirena.org.uk Date: Wed Mar 14 19:49:15 2007 +0000 natsemi: Avoid IntrStatus lossage if RX state machine resets. This patch fixes the poll routine for the natsemi driver so that if the driver detects an RX state machine lockup then no interrupts will be lost while the driver recovers from that. Signed-Off-By: Mark Brown Signed-off-by: Jeff Garzik commit 069f8256362b7a17da532f0631cee73b4cfee65b Author: broonie@sirena.org.uk Date: Wed Mar 14 19:49:14 2007 +0000 natsemi: Fix NAPI for interrupt sharing The interrupt status register for the natsemi chips is clear on read and was read unconditionally from both the interrupt and from the NAPI poll routine, meaning that if the interrupt service routine was called (for example, due to a shared interrupt) while a NAPI poll was scheduled interrupts could be missed. This patch fixes that by ensuring that the interrupt status register is only read by the interrupt handler when interrupts are enabled from the chip. It also reverts a workaround for this problem from the netpoll hook and improves the trace for interrupt events. Thanks to Sergei Shtylyov for spotting the issue, Mark Huth for a simpler method and Simon Blake for testing resources. Signed-Off-By: Mark Brown Signed-off-by: Jeff Garzik commit 14fdd90ef2ec1878d6851ec4dd8d5abb2cef098c Author: broonie@sirena.org.uk Date: Wed Mar 14 19:49:13 2007 +0000 natsemi: Consistently use interrupt enable/disable functions The natsemi drivers include functions for enabling and disabling interrupts from the chip but these are not used in all code paths. This patch changes the code paths that touch the interrupt enable register to use the functions. In all cases this adds an extra PCI read to post the operation but since none of these are in fast paths this shouldn't be too much of a problem. Signed-Off-By: Mark Brown Signed-off-by: Jeff Garzik commit b58ecad8d6ca83e97cd2928a439efb49267539dc Author: Linsys Contractor Mithlesh Thukral Date: Tue Mar 13 04:15:06 2007 -0800 NetXen: Fix softlockup seen during hardware access NetXen: This will fix a softlock seen on some machines. The reason was too much time was spent waiting for hardware access to go through. Signed-off by: Mithlesh Thukral Signed-off-by: Jeff Garzik commit 8b902aea40544bc9e4de913b491dc3a3411fd5d0 Author: Linsys Contractor Mithlesh Thukral Date: Tue Mar 13 04:13:13 2007 -0800 NetXen: Bug fix for Jumbo frames on XG card NetXen: Set the MTU for the right port depending upon the port number for XG cards. Signed-off by: Mithlesh Thukral Signed-off-by: Jeff Garzik commit 2eb3e621c4e07e9e7200dbb66f0433b4caafb8e7 Author: Stephen Hemminger Date: Mon Mar 12 15:16:26 2007 -0700 skge: set mac address bonding fix When bonding does fail over it calls set_mac_address. When this happens as the result of another port going down, the phy_mutex that is common to both ports is held, so it deadlocks. Setting the address doesn't need to do anything that needs the phy_mutex, it already has the RTNL to protect against other admin actions. This change just disables the receiver to avoid any hardware confusion while address is changing. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 8ce5e3e45e01ffab38a9f03900181132b9068543 Author: Linus Torvalds Date: Wed Mar 14 17:50:48 2007 -0700 Disable NMI watchdog by default properly This reverts commit 6ebf622b2577c50b1f496bd6a5e8739e55ae7b1c and replaces it with one that actually works. Signed-off-by: Linus Torvalds commit 69300436ca382a4753044142ae3a2c8099e70215 Author: Al Viro Date: Wed Mar 14 09:20:40 2007 +0000 [PATCH] m68k dma-mapping: gfp_t annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 27d871833e37ce4ef9a4d8a153598da1b429a490 Author: Al Viro Date: Wed Mar 14 09:20:30 2007 +0000 [PATCH] paride endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ecb7524c5d85c04d1b396f80bf4c765db5f3f442 Author: Al Viro Date: Wed Mar 14 09:20:20 2007 +0000 [PATCH] kill bogus casts in amd64 uaccess.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7ccec1b94e456b01cbef7cfb1bc97e2b76f24ab5 Author: Al Viro Date: Wed Mar 14 09:20:10 2007 +0000 [PATCH] atl1 trivial endianness misannotations NB: driver is choke-full of code that will break on big-endian; as long as the hardware is onboard-only we can live with that, but sooner or later that'll need fixing. Signed-off-by: Al Viro Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 1be9ab056e94e23a307b8bfaacc38403b3b5a352 Author: Al Viro Date: Wed Mar 14 09:20:00 2007 +0000 [PATCH] ANSIfy powerpc floppy.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b87496aa493a540b9c084b16b73f915705ebdbcc Author: Al Viro Date: Wed Mar 14 09:19:50 2007 +0000 [PATCH] hid-core endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 82c05a13c9e0d782941f975eabf6c5a7928cc4d9 Author: Al Viro Date: Wed Mar 14 09:19:40 2007 +0000 [PATCH] cifs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit dfdcbcc426616811f069b741394ba8771dc58527 Author: Al Viro Date: Wed Mar 14 09:19:30 2007 +0000 [PATCH] C99 initializers, proper use of const in drivers/ps3 Signed-off-by: Al Viro Acked-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 23f28001f7858f0cbbcc8cc39d7a0a1346ed68e2 Author: Al Viro Date: Wed Mar 14 09:19:20 2007 +0000 [PATCH] qeth gfp_t annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4c1f2b316878edcbd3a71f7165190f1c1b008e1e Author: Al Viro Date: Wed Mar 14 09:19:10 2007 +0000 [PATCH] cciss endian annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit edceec3d6737ae2c901d9abc55f791cf3b42c470 Author: Al Viro Date: Wed Mar 14 09:19:00 2007 +0000 [PATCH] trivial ATA iomem annotations Signed-off-by: Al Viro Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit f0f0d0c691e13a67709ab3b43137ff83210c2c10 Author: Al Viro Date: Wed Mar 14 09:18:50 2007 +0000 [PATCH] sparc: nr_free_pages() is unsigned long Signed-off-by: Al Viro Acked-by: William Irwin Signed-off-by: Linus Torvalds commit abad95f7367b68ed010a3b9c4ad6ba3c9911c7fa Author: Al Viro Date: Wed Mar 14 09:18:40 2007 +0000 [PATCH] pasemi trivial iomem annotations Signed-off-by: Al Viro Acked-by: Olof Johansson Signed-off-by: Linus Torvalds commit 750b1b815c85557fba018417be52271e4ca6b02f Author: Al Viro Date: Wed Mar 14 09:18:30 2007 +0000 [PATCH] constant should be long Signed-off-by: Al Viro Acked-by: Olof Johansson Signed-off-by: Linus Torvalds commit a31e40f614788bbc07b3eb4fcf47a16299a4fe01 Author: Al Viro Date: Wed Mar 14 09:18:20 2007 +0000 [PATCH] dmfe trivial endianness annotations Signed-off-by: Al Viro Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 192cd59bd93a97fd7d46f13fa07dbe328ff33257 Author: Al Viro Date: Wed Mar 14 09:18:09 2007 +0000 [PATCH] fastcall still doesn't make sense in paravirt Andi had removed a bunch of those, but one more had creeped in... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 89952d133dfbca785ae37b7da13699e4a5e1fa93 Author: Al Viro Date: Wed Mar 14 09:17:59 2007 +0000 [PATCH] misc NULL noise Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0ae24bdedd289f5b1740404273ac5d9e20383f12 Author: Al Viro Date: Wed Mar 14 09:16:54 2007 +0000 [PATCH] rtc-cmos needs RTC_ALWAYS_BCD known Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a7124d799a674a276a566d602479c0a370274c8f Author: Al Viro Date: Wed Mar 14 09:16:44 2007 +0000 [PATCH] sparc: have dma-mapping.h include generic/dma-mapping-broken in non-PCI case Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a7c999114ecd0c69bd3970272b64d8842b765b21 Author: Al Viro Date: Wed Mar 14 09:16:34 2007 +0000 [PATCH] BLK_DEV_IDE_CELLEB dependency fix It's bool and it depends on IDE => should depend on IDE=y Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a033f35a2206e28af8109c62b403d940ba89d2b9 Author: Al Viro Date: Wed Mar 14 09:16:24 2007 +0000 [PATCH] include of asm/pgtable.h in nfsfh is bogus not needed and actually breaks build on frv, while we are at it Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 24b29dbcf382b12b58bc33fb4d0abb13d6ddc073 Author: Al Viro Date: Wed Mar 14 09:16:14 2007 +0000 [PATCH] m32r dma-mapping.h should simply include generic/dma-mapping-broken.h ... instead of trying to duplicate its bits Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 62577fa324991146ded3d16e7ef08e7a99d2ec7e Author: Al Viro Date: Wed Mar 14 09:16:04 2007 +0000 [PATCH] fix ipath_dma_free_coherent() prototype method gets u64, not dma_addr_t Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6df0187efc91867383195a78e262414d8843f1c9 Author: Al Viro Date: Wed Mar 14 09:15:54 2007 +0000 [PATCH] stacktrace doesn't work on uml and no, it's not the case of "let's pull bits from underlying architecture" Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ebf88a9e7bfd7251fa80888c29b60aa4c86e2941 Author: Al Viro Date: Wed Mar 14 09:05:01 2007 +0000 [PATCH] zatm __init abuse zatm_init() and zatm_start() should be __devinit (the former is not module init, despite the name - it's a helper for PCI ->probe()) Signed-off-by: Al Viro Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit c537b994505099b7197e7d3125b942ecbcc51eb6 Author: Al Viro Date: Wed Mar 14 09:04:51 2007 +0000 [PATCH] (uml) sparse flags for userland glue are missing $(CF) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit bb81e6050fdc0f2303b47d9300db232571e3e42a Author: Al Viro Date: Wed Mar 14 09:04:41 2007 +0000 [PATCH] appldata build fix PGALLOC_DMA is defined only if we have CONFIG_ZONE_DMA Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d8b3966e4c976dbf5f2fbe693b381305f7911e3d Author: Al Viro Date: Wed Mar 14 09:04:31 2007 +0000 [PATCH] const file_operations fallout Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit abf0437b420b1476b9afd56af69d1a725f51359c Author: Al Viro Date: Wed Mar 14 09:04:21 2007 +0000 [PATCH] ibmtr probe is __devinit, not __init used by ->attach() in pcmcia analog Signed-off-by: Al Viro Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 04ff97086b1a3237bbd1fe6390fa80fe75207e23 Author: Al Viro Date: Mon Mar 12 16:17:58 2007 +0000 [PATCH] sanitize security_getprocattr() API have it return the buffer it had allocated Acked-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c4823bce033be74c0fcfbcae2f1be0854fdc2e18 Author: Al Viro Date: Mon Mar 12 16:17:42 2007 +0000 [PATCH] fix deadlock in audit_log_task_context() GFP_KERNEL allocations in non-blocking context; fixed by killing an idiotic use of security_getprocattr(). Acked-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b36c3f84988eebf38acaccc756e05f6b70e333ab Author: Sunil Mushran Date: Mon Mar 12 13:25:44 2007 -0700 ocfs2_dlm: Add missing locks in dlm_empty_lockres __dlm_lockres_unused() expects the caller to take the lockres spinlock. Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit 3fca0894a4b5e52c278421b04435b88e32b423ad Author: Sunil Mushran Date: Mon Mar 12 13:24:34 2007 -0700 ocfs2_dlm: Missing get/put lockres in dlm_run_purge_lockres In some circumstances, this was causing us to reference freed memory. Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit afdf04ea098139e86147f63aad9c383cad3b6f37 Author: Joel Becker Date: Mon Mar 5 15:49:49 2007 -0800 configfs: add missing mutex_unlock() d_alloc() failure in configfs_register_subsystem() would fail to unlock the mutex taken above. Reorganize the exit path to ensure the unlock happens. Reported-by: Akinobu Mita Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 03f981cf2ec95dd8bc43d2ecccaec4e83c8375e2 Author: Joel Becker Date: Thu Jan 4 14:54:41 2007 -0800 ocfs2: add some missing address space callbacks Under load, OCFS2 would crash in invalidate_inode_pages2_range() because invalidate_complete_page2() was unable to invalidate a page. It would appear that JBD is holding on to the page. ext3 has a specific ->releasepage() handler to cover this case. Steal ext3's ->releasepage(), ->invalidatepage(), and ->migratepage(), as they appear completely appropriate for OCFS2. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit e6c352dbc0f4dc7e3f82feafb9e6207c5814a189 Author: Joel Becker Date: Sat Feb 3 03:04:20 2007 -0800 ocfs2: Concurrent access of o2hb_region->hr_task was not locked This means that a build-up and a teardown could race which would result in a double-kthread_stop(). Protect the setting and clearing of hr_task with o2hb_live_lock, as it's not a common thing and not performance critical. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit c24f72cc7ca829bbad0532ddf315ace3ae1c359e Author: Joel Becker Date: Sat Feb 3 03:14:30 2007 -0800 ocfs2: Proper cleanup in case of error in ocfs2_register_hb_callbacks() If ocfs2_register_hb_callbacks() succeeds on its first callback but fails its second, it doesn't release the first on the way out. Fix that. While we're at it, o2hb_unregister_callback() never returns anything but 0, so let's make it void. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 0e6ee854e7be9f12146c35aa09da3fe366d60f8c Author: Ralf Baechle Date: Tue Mar 13 15:10:50 2007 +0000 [MIPS] kspd: ioctl needs a translation entry. Signed-off-by: Ralf Baechle commit aea0e582d3ed9fa966c60b41871381e7f734adf2 Author: Ralf Baechle Date: Tue Mar 13 13:37:17 2007 +0000 [MIPS] Viper2: Remove defective support. A defconfig file and the 10 lines of code (including comments ...) that are rotting since lmo commit 6516a42dc8b40c6c00010346dd51496125b16644 don't quite make proper support, so let's trash it. Signed-off-by: Ralf Baechle commit 795a22583ba11deb82d57dd70632c7ac390bb8c8 Author: Chris Dearman Date: Thu Mar 1 17:58:24 2007 +0000 [MIPS] Oprofile: Reset all performance registers for MIPS_MT_SMP configs Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit bb8236f2b978e8ed84e8b664882905fb5a7dd6c8 Author: David S. Miller Date: Mon Mar 12 22:55:39 2007 -0700 [SPARC64]: Add missing HPAGE_MASK masks on address parameters. These pte loops all assume the passed in address is HPAGE aligned, make sure that is actually true. Signed-off-by: David S. Miller commit 50d266a3a1b6a284aed7e06b599668ec23b28d6f Author: David S. Miller Date: Mon Mar 12 19:58:18 2007 -0700 [SPARC]: Hook up missing syscalls. sys_mbind sys_get_mempolicy sys_set_mempolicy sys_kexec_load sys_move_pages sys_getcpu sys_epoll_pwait This work is largely a result of David Woodhouse's most excellent missing syscalls patch. Signed-off-by: David S. Miller commit 75e252d981c0e80c14ce90df246e9b1300474c4f Author: Joy Latten Date: Mon Mar 12 17:14:07 2007 -0700 [XFRM]: Fix missing protocol comparison of larval SAs. I noticed that in xfrm_state_add we look for the larval SA in a few places without checking for protocol match. So when using both AH and ESP, whichever one gets added first, deletes the larval SA. It seems AH always gets added first and ESP is always the larval SA's protocol since the xfrm->tmpl has it first. Thus causing the additional km_query() Adding the check eliminates accidental double SA creation. Signed-off-by: Joy Latten Signed-off-by: David S. Miller commit 54f565ea895b383b67a2d6e31d2e2fcac5e6c345 Author: William Lee Irwin III Date: Mon Mar 12 17:08:25 2007 -0700 [SPARC]: Fix TIF_USEDFPU flag atomicity From: William Lee Irwin III Signed-off-by: David S. Miller commit ce0ecd594d78710422599918a608e96dd1ee6024 Author: Robert P. J. Day Date: Mon Mar 12 17:06:27 2007 -0700 [WANROUTER]: Delete superfluous source file "net/wanrouter/af_wanpipe.c". Delete the apparently superfluous source file net/wanrouter/af_wanpipe.c. Signed-off-by: Robert P. J. Day Signed-off-by: David S. Miller commit 08882669e06099eb3e6ac407f552743aeaaec73f Author: Geert Uytterhoeven Date: Mon Mar 12 17:02:37 2007 -0700 [IPV4]: Fix warning in ip_mc_rejoin_group. Kill warning about unused variable `in_dev' when CONFIG_IP_MULTICAST is not set. Signed-off-by: Geert Uytterhoeven Signed-off-by: David S. Miller commit 2cb8a57b9851805883dfe92cf5d88a726134a384 Author: Zachary Amsden Date: Mon Mar 12 14:58:08 2007 -0800 [PATCH] Fix vmi time header bug Some gcc put this function in .init.text because the header didn't match. Signed-off-by: Linus Torvalds commit b6bc5d71499c6e2d403a0624841c280e6edebe43 Author: Zachary Amsden Date: Fri Mar 9 23:00:30 2007 -0800 [PATCH] Fix VMI and COMPAT_VDSO for 2.6.21 VMI is broken under COMPAT_VDSO, as Xen and other non hardware assisted hypervisors will be. I have been working on a fix for this which works for older glibcs that panic when the new relocatable VDSO is used. However, I believe at this time that the fix is going to be too radical to consider at this stage in the release of 2.6.21. We don't expect this config option to be turned on by vendors for new distributions, so at this point we are willing to drop support for it when VMI is compiled in, and work on a patch for 2.6.22 which more fully addresses the problem. Signed-off-by: Zachary Amsden Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 9f35575dfc172f0a93fb464761883c8f49599b7a Author: Eric W. Biederman Date: Thu Mar 8 13:06:13 2007 -0700 [PATCH] pci: Repair pci_save/restore_state so we can restore one save many times. Because we do not reserve space for the pci-x and pci-e state in struct pci dev we need to dynamically allocate it. However because we need to support restore being called multiple times after a single save it is never safe to free the buffers we have allocated to hold the state. So this patch modifies the save routines to first check to see if we have already allocated a state buffer before allocating a new one. Then the restore routines are modified to not free the state after restoring it. Simple and it fixes some subtle error path handling bugs, that are hard to test for. Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman Acked-by: Auke Kok Signed-off-by: Linus Torvalds commit 392ee1e6dd901db6c4504617476f6442ed91f72d Author: Eric W. Biederman Date: Thu Mar 8 13:04:57 2007 -0700 [PATCH] msi: Safer state caching. There are two ways pci_save_state and pci_restore_state are used. As helper functions during suspend/resume, and as helper functions around a hardware reset event. When used as helper functions around a hardware reset event there is no reason to believe the calls will be paired, nor is there a good reason to believe that if we restore the msi state from before the reset that it will match the current msi state. Since arch code may change the msi message without going through the driver, drivers currently do not have enough information to even know when to call pci_save_state to ensure they will have msi state in sync with the other kernel irq reception data structures. It turns out the solution is straight forward, cache the state in the existing msi data structures (not the magic pci saved things) and have the msi code update the cached state each time we write to the hardware. This means we never need to read the hardware to figure out what the hardware state should be. By modifying the caching in this manner we get to remove our save_state routines and only need to provide restore_state routines. The only fields that were at all tricky to regenerate were the msi and msi-x control registers and the way we regenerate them currently is a bit dependent upon assumptions on how we use the allow msi registers to be configured and used making the code a little bit brittle. If we ever change what cases we allow or how we configure the msi bits we can address the fragility then. Signed-off-by: Eric W. Biederman Signed-off-by: Greg Kroah-Hartman Acked-by: Auke Kok Signed-off-by: Linus Torvalds commit 2536b94a2d2e37dd6c14171d6251f63bbda47293 Author: Ralf Baechle Date: Mon Mar 12 15:53:33 2007 -0700 [ROSE]: Socket locking is a great invention. Especially if you actually try to do it ;-) Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 6cee77dbf29e3c4c2cf2ce16621759accc76891e Author: Ralf Baechle Date: Mon Mar 12 15:52:52 2007 -0700 [ROSE]: Remove ourselves from waitqueue when receiving a signal Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 38c8947c1b46e5985df36435a6f21ef6a7e8a4b8 Author: Paul Moore Date: Mon Mar 12 14:38:02 2007 -0700 [NetLabel]: parse the CIPSO ranged tag on incoming packets Commit 484b366932be0b73a22c74a82748ca10a721643e added support for the CIPSO ranged categories tag. However, it appears that I made a mistake when rebasing then patch to the latest upstream sources for submission and dropped the part of the patch that actually parses the tag on incoming packets. This patch fixes this mistake by adding the required function call to the cipso_v4_skbuff_getattr() function. I've run this patch over the weekend and have not noticed any problems. Signed-off-by: Paul Moore Acked-by: James Morris Signed-off-by: David S. Miller commit 1dee79087c8b0f3239a2979f61ed92c7a5361b08 Author: Milan Svoboda Date: Mon Mar 12 12:38:07 2007 +0100 [ARM] 4263/1: fix IXP4XX_NPE[ABC]_BASE_VIRT address This fixs address defines for IXP4XX_NPE[ABC]_BASE_VIRT. They are defined as (IXP4XX_PERIPHERAL_BASE_PHYS + 0x[678]000) now, but they should be defined as (IXP4XX_PERIPHERAL_BASE_VIRT + 0x[678]000). Note PHYS vs VIRT in IXP4XX_PERIPHERAL_BASE... Signed-off-by: Milan Svoboda Signed-off-by: Russell King commit 2cb3320b3fb788eb95afbfea8686f11bb14e30b0 Author: Pavel Pisa Date: Thu Mar 8 00:00:40 2007 +0100 [ARM] 4256/1: i.MX/MX1 SDHC fix/workaround of SD card recognition problems The SDHC controllers cannot process shorter transfers. They has to be handled as longer ones, but it such case CRC error is evaluated. There was a case in the code still, where this error is not ignored as it should to be process these transfers. Signed-off-by: Pavel Pisa Signed-off-by: Russell King commit b3c6b76ffb1a8c8d1f12e838a25c1a86f5316e2c Author: Pavel Pisa Date: Wed Mar 7 23:56:16 2007 +0100 [ARM] 4255/1: i.MX/MX1 Correct MPU PLL reference clock value. Only System PLL clock source is selectable by CSCR_SYSTEM_SEL bit. MPU PLL is driven by 512*CLK32 for each case. Signed-off-by: Pavel Pisa Signed-off-by: Russell King commit 83b84c4e8c7cf00e26610f03ee59e9be010f527c Author: Pavel Pisa Date: Wed Mar 7 23:52:40 2007 +0100 [ARM] 4254/1: i.MX/MX1 CPU Frequency scaling honor boot loader set BCLK_DIV. The minimal bus clock prescaler should be kept at value selected by the board / boot loader designer. Switching frequency above startup limit could lead to the external memory/devices misbehave. Signed-off-by: Pavel Pisa Signed-off-by: Russell King commit d108d4fe34730135647fe32a4f8091491d3542ea Author: Jiri Kosina Date: Sat Mar 10 22:45:45 2007 +0100 HID: zeroing of bytes in output fields is bogus This patch removes bogus zeroing of unused bits in output reports, introduced in Simon's patch in commit d4ae650a. According to the specification, any sane device should not care about values of unused bits. What is worse, the zeroing is done in a way which is broken and might clear certain bits in output reports which are actually _used_ - a device that has multiple fields with one value of the size 1 bit each might serve as an example of why this is bogus - the second call of hid_output_report() would clear the first bit of report, which has already been set up previously. This patch will break LEDs on SpaceNavigator, because this device is broken and takes into account the bits which it shouldn't touch. The quirk for this particular device will be provided in a separate patch. Signed-off-by: Jiri Kosina commit 47a80edb1d80ae644ea374a016c8e68d43d2671f Author: Jiri Kosina Date: Mon Mar 12 14:55:12 2007 +0100 HID: allocate hid_parser in a proper way hid_parser is non-trivially large structure, so it should be allocated using vmalloc() to avoid unsuccessful allocations when memory fragmentation is too high. This structue has a very short life, it's destroyed as soon as the report descriptor has been completely parsed. This should be considered a temporary solution, until the hid_parser is rewritten to consume less memory during report descriptor parsing. Acked-by: Mariusz Kozlowski Signed-off-by: Jiri Kosina commit 7b3c384db1ff0f336b59d5062617915e216eaec1 Author: Stephen Rothwell Date: Fri Mar 9 11:58:11 2007 +1100 [POWERPC] sys_move_pages should be callable from an SPU Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 4b0092c215fc678e325193cf97ddcb4be6a550c3 Author: Stephen Rothwell Date: Fri Mar 9 11:57:10 2007 +1100 [POWERPC] Wire up sys_epoll_pwait Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 4cd723b4a0cc3e061e0a3fd86a1ec9a227f17c0b Author: Stephen Rothwell Date: Fri Mar 9 11:54:57 2007 +1100 [POWERPC] Allocate syscall number for sys_getcpu I forgot to do this when wiring up the syscall. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit ab97e6cf7be77d1a9ae48d1d0eafde0de21805fc Author: Wim Van Sebroeck Date: Sun Mar 11 12:59:47 2007 +0000 [WATCHDOG] i8xx TCO driver - mark for removal Mark the i8xx TCO driver for removal. Signed-off-by: Wim Van Sebroeck commit be521466feb3bb1cd89de82a2b1d080e9ebd3cb6 Author: Linus Torvalds Date: Sat Mar 10 14:22:07 2007 -0800 Revert "USB: pxa2xx_udc: fix hardcoded irq number" This reverts commit d2487cb4257dafb686f682285854fe7f02ca29d8. Russell King points out that it's obviously bogus, and I have to agree. Not only does "irq" not even exist in that scope, but we obviously need to free the irq that we actually requested, and that's IRQ_USB. Reported-by: Russell King Cc: Andrew Morton Cc: Greg KH Cc: David Brownell , Cc: Milan Svoboda Signed-off-by: Linus Torvalds commit c0a79b229ac0e3a96fc00d5be65a498ceb06ef63 Author: Mathieu Desnoyers Date: Sat Mar 10 00:19:49 2007 -0800 [SPARC64]: Fix atomicity of TIF update in flush_thread() Fix atomicity of TIF update in flush_thread() for sparc64 Fixes correctly the race by using *_ti_thread_flag. Race : parent process executing : sys_ptrace() (lock_kernel()) (ptrace_get_task_struct(pid)) arch_ptrace() ptrace_detach() ptrace_disable(child); clear_singlestep(child); clear_tsk_thread_flag(child, TIF_SINGLESTEP); (which clears the TIF_SINGLESTEP flag atomically from a different process) (put_task_struct(child)) (unlock_kernel()) And at the same time, in the child process : sys_execve() do_execve() search_binary_handler() load_elf_binary() flush_old_exec() flush_thread() doing a non-atomic thread flag update Signed-off-by: Mathieu Desnoyers Signed-off-by: David S. Miller commit 63abdcdc021063bf1cfcddfd3c1a14a761539807 Author: Robert Reif Date: Thu Mar 8 21:22:35 2007 -0800 [BW2]: Fix section mismatch warnings. Fix section mismatch warnings by moving data into __devinitdata section. Add __devinit to two initialization functions. Signed-off-by: Robert Reif Signed-off-by: David S. Miller commit 8fdab4763a04f503301b14810b39c536f2277120 Author: Robert Reif Date: Thu Mar 8 21:22:03 2007 -0800 [CG14]: Fix section mismatch warnings. Fix section mismatch warning by moving data into __devinitdata section. Add __devinit to an initialization function. Signed-off-by: Robert Reif Signed-off-by: David S. Miller commit ac33d1febb790bd3a2a51cda1239a1482a3c767f Author: David S. Miller Date: Thu Mar 8 16:23:24 2007 -0800 [SPARC]: We do not need OLD_GETRLIMIT. Signed-off-by: David S. Miller commit 9e197219605513c14d3eae41039ecf1b82d1920d Author: Alexey Starikovskiy Date: Wed Mar 7 18:29:35 2007 -0500 ACPI: ec: fix race in status register access Delay the read of the EC status register until after the event that caused it occurs -- otherwise it is possible to read and act on stale status that was associated with the previous event. Do this with a perpetually incrementing "event_count" to detect when a new event occurs and it is safe to read status. There is no workaround for polling mode -- it is inherently exposed to reading and acting on stale status, since it doesn't have an interrupt to tell it the event completed. http://bugzilla.kernel.org/show_bug.cgi?id=8110 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit ee17b289732e04fdcdd8ce2ce19b18d3e8b08e20 Author: Cyrill Gorcunov Date: Tue Mar 6 02:47:44 2007 -0800 USB Elan FTDI: check for workqueue creation Avoid NULL pointer usage if workqueue creation failed. Signed-off-by: Cyrill Gorcunov Cc: Pete Zaitcev Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 834dbca5b6b79ddb7cf56001ea7b6d4481fdf1e7 Author: Oliver Neukum Date: Tue Mar 6 10:47:04 2007 +0100 USB: fix spinlock recursion in cdc-acm.c this fixes the spinlock recursion issue. The older fix was incomplete. Signed-off-by: Oliver Neukum Acked-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 64543652609fc1a2a816dc38ce4f56eddda9f9a5 Author: Max Dmitrichenko Date: Tue Mar 6 02:45:01 2007 +0300 USB: fix Unaligned access in EHCI driver I get following warnings on spar64: Kernel unaligned access at TPC[1000c9e4] ehci_hub_control+0x54c/0x68c [ehci_hcd] Despite of the comment in the patched code, the type cast used there does make unaligned access. The fix was made as it's done in ohci-hub.c. Signed-off-by: Max Dmitrichenko Signed-off-by: Greg Kroah-Hartman commit d8b2160683bd1cee759e72a53193484c25a006bd Author: Gard Spreemann Date: Mon Mar 5 00:03:26 2007 +0100 USB: Product ID for FT232RL in ftdi_sio Here is a patch adding the PID for the FT232RL to ftdi_sio. The patch generates a warning during compilation because get_ftdi_divisor doesn't explicitly handle the FT232RL with this patch, so I guess you don't want to use it in its current state. It is all I could come up with with the knowledge I have of the drivers at the moment, though, and I hope you can have some use for it at least. It works fine with my DLP-TILT with an FT232RL. From: Gard Spreemann Signed-off-by: Greg Kroah-Hartman commit 6438ac2677adee574f06866787e7560430efe2e0 Author: YOSHIFUJI Hideaki Date: Fri Mar 2 20:33:55 2007 -0500 USBNET: DM9501: Add Corega FEther USB-TXC support. Signed-off-by: YOSHIFUJI Hideaki Cc: Jeff Garzik Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 62d909ced019bcae75402578d5dab4522e959823 Author: Andre Spahlinger Date: Mon Mar 5 19:09:35 2007 +0100 USB: ipaq.c: Additional devices Additional devices Signed-off-by: Andre Spahlinger Signed-off-by: Greg Kroah-Hartman commit a1f721c81251259024323f7ebf37af8e247be5cb Author: Oliver Neukum Date: Mon Mar 5 15:23:51 2007 +0100 USB: further fix for usb-serial this is a fix for the outstanding usb-serial issues. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit c744f99eb662b54488304b8b60e5f4323b7587bf Author: Oliver Neukum Date: Mon Feb 26 15:43:00 2007 +0100 USB: fix usb-serial device naming bug Am Montag, 26. Februar 2007 15:16 schrieb Craig Schlenter: > Hi Greg > > 34ef50e5b1f96c2d8c0f3d28b7d407743806256c is definitely > the source of the problem. Reverting that makes the > ftdi port show up as ttyUSB0 again for me and it > can actually be opened. This patch should fix the issue. Signed-off-by: Oliver Neukum Signed-off-by: Craig Schlenter Signed-off-by: Greg Kroah-Hartman commit cf0cb1ae0273f0963a5d54c7ec4dde384863fac8 Author: Martin Schiller Date: Thu Mar 1 13:49:48 2007 +0100 USB: RTS/DTR signal patch for airprime driver I encountered some problems with the airprime driver in use with a Novatel Merlin XU870: Closing an open Connection to e.g. /dev/ttyUSB0 doesn't reset the RTS/DTR lines of the Modem. Consequently, when I use minicom to establish a connection by "ATD*99#" the modem doesn't hang up even if i exit minicom and so I cannot reuse the modem unless I remove it and plug it in again. With the attached patch, the RTS/DTR lines are resetted on a close. The code was mainly taken from the option.c driver. commit 12bdbe03c8db7139de1de5c622cb0609d259cece Author: Jim Radford Date: Wed Feb 28 10:10:50 2007 -0800 USB: ftdi_sio: use port_probe / port_remove thereby fixing access to the latency_timer Convert all the port specific code in attach / shutdown to use the new port_probe / port_register callbacks from device_register / device_unregister allowing adding the sysfs attributes to be added at the correct time and to the serial port device itself, instead of to the unadorned usb device, avoiding a NULL dereference. Signed-off-by: Jim Radford Signed-off-by: Greg Kroah-Hartman commit d9a7ecacac5f8274d2afce09aadcf37bdb42b93a Author: Jim Radford Date: Wed Feb 28 08:14:13 2007 -0800 usb-serial: fix shutdown / device_unregister order Ensure that the ->port_remove() callbacks get called before the ->shutdown() callback which makeing the order symmetric with ->attach() being called before ->port_probe(). Signed-off-by: Jim Radford Signed-off-by: Greg Kroah-Hartman commit 4eaf60e0114946d82ef523e8c0718831cbdd3414 Author: Thomas Schleusener Date: Wed Feb 28 22:50:52 2007 +0100 USB: add Additional PIDs in ftdi_sio I've developed some devices with FTDI chips (FT232xx). FTDI was so kind to give some own PID's which I can use together with their VID. Some of the devices are already very popular here and I have customers from universities, institutes ..... I use the FTDI VID 0x0403. My PID's are: 0xff38 - IBS US485 (USB<-->RS422/485 interface) 0xff39 - IBS PIC-Programmer 0xff3a - IBS Card reader for PCMCIA SRAM-cards 0xff3b - IBS PK1 - Particel counter 0xff3c - IBS RS232 - Monitor 0xff3d - APP 70 (dust monitoring system) 0xff3e - IBS PEDO-Modem (RF modem 868.35 MHz) 0xff3f - future device The company is "IBS Ing.-Buero Schleusener". From: Thomas Schleusener Signed-off-by: Greg Kroah-Hartman commit ef31fec01a558538a696a21ef9ecf5f1a6d4a53b Author: Michael Olberg Date: Tue Feb 27 12:57:12 2007 +0100 USB: add QL355P power supply ids to fdti_sio commit fc4bd64cbbbea1eabc77d6f1734c0f8fb7e0295f Author: Jon K Hellan Date: Wed Feb 28 23:04:33 2007 +0100 USB: New device IDs for cp2101 driver Here are two new device IDs for the cp2101 driver. The diff is with linus's tree as of this evending. From: Jon K Hellan Signed-off-by: Greg Kroah-Hartman commit 5bb16d189f5425f3722bc91d9211afe303ee022b Author: Oliver Neukum Date: Thu Mar 1 22:31:24 2007 +0100 USB: kill dead code from hub.c this kills residual obsoletet code from hub.c Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 7bc4b81dedf54166e967afa8bc03c8bfeb40fd27 Author: Oliver Neukum Date: Tue Feb 27 10:25:00 2007 +0100 USB: ratelimit debounce error messages flaky hardware can cause a lot of debounce failed messages. To limit the performance impact, a ratelimit should be used. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d2487cb4257dafb686f682285854fe7f02ca29d8 Author: Milan Svoboda Date: Tue Feb 27 09:20:09 2007 +0000 USB: pxa2xx_udc: fix hardcoded irq number This patch changes last use of hardcoded number of irq to use platfrom_get_irq. Signed-off-by: Milan Svoboda Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 88018158d1253ab4868a2f9204cc390c711fd9b9 Author: Alan Stern Date: Mon Feb 26 17:16:06 2007 -0500 UHCI: fix port resume problem This patch (as863) fixes a problem encountered sometimes when resuming a port on a UHCI controller. The hardware may turn off the Resume-Detect bit before turning off the Suspend bit, leading usbcore to think that the port is still suspended and the resume has failed. The patch makes uhci_finish_suspend() wait until both bits are safely off. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 97b9eb91dc131a10342da1f604e5bd8b1316abdb Author: Alan Stern Date: Mon Feb 26 14:56:14 2007 -0500 USB: set the correct interval for interrupt URBs This patch (as862) fixes a couple of bugs in the way usbcore handles intervals for interrupt URBs. usb_interrupt_msg (and usb_bulk_msg for backward compatibility) don't set the interval correctly for high-speed devices. proc_do_submiturb() doesn't set it correctly when a bulk URB is submitted to an interrupt endpoint. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 14360ab76ae81012ef09cce37a587e95ab2e1d86 Author: Ralf Baechle Date: Mon Feb 26 18:10:15 2007 +0000 USB: goku_udc: Remove crude cache coherency code This is deep architecture specific magic and does should not to exist in a driver. Signed-off-by: Ralf Baechle Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 0d8c7aeade59e0f54d93122ebd902caea500c0bd Author: Andrew Nayenko Date: Sun Feb 25 00:40:20 2007 -0800 USB storage: Nokia 6288 unusual_devs entry This patch adds an usual_devs entry for the Nokia 6288. Originally from Andrew with a re-diff by Phil. From: Andrew Nayenko Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit 6160863f99315acdbcd70afa8f4b9e75281249b1 Author: Phil Dibowitz Date: Sat Feb 24 19:23:41 2007 -0800 USB storage: Removed duplicate supertop unusual_dev entry This patch removes the duplicate supertop entries that made it into the .21 rc kernels. Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit dee497df6fcc90a3bdaaddc8e352feb0756a61e0 Author: David Brownell Date: Sat Feb 24 13:54:56 2007 -0800 USB: at91_udc, fix more modpost bogosity (rename driver struct) Rename the driver struct used with at91_udc to prevent yet another bogus warning from "modpost". Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 9327f46ee28116b17f15f6505edd90f905908d62 Author: Robert P. J. Day Date: Sun Mar 4 13:17:43 2007 -0500 ACPI: Kconfig: hide ACPI menu when CONFIG_PM=n Signed-off-by: Robert P. J. Day Signed-off-by: Len Brown commit 98fb8fe10f4b88170f578d8c33eaa2315d73b4f7 Author: Julius Volz Date: Tue Feb 20 16:38:40 2007 +0100 ACPI: video: Fix spelling and grammar mistakes Correct some of the most obvious spelling and grammar mistakes in drivers/acpi/video.c (comments and printk output). Signed-off-by: Julius Volz Signed-off-by: Len Brown commit 5b27b176da6cc83b0f904c7e0aabd9362d70bf70 Author: Anthony Godshall, Ampro Computers, Inc Date: Fri Mar 9 21:19:05 2007 -0500 ACPI: make blacklist more verbose IMHO, ACPI disabled due to DMI failure or blacklisted year should be noted, as is done with other ACPI blacklisting. This will help people troubleshoot when ACPI isn't working. Status quo is a mysterious "ACPI Disabled" message without explanation on BIOS that implements ACPI but not DMI. This is actually fairly common on embedded x86 boards. Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit f110ef58e6c9bd562999247c5e8a5b8e722fbd11 Author: Adrian Bunk Date: Tue Feb 20 01:07:25 2007 +0100 asus-laptop: make code static This patch makes some needlessly global code static. Signed-off-by: Adrian Bunk Cc: Corentin Chary Signed-off-by: Len Brown commit d2b02ed9487ed25832d19534575052e43f8e0c4f Author: Chris Wright Date: Fri Mar 9 16:19:17 2007 -0800 [IPV6] fix ipv6_getsockopt_sticky copy_to_user leak User supplied len < 0 can cause leak of kernel memory. Use unsigned compare instead. Signed-off-by: Chris Wright Signed-off-by: David S. Miller commit 128bf5cb54dececc5209db65f8ef5d17d74244d9 Author: Sam Ravnborg Date: Fri Mar 2 23:59:04 2007 +0100 pci: fix section mismatch warning drivers/pci/search.c caused following section mismatch warning (if compiled with CONFIG_HOTPLUG=n): WARNING: drivers/pci/built-in.o - Section mismatch: reference to .init.text: from .text.pci_find_bus after 'pci_find_bus' (at offset 0x24) This was due to pci_find_bus() calling a function marked __devinit. Fix was to remove the __devinit from the offending function. Signed-off-by: Sam Ravnborg Signed-off-by: Greg Kroah-Hartman commit c1996c2778e90f80cb9fc6a52508068f10d39611 Author: Sam Ravnborg Date: Tue Feb 27 10:22:00 2007 +0100 PCI: aer: fix section mismatch warning Fix following section mismatch warning (when compiled with CONFIG_HOTPLUG=n): WARNING: drivers/pci/built-in.o - Section mismatch: reference to .init.text:aer_probe from .data between 'aerdrv' (at offset 0x1608) and 'aer_error_handlers' Warning was fixed by renaming aerdrv to aerdriver so we pass the whitelist. Signed-off-by: Sam Ravnborg Signed-off-by: Greg Kroah-Hartman commit 3603a6a37c5f5c6a2b109fdb48c9456f08aebdd8 Author: Sam Ravnborg Date: Tue Feb 27 10:19:17 2007 +0100 pcie: fix section mismatch warning Fix following section mismatch warning (when compiled with CONFIG_HOTPLUG=n): WARNING: drivers/pci/built-in.o - Section mismatch: reference to .init.text:pcie_portdrv_probe from .data between 'pcie_portdrv' (at offset 0xe40) and 'pcie_portdrv_err_handler' This warning was fixed by renaming pcie_portdrv to pcie_portdriver so we pass the whitelist. Signed-off-by: Sam Ravnborg Signed-off-by: Greg Kroah-Hartman commit 7f375f325feacd8a628e00e0d53390a4f6d8abc2 Author: Tejun Heo Date: Sun Feb 25 04:36:01 2007 -0800 PCI: allow multiple calls to pcim_pin_device() Sanity check in pcim_pin_device() was too restrictive in that it didn't allow multiple calls to the function, which is against the devres philosohpy of fire-and-forget. Track pinned status separately and allow pinning multiple times. Signed-off-by: Tejun Heo Acked-by: Ian McDonald Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9e993efb0da827634778554070f3c3ec4bdade33 Author: Dmitriy Monakhov Date: Sat Mar 3 16:11:21 2007 +0300 kobject: new_device->kref wasn't putted after error in kobject_move() If error happen we jump to "out" label, in this case new_device not yet became the parent but it wasn't putted. Signed-off-by: Monakhov Dmitriy Signed-off-by: Greg Kroah-Hartman commit a2807dbcbd681e1f36e813fb26e2f24d15018b91 Author: Johannes Berg Date: Wed Feb 28 12:38:31 2007 +0100 driver core: export device_rename In wireless we'd like to allow renaming of the phy devices we surface in sysfs. The base wireless code, however, can be built modular and thus we need device_rename exported. Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman commit 6cc94ef5359453dafc4778f6e5c33b128a2705c9 Author: Jörn Engel Date: Tue Feb 27 21:38:30 2007 +0000 Remove devfs from MAINTAINERS Remove last remaining trace of devfs. Signed-off-by: Jörn Engel Signed-off-by: Greg Kroah-Hartman commit f7f3461d87536bed52bb83bc8fbe6bfd28619fb1 Author: Greg Kroah-Hartman Date: Tue Mar 6 12:55:53 2007 -0800 Driver core: add device symlink back to sysfs This moves the device symlink back to sysfs even if CONFIG_SYSFS_DEPRECATED is enabled as too many userspace programs (well, HAL), still rely on this link to be present. I will rework the ability for sysfs to change layouts like this in the future, but for now, this patch should fix people's network connections. Cc: Kay Sievers Cc: Matt Mackall Signed-off-by: Greg Kroah-Hartman commit 161e232b8823e230d4fdf8064e606bbdf26f47e2 Author: Greg Kroah-Hartman Date: Fri Mar 9 15:25:04 2007 -0800 Revert "driver core: refcounting fix" This reverts commit 63ce18cfe685115ff8d341bae4c9204a79043cf0. It was the incorrect fix and causes a reference counting bug whenever any driver module is removed from the system. Mike Galbraith is looking for the real fix for his problem. Signed-off-by: Greg Kroah-Hartman commit df33c77e3981e71afc8727ee5c432ba1a1bba68c Author: Kristen Accardi Date: Fri Mar 9 18:15:33 2007 -0500 libata-acpi: allow _GTF on SATA, but disable on PATA for now The ACPI specification states, and BIOS implementations depend on, _STM being called before _GTF. SATA does this, but PATA does not. So for now, simply prevent execution of _GTF on PATA devices. Longer term we should implement ACPI support for PATA devices in libata. Signed-off-by: Kristen Accardi Signed-off-by: Len Brown commit c886c2bf804c029499694adcc0decfdd32a0cd8b Author: Arnd Bergmann Date: Sat Mar 10 00:05:39 2007 +0100 [POWERPC] update cell_defconfig Signed-off-by: Arnd Bergmann commit ef596c697a4d80048eccf50530153d7e3330c127 Author: Geert Uytterhoeven Date: Sat Mar 10 00:05:38 2007 +0100 [POWERPC] ps3: always make sure were running on a PS3 Add missing checks to PS3 specific drivers ps3av and sys-manager to verify that we are actually running on a PS3 (pointed out by Arnd). Correct existing checks in other subsystems/drivers to return -ENODEV instead of zero. Signed-off-by: Geert Uytterhoeven Signed-off-by: Arnd Bergmann commit 94b2a4393c500a620de90c3266d595926302e26b Author: Benjamin Herrenschmidt Date: Sat Mar 10 00:05:37 2007 +0100 [POWERPC] Fix spu SLB invalidations The SPU code doesn't properly invalidate SPUs SLBs when necessary, for example when changing a segment size from the hugetlbfs code. In addition, it saves and restores the SLB content on context switches which makes it harder to properly handle those invalidations. This patch removes the saving & restoring for now, something more efficient might be found later on. It also adds a spu_flush_all_slbs(mm) that can be used by the core mm code to flush the SLBs of all SPEs that are running a given mm at the time of the flush. In order to do that, it adds a spinlock to the list of all SPEs and move some bits & pieces from spufs to spu_base.c Signed-off-by: Benjamin Herrenschmidt commit 50b520d4efbce45281f58112789470ec7965fd33 Author: Christoph Hellwig Date: Sat Mar 10 00:05:36 2007 +0100 [POWERPC] avoid SPU_ACTIVATE_NOWAKE optimization This optimization was added recently but is still buggy, so back it out for now. Signed-off-by: Arnd Bergmann commit aa0ed2bdb663608d5e409faecff3e1e81a3d413a Author: Arnd Bergmann Date: Sat Mar 10 00:05:35 2007 +0100 [POWERPC] spufs: fix possible memory corruption is spufs_mem_write Due to a buggy unsigned comparison, it was possible to write beyond the end of the local store file in spufs under some circumstances. This rewrites the buggy function to look more like simple_copy_from_buffer. Signed-off-by: Arnd Bergmann Cc: Ulrich Weigand commit dfee0a725bb027b749ffdd318eb48b91d564b266 Author: Olaf Kirch Date: Fri Mar 9 13:55:38 2007 -0800 [IPV6]: Fix for ipv6_setsockopt NULL dereference I came across this bug in http://bugzilla.kernel.org/show_bug.cgi?id=8155 Signed-off-by: Olaf Kirch Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit aabb601b0f08b909b650f1a7bfa1e8d9b5a8d999 Author: Gerrit Renker Date: Fri Mar 9 13:47:58 2007 -0800 [DCCP]: Initialise write_xmit_timer also on passive sockets The TX CCID needs the write_xmit_timer for delaying packet sends. Previously this timer was only activated on active (connecting) sockets. This patch initialises the write_xmit_timer in sync with the other timers, i.e. the timer will be ready on any socket. This is used by applications with a listening socket which start to stream after receiving an initiation by the client. The write_xmit_timer is stopped when the application closes, as before. Was tested to work and to remove the timer bug reported on dccp@vger. Also moved timer initialisation into timer.c (static). Signed-off-by: Gerrit Renker Acked-by: Ian McDonald Signed-off-by: David S. Miller commit c4e38f41e34ad853651d66227aae23e48457dce0 Author: Evgeniy Polyakov Date: Fri Mar 9 13:43:24 2007 -0800 [IPV4]: Fix rtm_to_ifaddr() error handling. Return negative error value (embedded in the pointer) instead of returning NULL. Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit bb9b813bb665cdbe7019a4f1e93f7138e7bf59d0 Author: Ralf Baechle Date: Fri Mar 9 15:59:56 2007 +0000 [MIPS] Sibyte: Fix ZBbus profiler o Fix build error. o Handle error returns. o Deal with signals received while sleeping. o Don't allow to be selected when we're not building the directory with the driver anyway. o Coding style cleanups. Signed-off-by: Ralf Baechle commit ca6f5494f5e0ff60675d99b51c4c56921d95fe1d Author: Ralf Baechle Date: Fri Mar 9 12:17:32 2007 +0000 [MIPS] Sibyte: Do not allow enabling LDT support if PCI is disabled. Signed-off-by: Ralf Baechle commit 82c00b62c811142c8e7d3aef92fbf3fc77b83709 Author: Ralf Baechle Date: Thu Mar 8 12:53:07 2007 +0000 ibmtr: Drain rich supply of modpost warnings. Building ibmtr as a module produces a spectacular pile of modpost warnings: WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x450) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x454) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x458) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x45c) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4e8) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4ec) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4f0) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x4f4) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x500) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x504) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x508) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:find_turbo_adapters from .text between 'ibmtr_probe_card' (at offset 0x50c) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x520) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x524) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x528) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data:ibmtr_portlist from .text between 'ibmtr_probe_card' (at offset 0x534) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x540) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x544) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x548) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.data: from .text between 'ibmtr_probe_card' (at offset 0x54c) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x558) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x55c) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x560) and 'ibmtr_reset_timer' WARNING: drivers/net/tokenring/ibmtr.o - Section mismatch: reference to .init.text:ibmtr_probe1 from .text between 'ibmtr_probe_card' (at offset 0x564) and 'ibmtr_reset_timer' Fix by making ibmtr_probe an __init function. While at it, move move ibmtr_probe_card below ibmtr_probe so the protoype for ibmtr_probe can be deleted. Signed-off-by: Ralf Baechle drivers/net/tokenring/ibmtr.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) Signed-off-by: Jeff Garzik commit 95c408a95f9b16c638566df57c070b408edf1a01 Author: Ralf Baechle Date: Thu Mar 8 15:33:16 2007 +0000 3c59x: Fix several modpost warnings WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4580) and 'vortex_eisa_remove' WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4584) and 'vortex_eisa_remove' WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4588) and 'vortex_eisa_remove' WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x458c) and 'vortex_eisa_remove' Fixed by: o move definition of vortex_eisa_driver below the functions it references. o remove now unnecessary prototypes for vortex_eisa_probe and vortex_eisa_remove. o Make vortex_eisa_probe an __init function. o Make vortex_eisa_remove a __devexit function. o Wrap vortex_eisa_driver reference to vortex_eisa_remove with __devexit_p(). Signed-off-by: Ralf Baechle drivers/net/3c59x.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) Signed-off-by: Jeff Garzik commit fe79745507593941adb44a6b2e392645c54ca1c2 Author: Alan Cox Date: Wed Mar 7 16:37:38 2007 +0000 z85230: Fix FIFO handling We must exit immediately on a FIFO fill not take the end of packet path otherwise each underrun in PIO transmit mode causes a runt packet and the data is lost. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 2efa53f373ed811d4860904f5205b8a3b376e253 Author: Francois Romieu Date: Fri Mar 9 00:00:05 2007 +0100 r8169: fix a race between PCI probe and dev_open Initialize the timer with the rest of the private-struct. Signed-off-by: Jeff Garzik Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 9e0db8ef4a8c8fd6f3a506259975d7f8db962421 Author: Francois Romieu Date: Thu Mar 8 23:59:54 2007 +0100 r8169: revert bogus BMCR reset Added during bf793295e1090af84972750898bf8470df5e5419 The current code requests a reset but prohibits autoneg, 1000 Mb/s, 100 Mb/s and full duplex. The 8168 does not like it at all. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 874183072de73a36a958585e3186639fd2634701 Author: Stephen Hemminger Date: Thu Mar 8 12:42:30 2007 -0800 sky2: turn off Rx checksum on bad hardware On Yukon FE, occasional hardware receive checksum errors are seen. An early indication of the problem is single bit differences in the two checksum engines. Use this as a detection mechanism to turn off Rx checksumming. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 85cf572cd5a1b63d5efd5bd538201bd56cd5ad24 Author: Dale Farnsworth Date: Wed Mar 7 22:21:23 2007 -0700 mv643xx: Clear pending interrupts before calling request_irq Signed-off-by: Dale Farnsworth Acked-by: Giridhar Pemmasani Signed-off-by: Jeff Garzik commit 276e26c3160602efea1d0acc9fe7b45bb4c2c8e1 Author: Brice Goglin Date: Wed Mar 7 20:02:32 2007 +0100 myri10ge: add a wc_enabled flag to myri10ge_priv Add a wc_enabled flag in the myri10ge_priv instead of relying on mtrr >= 0. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 4c882dd808b907652c9a8fe4f7d345cb4dee6a92 Author: Brice Goglin Date: Wed Mar 7 20:01:53 2007 +0100 myri10ge: prevent 4k rdma on SGI TIOCE chipset Do not use 4k rdma request on SGI TIOCE chipset since this bridge does not support it. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 34fdccea93e858aaece3f127628365b546f96857 Author: Brice Goglin Date: Wed Mar 7 20:00:45 2007 +0100 myri10ge: use pci_map_page to prepare the dmatest buffer Allocate a specific page and use pci_map_page for dma test instead of relying on another existing buffer. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 355c7265f4745a2aa6f0482d466e2271e6b3c61a Author: Brice Goglin Date: Wed Mar 7 19:59:52 2007 +0100 myri10ge: fix error checking and return value in myri10ge_allocate_rings Fix a missing error check in myri10ge_allocate_rings() and set status to -ENOMEM before all actual allocations so that the error path returns what it should. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit b8d095d782fa1e97d5dc05c08ba32c8eb28b85e4 Author: Ralf Baechle Date: Tue Mar 6 20:35:37 2007 +0000 netxen: fix warnings CC [M] drivers/net/netxen/netxen_nic_hw.o drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_hw_resources': drivers/net/netxen/netxen_nic_hw.c:231: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'dma_addr_t' drivers/net/netxen/netxen_nic_hw.c:250: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'dma_addr_t' u64 is unsigned long so the cast to u64 will result in a warning on the printf arguments for 64-bit builds. So cast to unsigned long long instead. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit e84df485c8e059bc9d8d0691ae6a3deafa1f9350 Author: Roger Luethi Date: Tue Mar 6 19:57:37 2007 +0100 via-rhine: set avoid_D3 for broken BIOSes This patch sets avoid_D3 for BIOSes known to be broken. Said BIOSes fail at PXE boot if the chip is in power state D3. Signed-off-by: Roger Luethi Signed-off-by: Jeff Garzik commit 2f8d16a996da0b9be2536994aa7a825418364471 Author: Tejun Heo Date: Fri Mar 9 19:34:19 2007 +0900 devres: release resources on device_del() Some platform devices are driven without driver attached, so managed resources can be acquired without driver attached. Make sure such resources are released by calling devres_release_all() in device_del(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1aa506e437a94d520f852d39d5d6a6e7f2e01901 Author: Tejun Heo Date: Fri Mar 9 19:36:12 2007 +0900 libata: fix ata_host_release() free order host->ops->host_stop() might access ports. Free ports after host_stop. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 8ba5e4cbe444f10352756b6c7715bb26bb087680 Author: Robert Hancock Date: Thu Mar 8 18:02:18 2007 -0600 sata_nv: revert use of notifiers for now Commit 721449bf0d51213fe3abf0ac3e3561ef9ea7827a added support for using the ADMA notifier bits to determine which commands to check for completion. However there have been reports that this causes command timeouts in certain cases. This is still being investigated. In addition, apparently the notifiers won't work if ADMA is disabled on the other port as a result of an ATAPI device being connected, and we don't handle this case properly. For now, just restore the previous behavior of checking all active commands to see if they are complete, without relying on the notifiers. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit 14d66ab7e2e06d3727719d3e4eec6bf9f70251c3 Author: Petr Vandrovec Date: Thu Mar 8 10:12:12 2007 +0100 Fix simplex adapters with libata Recently I got my hands on nVidia's MCP61 PM-AM board, and it contains IDE chip configured by BIOS with only primary channel enabled. This confuses code which probes for device DMA capabilities - it gets 0x60 (happy duplex device) from primary channel BMDMA, but 0xFF (nobody here) from secondary channel BMDMA. Due to this code then believes that chip is simplex. I do not address this problem in my patch, as I'm not sure how to handle this. Probably ata_pci_init_one should have bitmap of enabled/possible interfaces instead of their count, but it looks like quite intrusive change, and maybe we do not care - for device with only one channel simplex and regular DMA engines are same. But making device simplex pointed out that support for DMA on simplex devices is currently broken - ata_dev_xfermask tests whether device is simplex and if it is whether DMA engine was assigned to this port. If not then it strips out DMA bits from device. Problem is that code which assigns DMA engine to port in ata_set_mode first detect device mode and assigns DMA engine to channel only if some DMA capable device was found. And as xfermask stripped out DMA bits, host->simplex_claimed is always NULL with current implementation. By allowing DMA either if simplex_claimed is NULL or if it points to current port DMA can be finally used - it gets assigned to first port which contains any DMA capable device. Before: pata_amd 0000:00:06.0: version 0.2.8 PCI: Setting latency timer of device 0000:00:06.0 to 64 ata5: PATA max UDMA/133 cmd 0x000101f0 ctl 0x000103f6 bmdma 0x0001f000 irq 14 ata6: PATA max UDMA/133 cmd 0x00010170 ctl 0x00010376 bmdma 0x0001f008 irq 15 scsi4 : pata_amd ata5.00: ATAPI, max UDMA/66 ata5.00: simplex DMA is claimed by other device, disabling DMA ata5.00: configured for PIO4 scsi5 : pata_amd ata6: port disabled. ignoring. ata6: reset failed, giving up scsi 4:0:0:0: CD-ROM ATAPI DVD W DH16W1P LG12 PQ: 0 ANSI: 5 After: pata_amd 0000:00:06.0: version 0.2.8 PCI: Setting latency timer of device 0000:00:06.0 to 64 ata5: PATA max UDMA/133 cmd 0x000101f0 ctl 0x000103f6 bmdma 0x0001f000 irq 14 ata6: PATA max UDMA/133 cmd 0x00010170 ctl 0x00010376 bmdma 0x0001f008 irq 15 scsi4 : pata_amd ata5.00: ATAPI, max UDMA/66 ata5.00: configured for UDMA/33 scsi5 : pata_amd ata6: port disabled. ignoring. ata6: reset failed, giving up scsi 4:0:0:0: CD-ROM ATAPI DVD W DH16W1P LG12 PQ: 0 ANSI: 5 Signed-off-by: Petr Vandrovec Signed-off-by: Jeff Garzik commit 9a2eb709256cd591119edc2809b4fcac7cb8eb6c Author: Alan Cox Date: Wed Mar 7 16:13:07 2007 +0000 ata_piix: Remove ugly layering violation A while ago I modified the libata code so that drivers can return -ENOENT for unknown ports not fiddle with the EH flags and print stuff directly. Somewhere along the line ata_piix didn't get fully converted. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0feba829ee82a6e43baabe3f0bdf91bd937a67a1 Author: Artem Bityutskiy Date: Thu Mar 8 10:35:10 2007 +0200 [JFFS2] print a message when marking bad block New bad eraseblock is an event which is important enough to be printed about. Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 8960909ca71da6120cad2fd7ece7dbe32ae05b40 Author: Ralf Baechle Date: Thu Mar 8 17:36:13 2007 +0000 [MIPS] DEC: Remove call to register_prom_console. Register_prom_console was removed when mips was converted to early printk. Signed-off-by: Ralf Baechle commit c7258a4477b5ed0243c28ec107b98bb946757448 Author: David Woodhouse Date: Fri Mar 9 11:44:00 2007 +0000 [JFFS2] Check for all-zero node headers Due to a poor choice of CRC32 seed, a node header which is all zeroes would pass the CRC32 check. Explicitly check for this case, and treat it as we do a CRC failure. Signed-off-by: David Woodhouse commit d7930085c28d295b573f6862ff863ccbb8a580ce Author: Len Brown Date: Thu Mar 8 18:30:25 2007 -0500 ACPI: repair nvidia early quirk breakage on x86_64 x86_64 nvidia_bugs() broke when we bailed out on not finding the HPET. However, the quirk works by checking for not finding the HPET... Delete the nvidia_hpet_detected flag and simply test for not finding the HPET, which is simple to do now that acpi_table_parse returns 1 on failure. Signed-off-by: Len Brown commit 470bc844361b238bcbe6a07ba47d51fca25f2742 Author: Kyungmin Park Date: Fri Mar 9 10:08:11 2007 +0900 [MTD] [OneNAND] Classify the page data and oob buffer Classify the page data and oob buffer and it prevents the memory fragementation (writesize + oobsize) Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit 5bc399e9ef430efd5725b66aa2ad7ad2d81e372b Author: Kyungmin Park Date: Fri Mar 9 09:41:07 2007 +0900 [MTD] [OneNAND] Exit the loop when transferring/filling of the oob is finished When transferring/filling of the oob is finished in OOB_AUTO, we exit the loop Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit 81280d5879761f90b3a341d52371d03998730d8e Author: Adrian Hunter Date: Thu Feb 15 09:47:29 2007 +0900 [MTD] [OneNAND] add Nokia Copyright and a credit add Nokia Copyright and a credit Signed-off-by: Adrian Hunter Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit e3da8067b3ef16943c02b64baa84dacca1e423be Author: Kyungmin Park Date: Thu Feb 15 09:36:39 2007 +0900 [MTD] [OneNAND] Fix typo & wrong comments Fix typo & wrong comments Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit 91014e9bfaaac32ab46ab46251d774468891bafe Author: Kyungmin Park Date: Mon Feb 12 10:34:39 2007 +0900 [MTD] [OneNAND] Use oob buffer instead of main one in oob functions In oob functions, it is used main buffer instead of oob one. So fix it. Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit d0035aef390194df1433f436038416d2c5b0fc0e Author: Dave Jones Date: Thu Mar 8 23:47:35 2007 -0500 [PATCH] build fix for i386 earlyquirk.c missing close bracket. Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 362ea087db9d99bb0cf79479544dfafa9e18c300 Author: Michael Karcher Date: Thu Mar 8 23:29:29 2007 -0500 ACPI: fix parallel port IRQ after resume from S3 The PNPACPI resource flags were broken. This would apply to re-enabling a device any-time after boot, not just after resume from S3. http://bugzilla.kernel.org/show_bug.cgi?id=6316 Acked-by: Shaohua Li Signed-off-by: Len Brown commit c9bf296b6467968ecb9d988e7ed754a19c2e63d9 Author: Henrique de Moraes Holschuh Date: Thu Mar 8 05:28:15 2007 -0300 ACPI: ibm-acpi: improve backlight power handling Improve the backlight code to emulate as much as possible the power management events, as we are unable to really power on or power off the backlight. Signed-off-by: Henrique de Moraes Holschuh Acked-by: Richard Purdie Signed-off-by: Len Brown commit a55028ff74356895a50359dd9fb74d523b66723f Author: Dave Jones Date: Thu Mar 8 19:45:26 2007 -0500 [PATCH] update 'getting sparse' info. - point to the sparse webpage - use git:// instead of rsync:// Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit fe69933652562f093ccde600cecf234930c01932 Author: Len Brown Date: Thu Mar 8 18:28:32 2007 -0500 [PATCH] ACPI: repair nvidia early quirk breakage on x86_64 x86_64 nvidia_bugs() broke when we bailed out on not finding the HPET. However, the quirk works by checking for _not_ finding the HPET... Delete the nvidia_hpet_detected flag and simply test for not finding the HPET, which is simple to do now that acpi_table_parse returns 1 on failure. Signed-off-by: Len Brown Signed-off-by: Linus Torvalds commit 2ef550790ac0d7bb0da1c6432f69f86f55ac1695 Author: David S. Miller Date: Thu Mar 8 14:48:36 2007 -0800 [SPARC64]: Fix PARPORT build (again). Need to provide {claim,release}_dma_lock() for this guy too. Signed-off-by: David S. Miller commit 55c9adde13dfc6b738e0f70c071a0622e52f35ed Author: Shirley Ma Date: Thu Mar 8 14:59:30 2007 -0800 IPoIB: Turn on interface's carrier after broadcast group is joined Do netif_carrier_on() right after the IPv4 broadcast multicast group is joined, rather than waiting for all of the initial set of multicast group joins to finish. This allows at least IPv4 traffic to limp along on broken fabrics where not all multicast groups can be joined. Signed-off-by: Shirley Ma Signed-off-by: Roland Dreier commit e2eb8d452827b8d1f73db384cd7c6482eac29478 Author: Jarek Poplawski Date: Thu Mar 8 14:43:41 2007 -0800 [SCTP] ipv6: inconsistent lock state ipv6_add_addr/sctp_v6_copy_addrlist lockdep found that dev->lock taken from softirq in ipv6_add_addr is also taken in sctp_v6_copy_addrlist with softirqs enabled, so lockup is possible. Noticed-by: Simon Arlott Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller commit ca4266359d0c1199af088447f209ab5bcc32a989 Author: Alan Cox Date: Thu Mar 8 23:13:50 2007 +0000 [PATCH] libata-acpi: Try and stop all the non PCI devices crashing For 2.6.20 it mostly used to just not work, for 2.6.21-rc it crashes, this seems to be down to luck (bad or good). The libata-acpi code needs to avoid doing PCI work on non-PCI devices. This is one hack although it's not pretty and perhaps there is a "right" way to check if a struct device * is PCI ? Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e3a696e03c861f69627185dd235366b9a4403454 Author: Tony Luck Date: Thu Mar 8 11:20:17 2007 -0800 [IA64] refresh config files Bring defconfig, tiger_defconfig and zx1_defconfig up to date. Also sprinkle KEXEC and KDUMP combinations around liberally so that my usual regression test builds will see all combinations: tiger_defconfig gets KEXEC=y, CRASH_DUMP=n zx1_defconfig gets KEXEC=n, CRASH_DUMP=y defconfig gets KEXEC=y, CRASH_DUMP=y others remain at KEXEC=n, CRASH_DUMP=n Signed-off-by: Tony Luck commit 2a3a2827c7cbe464610116cc17ca4fac63245a43 Author: Horms Date: Tue Mar 6 16:28:50 2007 +0900 [IA64] put kdump_find_rsvd_region in __init kdump_find_rsvd_region() is only called by reserve_memory() which is in __init, so it seems that kdump_find_rsvd_region() should also be in there. Signed-off-by: Simon Horman Signed-off-by: Tony Luck commit 1f0ef4ef60b4ef0a18dfc50938f3a94c5edd66ce Author: Keith Owens Date: Thu Mar 1 16:19:00 2007 +1100 [IA64] Remove sparse warning from unwind code Running ia64 through sparse gives warnings in the unwind code. include/asm-ia64/unwind.h:84:17: error: dubious bitfield without explicit `signed' or `unsigned' Make the bitfield explicitly unsigned. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 8e43d75ad0bd8a90933abb005ef57caf63ce8541 Author: Akiyama, Nobuyuki Date: Thu Feb 22 22:50:38 2007 +0900 [IA64] add missing syscall trace clear The ptrace misses clearing the syscall trace flag. The increased syscall overhead is retained after the trace is finished. This case happens when strace is terminated by force. Signed-off-by: Akiyama, Nobuyuki Signed-off-by: Tony Luck commit 0ac1faca4a63fc2f7e608be76127561b88fbcdd9 Author: Simon Horman Date: Wed Feb 14 16:15:02 2007 +0900 [IA64] Cleanup in crash.c Grammatical fixes (s/freezed/frozen/) Make some variables static Change a C++ "//" comment to "/* ... */" Signed-off-by: Simon Horman Signed-off-by: Tony Luck commit 297632544a7a761144636accdb558db9d99a3647 Author: Simon Horman Date: Wed Feb 14 16:17:47 2007 +0900 [IA64] kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h * Kexec adds some code to arch/ia64/kernel/smp.c which needs ia64_mca_pal_base, so the kexec patch (actually the kdump patch) declares this per-cpu variable in include/asm-ia64/kexec.h. * ia64_mca_pal_base is defined in arch/ia64/kernel/mca.c, so it seems to me that it would make a lot more sense to declare it in include/asm-ia64/mca.h. Signed-off-by: Simon Horman Signed-off-by: Tony Luck commit 8621235b2ede3276e9862540f0188e40471a99f7 Author: Zhang, Yanmin Date: Mon Feb 12 14:12:01 2007 +0800 [IA64] pci_get_legacy_ide_irq should return irq (not GSI) Function pci_get_legacy_ide_irq is incorrect on ia64. It should return irq vector instead of GSI. The fixed number 14 and 15 are just GSI. Signed-off-by: Zhang Yanmin Signed-off-by: Tony Luck commit 860abe8f7254208074cef83dc9ebc4d70ae277a9 Author: Horms Date: Wed Feb 7 15:49:25 2007 +0900 [IA64] whitespace fixes for include/asm-ia64/sal.h * Make use of spaces and tabs consistent * Make long line < 80col Signed-off-by: Simon Horman Signed-off-by: Tony Luck commit 396e8e76c5eda19184e7b14ba9f1dcd5c4ea8d7e Author: Russ Anderson Date: Wed Dec 20 11:32:27 2006 -0600 [IA64] Cache error recovery Similar to memory error recovery, when a cache error is consumed by a user process terminate the user instead of crashing the system. Signed-off-by: Russ Anderson (rja@sgi.com) Acked-by: Hidetoshi Seto Signed-off-by: Tony Luck commit 618b206f0b580d965eb26f704ed23beee2a8c25d Author: Russ Anderson Date: Thu Dec 14 16:01:41 2006 -0600 [IA64] Proper handling of TLB errors from duplicate itr.d dropins Jack Steiner noticed that duplicate TLB DTC entries do not cause a linux panic. See discussion: http://www.gelato.unsw.edu.au/archives/linux-ia64/0307/6108.html The current TLB recovery code is recovering from the duplicate itr.d dropins, masking the underlying problem. This change modifies the MCA recovery code to look for the TLB check signature of the duplicate TLB entry and panic in that case. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 908e0a8a265fe8057604a9a30aec3f0be7bb5ebb Author: Peter Zijlstra Date: Wed Mar 7 20:41:30 2007 -0800 [PATCH] ecryptfs: nested locking annotation ecryptfs uses a lock_parent() function, which I hope really locks the parents and is not abused Signed-off-by: Peter Zijlstra Cc: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f70c81d4ddb0d300abc252cb594198d3c797a5e1 Author: Pat Gefre Date: Wed Mar 7 20:41:29 2007 -0800 [PATCH] 2.6 Altix: console fix for CONFIG_DEBUG_SHIRQ usage The sn console driver was snagged by the use of CONFIG_DEBUG_SHIRQ! The request_irq() immediate call to the interrupt handler caused another attempt to lock the port lock - deadlock. This is a patch to fix that. Signed-off-by: Patrick Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44f5c4ced6ddee2f5f2e45fa45b93370245d85bd Author: Jeff Dike Date: Wed Mar 7 20:41:26 2007 -0800 [PATCH] uml: arch_prctl should set thread fs In my previous x86_64 thread fix, I forgot to initialize thread.arch.fs in arch_prctl. A process calling arch_prctl to set %fs would lose it on the next context switch. It also turns out that you can switch to a process which is in the process of exiting and which has lost its mm. In this case, it's worse than useless to try to call arch_prctl on the host process. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bebff6ca5871e07b665cdaf71028ea21eb0bf0e Author: suzuki Date: Wed Mar 7 20:41:24 2007 -0800 [PATCH] check_partition(): fix error check Fix inverted check introduced in 57881dd9df40b76dc7fc6a0d13fd75f337accb32 "Fix check_partition routines". Signed-off-by: Suzuki K P Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6dfb4fd7dd94429ef1d5233688aaed2a63f856b Author: Davide Libenzi Date: Wed Mar 7 20:41:21 2007 -0800 [PATCH] Add epoll compat_ code to fs/compat.c IA64 and ARM-OABI are currently using their own version of epoll compat_ code. An architecture needs epoll_event translation if alignof(u64) in 32 bit mode is different from alignof(u64) in 64 bit mode. If an architecture needs epoll_event translation, it must define struct compat_epoll_event in asm/compat.h and set CONFIG_HAVE_COMPAT_EPOLL_EVENT and use compat_sys_epoll_ctl and compat_sys_epoll_wait. All 64 bit architecture should use compat_sys_epoll_pwait. [sfr: restructure and move to fs/compat.c, remove MIPS version of compat_sys_epoll_pwait, use __put_user_unaligned] Signed-off-by: Stephen Rothwell Cc: David Woodhouse Cc: Russell King Cc: "Luck, Tony" Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b40df5743ee8aed8674edbbb77b8fd3c8c7a747f Author: Jiri Kosina Date: Wed Mar 7 20:41:18 2007 -0800 [PATCH] bluetooth: fix socket locking in hci_sock_dev_event() [Bluetooth] Fix socket locking in hci_sock_dev_event() hci_sock_dev_event() uses bh_lock_sock() to lock the socket lock. This is not deadlock-safe against locking of the same socket lock in l2cap_connect_cfm() from softirq context. In addition to that, hci_sock_dev_event() doesn't seem to be called from softirq context, so it is safe to use lock_sock()/release_sock() instead. The lockdep warning can be triggered on my T42p simply by switching the Bluetooth off by the keyboard button. ================================= [ INFO: inconsistent lock state ] 2.6.21-rc2 #4 --------------------------------- inconsistent {in-softirq-W} -> {softirq-on-W} usage. khubd/156 [HC0[0]:SC0[0]:HE1:SE1] takes: (slock-AF_BLUETOOTH){-+..}, at: [] hci_sock_dev_event+0xa8/0xc5 [bluetooth] {in-softirq-W} state was registered at: [] mark_lock+0x59/0x414 [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] __lock_acquire+0x3e5/0xb99 [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] lock_acquire+0x67/0x81 [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] _spin_lock+0x29/0x34 [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] l2cap_connect_cfm+0x4e/0x11f [l2cap] [] hci_send_cmd+0x126/0x14f [bluetooth] [] hci_event_packet+0x729/0xebd [bluetooth] [] hci_rx_task+0x2a/0x20f [bluetooth] [] hci_rx_task+0x6c/0x20f [bluetooth] [] trace_hardirqs_on+0x10d/0x14e [] tasklet_action+0x3d/0x68 [] __do_softirq+0x41/0x92 [] do_softirq+0x27/0x3d [] do_IRQ+0x7b/0x8f [] common_interrupt+0x24/0x34 [] common_interrupt+0x2e/0x34 [] acpi_processor_idle+0x1b3/0x34a [] acpi_processor_idle+0x1b6/0x34a [] cpu_idle+0x39/0x4e [] start_kernel+0x372/0x37a [] unknown_bootoption+0x0/0x202 [] 0xffffffff Signed-off-by: Jiri Kosina Acked-by: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47c51dff4af25341c575e5089dbb92d61ac69cdf Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:17 2007 -0800 [PATCH] x86_64: fix 2.6.18 regression - PTRACE_OLDSETOPTIONS should be accepted Also PTRACE_OLDSETOPTIONS should be accepted, as done by kernel/ptrace.c and forced by binary compatibility. UML/32bit breaks because of this - since it is wise enough to use PTRACE_OLDSETOPTIONS to be binary compatible with 2.4 host kernels. Until 2.6.17 (commit f0f2d6536e3515b5b1b7ae97dc8f176860c8c2ce) we had: default: return sys_ptrace(request, pid, addr, data); Instead here we have: case PTRACE_GET_THREAD_AREA: case ...: return sys_ptrace(request, pid, addr, data); default: return -EINVAL; This change was a style change - when a case is added, it must be explicitly tested this way. In this case, not enough testing was done. Cc: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de7b37cd01f145dd3a3ca333fd631e58ec0bdbab Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:14 2007 -0800 [PATCH] um: fix errno usage Avoid reusing userspace errno twice - it can be cleared by libc code everywhere (in particular printk() does clear it in my setup). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f97869df672f7f05ce3e8672ca42792d6df852b Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:13 2007 -0800 [PATCH] uml: activate_fd: return ENOMEM only when appropriate Avoid returning ENOMEM in case of a duplicate IRQ - ENOMEM was saved into err earlier. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec0ac8ad33189f81324948ee5dc72d3e1dc64682 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:12 2007 -0800 [PATCH] um: fix confusion irq early reenabling Fix confusion about call context - comments and code are inconsistent and plain wrong, my fault. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b53378856f4ea43182d13658f7c2138971366148 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:11 2007 -0800 [PATCH] um: mark both consoles as CON_ANYTIME Since both UML consoles do not use percpu variables, they may be called when the cpu is still offline, and they may be marked CON_ANYTIME (this is documented in kernel/printk.c, grep for CON_ANYTIME to find mentions of this). Works well in testing done with lock debug enabled, should be safe but is not needed for next release. This would probably help also stderr_console.c, but this is yet to test. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ff1d36cf4b8b7dc4efbc83ac617a63020b1125d Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:10 2007 -0800 [PATCH] um: remove dead code about os_usr1_signal() and os_usr1_process() os_usr1_signal() is totally unused, os_usr1_process() is used only by TT mode. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83f4e8afc9a22eabb1c4cb771ffcb3af81734082 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:09 2007 -0800 [PATCH] um: fix a memory leak in the multicast driver Memory allocated by mcast_user_init must be freed in the matching mcast_remove. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6eb0be6d5cc1851deb6619e6f8b1bbd0a0dbab4 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:08 2007 -0800 [PATCH] uml: hostfs: make hostfs= option work as a jail, as intended. When a given host directory is specified to be mounted both in hostfs=path1 and with mount option -o path2, we should give access to path1/path2, but this does not happen. Fix that in the simpler way. Also, root_ino can be the empty string, since we use %s/%s as format. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bca271136f06514253aa28c24c04fc23b88e971e Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Mar 7 20:41:07 2007 -0800 [PATCH] uml: hostfs: fix double free Fix double free in the error path - when name is assigned into root_inode we do not own it any more and we must not kfree() it - see patch for details. Thanks to William Stearns for the initial report. CC: William Stearns Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abc23585b9b625ad58db54ae0d180543db014eb8 Author: Richard Purdie Date: Wed Mar 7 00:45:41 2007 +0100 [ARM] 4251/1: Fix sharpsl_pm dependency The sharpsl_pm code depends on some symbols in the APM emulation code. Add the dependency for now until a better solution can be found. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 2a391a184551d5ffdee73c740a06f6a0a16f7ed5 Author: Richard Purdie Date: Wed Mar 7 00:29:33 2007 +0100 [ARM] 4250/1: Fix locomo backlight conversion error/compile failure Fix locomo backlight conversion error and subsequent compile failure from commit 599a52d12629394236d785615808845823875868. Signed-off-by: RIchard Purdie Signed-off-by: Russell King commit 774830377b79ae4c2e85dea78443b5ae01a97e69 Author: Richard Purdie Date: Wed Mar 7 00:02:15 2007 +0100 [ARM] 4249/1: Fix tosa compile failure Fix tosa compile failure from commit 32f3f49910c7e228839c1cd144dbed8da342703b Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 25613cae00cb66d4cb080c72d53bca0a599e0112 Author: Dan Williams Date: Tue Mar 6 23:46:36 2007 +0100 [ARM] 4248/1: lh7a40x: fix missing definitions for get_irqnr_preamble commit f80dff9da07d81da16e3b842118d47b9febf9c01 missed the needed definitions within the #elif blocks in include/asm-arm/arch-lh7a40x/entry-macro.S Signed-off-by: Dan Williams Signed-off-by: Russell King commit ce2b5ec3535fd4cf47d9fceeb4bb118479941eaa Author: Uwe Kleine-König Date: Tue Mar 6 13:46:04 2007 +0100 [ARM] 4247/1: Fix long name for cc9p9360dev The Product Manager of the cc9p insist on using the correct product names. Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King commit 74641d75275936796d239f828b80cb030e9f9b0a Author: Adrian Hunter Date: Thu Mar 8 12:20:12 2007 +0200 [MTD] Correct partition failed erase address If an erase operation fails, the address at which the failure occurred is returned by the driver. The MTD partition must adjust this address (by subtracting the partition offset) before returning to the caller. This was not happening, which caused JFFS2 to mark the wrong block bad! Signed-off-by: Adrian Hunter Signed-off-by: David Woodhouse commit f8a922c7bb4d93bd84b7371a8e2571e667d2afb5 Author: David Woodhouse Date: Thu Mar 8 10:28:30 2007 +0000 [JFFS2] Use yield() between GC passes in background thread. The garbage collection thread is strictly an optimisation. Everything it does would also be done just-in-time in the context of something in userspace trying to access the file system. Sometimes, however, it's a pessimisation. Especially during early boot when it's checksumming nodes and scanning inodes which are shortly going to be pulled in by read_inode anyway. We end up building the rbtree of node coverage twice for the same inode. By switching to yield() instead of cond_resched() in the main loop, we observe boot times on the OLPC system going down from about 100 seconds to 60. Signed-off-by: David Woodhouse commit 89e2bf61da9d7664293a57100a419f8116252607 Author: Robert P. J. Day Date: Wed Mar 7 18:33:25 2007 -0500 [MTD] [NAND] Correct misspelled preprocessor variable. Replace the apparently misspelled preprocessor variable "MTD_NAND_DISKONCHIP_BBTWRITE" with the correct form "CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE". Signed-off-by: Robert P. J. Day Signed-off-by: David Woodhouse commit 99109a6dacfc314a51371d9c3212a55cd7c0c98c Author: Alan Cox Date: Wed Mar 7 16:36:01 2007 +0000 [MTD] [MAPS] dilnetpc: Fix printk warning The type of a resource could be 32 or 64bit depending upon platform or option so cast it explicitly. Signed-off-by: Alan Cox Signed-off-by: David Woodhouse commit 83d480917b1af3f8fcffa7a9c8775e0f2dd03395 Author: Vijay Sampath Date: Tue Mar 6 02:39:44 2007 -0800 [MTD] [NOR] Fix oops in cfi_amdstd_sync The files cfi_cmdset_0002.c and cfi_cmdset_0020.c do not initialize their wait queues like is done in cfi_cmdset_0001.c. This causes an oops when the wait queue is accessed. I have copied the code from cfi_cmdset_0001.c that is pertinent to initialization of the wait queue. Signed-off-by: Vijay Sampath Acked-by: Joern Engel Acked-by: Josh Boyer Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit dc164bbb4b5be9df4f249ab33576fa783c363b93 Author: Cyrill Gorcunov Date: Tue Mar 6 02:39:45 2007 -0800 [MTD] ESB2 check for closed ROM window Add checking for closed ROM window on Intel ESB2 Southbridge. Signed-off-by: Cyrill Gorcunov Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 180bfb31fef77815d56b875d4f28d353fdc87bf8 Author: Vitaly Wool Date: Tue Mar 6 17:01:04 2007 +0300 [JFFS2] Fix writebuffer recovery in the first page of a block For the case when nand_write_page fail with -EIO for the first page in an eraseblock, jffs2_wbuf_recover ends up producing a BUG in jffs2_block_refile as jeb->first_node is not yet set up (it's set up later in jffs2_wbuf_recover). This BUG is not really a bug; it's just jffs2_wbuf_recover calling jffs2_block_refile with the wrong second parameter. This patch takes care of this situation. Signed-off-by: Vitaly Wool Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse commit 1f92267c51a514f35ad5b0fd46cb099c0980b679 Author: Vitaly Wool Date: Tue Mar 6 16:56:34 2007 +0300 [MTD] [NAND] make oobavail public During the MTD rework the oobavail parameter of mtd_info structure has become private. This is not quite correct in terms of integrity and logic. If we have means to write to OOB area, then we'd like to know upfront how many bytes out of OOB are spare per page to be able to adapt to specific cases. The patch inlined adds the public oobavail parameter. Signed-off-by: Vitaly Wool Signed-off-by: David Woodhouse commit 2f894ef9c8b36a35d80709bedca276d2fc691941 Author: Shaohua Li Date: Thu Mar 8 03:42:42 2007 -0500 ACPI: fix boot hang w/o "noapic" on MSI MS-6390-L This is a workaround to handle a BIOS bug where the programmer exchanged the name and index fields of a _PRT entry. Apparently this BIOS error does not confuse Windows and thus it lurks in the field on various machines. boot with "acpi=strict" to disable this workaround http://bugzilla.kernel.org/show_bug.cgi?id=6859 Signed-off-by: Shaohua Li Signed-off-by: Len Brown commit 74586fca38109d2fc75daf678635928f64b4ccec Author: Len Brown Date: Thu Mar 8 02:48:30 2007 -0500 ACPI: fix Thinkpad 600/600E/600X interrupts The root cause of this bug shows that this machine could not possibly run an ACPI-aware OS without a model specific workaround. http://bugzilla.kernel.org/show_bug.cgi?id=5966 Signed-off-by: Len Brown commit f194bda4ce7e71cc95535f494a4a5515cd91ed85 Author: Kumar Gala Date: Wed Mar 7 23:14:57 2007 -0600 [POWERPC] 85xx: Enable CONFIG_SERIAL_8250_SHARE_IRQ On chip 8250 UARTs share an interrupts on existing 85xx processors. Signed-off-by: Kumar Gala commit 49fdf3f078f8f5d84ecd10d62624c9158e755ec7 Author: Segher Boessenkool Date: Thu Feb 22 23:52:02 2007 +0100 [POWERPC] Select u-image as default image for Linkstation Fixes image build error: ln: accessing `arch/powerpc/boot/zImage': No such file or directory make[1]: *** [arch/powerpc/boot/zImage] Error 1 make: *** [zImage] Error 2 Signed-off-by: Segher Boessenkool Acked-by: G. Liakhovetski Signed-off-by: Kumar Gala commit aea12b75480c0842028bd1bfe0146d9148db2298 Author: Li Yang Date: Tue Mar 6 17:11:06 2007 +0800 [POWERPC] 83xx: Minor fixes for 834x_mds USB setup code Fix broken node manipulating code, and clarify inaccurate comment. Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 3ca5de6dd4ec5a139b2b8f00dce3e4726ca91af1 Author: Dmitry Torokhov Date: Wed Mar 7 23:20:55 2007 -0500 Input: i8042 - another attempt to fix AUX delivery checks Do not assume that AUX_LOOP command is broken unless it completes successfully but returns wrong (unexpected) data. Signed-off-by: Dmitry Torokhov commit 7d9f3e85f45e8f636bdd7ce5f0b1704034380175 Author: Pavel Roskin Date: Mon Mar 5 19:28:00 2007 -0600 [PATCH] bcm43xx: Fix assertion failures in interrupt handler In the bcm43xx interrupt handler, sanity checks are wrongly done before the verification that the interrupt is for the bcm43xx. Signed-off-by: Pavel Roskin Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit d632f9fa38203ad5bac31e46921812216693b14f Author: Joerg Sommer Date: Fri Mar 2 12:32:06 2007 -0600 [PATCH] bcm43xx: Fix bug in frequency to channel conversion The frequency to channel routine in bcm43xx requires that the frequency be in MHz, but that condition is not always met. This patch does the necessary conversion. Signed-off-by: Joerg Sommer Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 01a597769c7ef4db979c6a23aa97e5d2e53cbc46 Author: Larry Finger Date: Wed Feb 28 14:54:39 2007 -0600 [PATCH] bcm43xx: Fix errors in specs to code translation in B6PHY init There are three errors in the transcription of the latest revision to the B6PHY init specifications. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit b2e569d876e153365b01525a102b7d90bb309446 Author: Ralf Baechle Date: Thu Mar 8 00:47:11 2007 +0000 [MIPS] ARC: Fix several compiler warnings. CC arch/mips/arc/init.o arch/mips/arc/init.c: In function 'prom_init': arch/mips/arc/init.c:27: warning: ISO C90 forbids mixed declarations and code arch/mips/arc/init.c:35: warning: format ‘%08lx’ expects type ‘long unsigned int’, but argument 2 has type 'ULONG' arch/mips/arc/init.c:28: warning: unused variable 'c' arch/mips/arc/init.c:27: warning: unused variable ‘cnt’ Signed-off-by: Ralf Baechle commit 012390517e3e6734d381ff81c4a7e9817636e2f1 Author: Ralf Baechle Date: Thu Mar 8 00:45:26 2007 +0000 [MIPS] ISA: Fix typo Lost CONFIG_ prefix discovered by Robert P. J. Day . Signed-off-by: Ralf Baechle commit b35692ebdef0c1cd4a05a58559a94ced54ff9c82 Author: Ralf Baechle Date: Thu Mar 8 00:14:25 2007 +0000 [CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl. o Fix use of uninitialized variable sec. o Make the RTC_ALM_SET ioctl return -EINVAL for non-zero seconds - the DS1286 has no second field for the alarm time. o Replace the obscure BIN_TO_BCD macro with BIN2BCD. Signed-off-by: Ralf Baechle commit 3bc207d2b72ea0e6927cccc653c2dc8be593f89f Author: Fenghua Yu Date: Mon Feb 12 16:27:10 2007 -0800 [IA64] fsys_getcpu for IA64 On 1.6GHz Montectio Tiger4, the following performance data is measured with kernel built with defconfig which has NUMA configured: Fastest sys_getcpu: 502 itc counts. Fastest fsys_getcpu: 28 itc counts. fsys_getcpu performance is largly impacted by whether data (node_to_cpu_map etc) is in cache. It can take fsys_getcpu up to ~150 itc counts in cold cache case. Signed-off-by: Fenghua Yu Signed-off-by: Tony Luck commit ddbad076303dfc0ed4fcba53907dc175bb6d67b2 Author: Horms Date: Tue Mar 6 16:20:10 2007 +0900 [IA64] remove duplicate declaration of efi_initialize_iomem_resources efi_initialize_iomem_resources() is declared in both include/linux/efi.h and arch/ia64/kernel/setup.c. This patch removes the latter. Signed-off-by: Simon Horman Signed-off-by: Tony Luck commit e55fdf11f3029bcd41b1b9547ad9db12c27eea76 Author: Tony Luck Date: Wed Mar 7 16:13:25 2007 -0800 [IA64] Pick highest possible saved_max_pfn for crash_dump Berhhard Walle noted that on his HP rx8640 he ended up with saved_max_pfn smaller than the highest address of system ram in /proc/iomem and proposed a patch to base the address on the unrounded and unfiltered EFI memory map address. Simon Horman and Magnus Damm suggested that the whole test be moved earlier in the function. This is the combination of both of these patches. Signed-off-by: Tony Luck commit de79059ecd7cd650f3788ece978a64586921d1f1 Author: Aji Srinivas Date: Wed Mar 7 16:10:53 2007 -0800 [BRIDGE]: adding new device to bridge should enable if up One change introduced by the workqueue removal patch is that adding an interface that is up to a bridge which is also up does not ever call br_stp_enable_port(), leaving the port in DISABLED state until we do ifconfig down and up or link events occur. The following patch to the br_add_if function fixes it. This is a regression introduced in 2.6.21. Submitted-by: Aji_Srinivas@emc.com Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c7ababbdc647e67e953d153ddf62cbdc9fe3297e Author: Herbert Xu Date: Wed Mar 7 16:02:40 2007 -0800 [IPV6]: Do not set IF_READY if device is down Now that we add the IPv6 device at registration time we don't need to set IF_READY in ipv6_add_dev anymore because we will always get a NETDEV_UP event later on should the device ever become ready. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 16bec31db751030171b31d7767fa3a5bdbe980ea Author: Eric Paris Date: Wed Mar 7 16:02:16 2007 -0800 [IPSEC]: xfrm audit hook misplaced in pfkey_delete and xfrm_del_sa Inside pfkey_delete and xfrm_del_sa the audit hooks were not called if there was any permission/security failures in attempting to do the del operation (such as permission denied from security_xfrm_state_delete). This patch moves the audit hook to the exit path such that all failures (and successes) will actually get audited. Signed-off-by: Eric Paris Acked-by: Venkat Yekkirala Acked-by: James Morris Signed-off-by: David S. Miller commit 215a2dd3b43e0dc425e81d21de9d961416b1dad4 Author: Eric Paris Date: Wed Mar 7 16:01:45 2007 -0800 [IPSEC]: Add xfrm policy change auditing to pfkey_spdget pfkey_spdget neither had an LSM security hook nor auditing for the removal of xfrm_policy structs. The security hook was added when it was moved into xfrm_policy_byid instead of the callers to that function by my earlier patch and this patch adds the auditing hooks as well. Signed-off-by: Eric Paris Acked-by: Venkat Yekkirala Acked-by: James Morris Signed-off-by: David S. Miller commit ef41aaa0b755f479012341ac11db9ca5b8928d98 Author: Eric Paris Date: Wed Mar 7 15:37:58 2007 -0800 [IPSEC]: xfrm_policy delete security check misplaced The security hooks to check permissions to remove an xfrm_policy were actually done after the policy was removed. Since the unlinking and deletion are done in xfrm_policy_by* functions this moves the hooks inside those 2 functions. There we have all the information needed to do the security check and it can be done before the deletion. Since auditing requires the result of that security check err has to be passed back and forth from the xfrm_policy_by* functions. This patch also fixes a bug where a deletion that failed the security check could cause improper accounting on the xfrm_policy (xfrm_get_policy didn't have a put on the exit path for the hold taken by xfrm_policy_by*) It also fixes the return code when no policy is found in xfrm_add_pol_expire. In old code (at least back in the 2.6.18 days) err wasn't used before the return when no policy is found and so the initialization would cause err to be ENOENT. But since err has since been used above when we don't get a policy back from the xfrm_policy_by* function we would always return 0 instead of the intended ENOENT. Also fixed some white space damage in the same area. Signed-off-by: Eric Paris Acked-by: Venkat Yekkirala Acked-by: James Morris Signed-off-by: David S. Miller commit 05e52dd7396514648fba6c275eb7b49eca333c6d Author: Philipp Reisner Date: Wed Mar 7 12:55:39 2007 -0800 [CONNECTOR]: Bugfix for cn_call_callback() When system under heavy stress and must allocate new work instead of reusing old one, new work must use correct completion callback. Patch is based on Philipp's and Lars' work. I only cleaned small stuff (and removed spaces instead of tabs). Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit 151a99317ee9efcfd3e642da62e1edf4f47fcb3e Author: Gerrit Renker Date: Wed Mar 7 12:53:48 2007 -0800 [DCCP]: Revert patch which disables bidirectional mode This reverts an earlier patch which disabled bidirectional mode, meaning that a listening (passive) socket was not allowed to write to the other (active) end of the connection. This mode had been disabled when there were problems with CCID3, but it imposes a constraint on socket programming and thus hinders deployment. A change is included to ignore RX feedback received by the TX CCID3 module. Many thanks to Andre Noll for pointing out this issue. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 286930797d74b2c9a5beae84836044f6a836235f Author: David S. Miller Date: Wed Mar 7 12:50:46 2007 -0800 [IPV6]: Handle np->opt being NULL in ipv6_getsockopt_sticky(). Signed-off-by: David S. Miller commit d644329bc9f10213a282387dfe4984ff891dd768 Author: Herbert Xu Date: Tue Mar 6 20:26:48 2007 -0800 [UDP]: Reread uh pointer after pskb_trim The header may have moved when trimming. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit ba5dcee128d9f2877a6d2a5b150c24d90d77dad1 Author: Patrick McHardy Date: Tue Mar 6 20:24:53 2007 -0800 [NETFILTER]: nfnetlink_log: fix crash on bridged packet physoutdev is only set on purely bridged packet, when nfnetlink_log is used in the OUTPUT/FORWARD/POSTROUTING hooks on packets forwarded from or to a bridge it crashes when trying to dereference skb->nf_bridge->physoutdev. Reported by Holger Eitzenberger Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 881dbfe8accc9434dd0d7d052505e3dca6ad9b3c Author: Patrick McHardy Date: Tue Mar 6 20:24:35 2007 -0800 [NETFILTER]: nfnetlink_log: zero-terminate prefix Userspace expects a zero-terminated string, so include the trailing zero in the netlink message. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit dd63006b8fb5abf2336e145632610c6175a28fea Author: Patrick McHardy Date: Tue Mar 6 20:24:18 2007 -0800 [NETFILTER]: nf_conntrack_ipv6: fix incorrect classification of IPv6 fragments as ESTABLISHED The individual fragments of a packet reassembled by conntrack have the conntrack reference from the reassembled packet attached, but nfctinfo is not copied. This leaves it initialized to 0, which unfortunately is the value of IP_CT_ESTABLISHED. The result is that all IPv6 fragments are tracked as ESTABLISHED, allowing them to bypass a usual ruleset which accepts ESTABLISHED packets early. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e253eb0c082e71082cc980a0c81582c2bc734605 Author: KAMEZAWA Hiroyuki Date: Wed Mar 7 14:57:35 2007 -0800 [IA64] fix NULL pointer in ia64/irq_chip-mask/unmask function This patch fixes boot failure because irq_desc->mask() is NULL. - Added mask/unmask functions to ia64's irq desc function table. - rename hw_interrupt_type to irq_chip. hw_interrupt_type is old name. - Tony: Added same change to arch/ia64/sn/kernel/irq.c as pointed out by Eric Biederman ... mask/unmask functions there can be no-op. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit c3f49bc209b28d2b5f82b78baaa827eb3a4d1891 Author: Steven Whitehouse Date: Wed Mar 7 09:06:48 2007 +0000 [GFS2] Fix bz 229873, alternate test: assertion "!ip->i_inode.i_mapping->nrpages" failed The following removes an incorrect assertion from the GFS2 glops code. This fixes Red Hat bz 229873. Thanks to Abhijith Das for testing the patch and confirming the fix. Signed-off-by: Steven Whitehouse Cc: Abhijith Das commit 95d97b7dd7d7a7a13d11a38b3ecb64849d2e5086 Author: akpm@linux-foundation.org Date: Mon Mar 5 23:10:39 2007 -0800 [GFS2] build fix fs/gfs2/glock.c:2198: error: 'THIS_MODULE' undeclared here (not in a function) Cc: Steven Whitehouse Signed-off-by: Andrew Morton commit 631c42e170564108423fa4073531db159f2523ea Author: Steven Whitehouse Date: Thu Mar 1 10:36:32 2007 +0000 [GFS2] go_drop_bh is never used, so remove it The ->go_drop_bh function is never used, so this removes it and the single caller, Signed-off-by: Steven Whitehouse commit 04b159b132c0d8e92dae8c72f134fd5b13b43deb Author: Steven Whitehouse Date: Thu Mar 1 11:14:44 2007 +0000 [GFS2] Remove unused variable Remove an unused variable. Signed-off-by: Steven Whitehouse commit 1be3867955731b5cb2dc14060cc46f0882e87873 Author: Steven Whitehouse Date: Thu Mar 1 10:00:53 2007 +0000 [GFS2] Fix bz 229831, lookup returns wrong inode The following patch fixes Red Hat bz 229831. Without this patch its possible for the wrong inode to be returned in certain cases. It is a pretty unusual event, so that its taken some time to track down. Thanks and due to Josef Whiter who did a lot of the testing required to thrack this down and fix it. Signed-off-by: Steven Whitehouse commit cad5b9392754910ee7dbe551eb004010a864c882 Author: Steven Whitehouse Date: Wed Feb 28 14:03:00 2007 +0000 [GFS2] Fix bz 230143, incorrect flushing of rgrps The below patch fixes a problem where we were not flushing rgrps correctly. It only occurred in the specific case that a callback was received for an rgrp which was dirty and when a journal log flush had not already resulted in the rgrp being flushed anyway. This fixes Red Hat bz 230143, Signed-off-by: Steven Whitehouse commit fb0d3bce8e88cca4abb26076f778f64edcaf19aa Author: Wendy Cheng Date: Wed Feb 28 11:24:25 2007 -0500 [GFS2] pass formal ino in do_filldir_main ok, the following is the minimum changes to get NFSD going before we settle down this issue .. would appreciate this in the tree so other NFS related works can get done in parallel. Signed-off-by: S. Wendy Cheng Signed-off-by: Steven Whitehouse commit 84c6e8cd359adc34d21e40efcafe09297510b3c8 Author: Adrian Bunk Date: Mon Feb 26 00:18:42 2007 +0100 [DLM] fs/dlm/user.c should #include "user.h" Every file should include the headers containing the prototypes for it's global functions. Signed-off-by: Adrian Bunk Signed-off-by: Steven Whitehouse commit a13cbe375303585fec1425135ed54adb62be41fc Author: Josef Whiter Date: Fri Feb 23 12:49:51 2007 -0500 [GFS2] fix hangup when multiple processes are trying to write to the same file This fixes a problem I encountered while running bonnie++. When you have one thread that opens a file and starts to write to it, and then another thread that tries to open and write to the same file, the second thread will loop forever trying to grab the inode lock for that inode. Basically we come in through generic_buffered_file_write, which calls gfs2_prepare_write, which then attempts to grab the glock. Because we don't own the lock, gfs2_prepare_write gets GLR_TRYFAILED, which returns AOP_TRUNCATED_PAGE to generic_buffered_file_write. At this point generic_buffered_file_write loops around again and immediately retries the prepare_write. This means that the second process never gets off of the processor in order to allow the process that holds the lock to finish its work and let go of the lock. This patch makes gfs2_glock_nq schedule() if it gets back a GLR_TRYFAILED, which resolves this problem. Signed-off-by: Josef Whiter Signed-off-by: Steven Whitehouse commit a7d2b2bdc9a0b55d5b08e15756c7e65c48c4bca5 Author: Wendy Cheng Date: Fri Feb 23 00:21:17 2007 -0500 [GFS2] NFS filehandle check File handle checking error found in '07 NFS connectathon. The fh_type and fh_len are not necessarily identical. Some of the client machines could fail mount with stale filehandle without this patch. Signed-off-by: S. Wendy Cheng Signed-off-by: Steven Whitehouse commit d5a6751b32c79680da90eaa76919ffe6e5b8a94f Author: Richard Fearn Date: Sat Feb 17 17:29:15 2007 +0000 [GFS2] add newline to printk message Patch for the 2.6.20 stable tree that adds a missing newline to one of the printk messages in fs/gfs2/ops_fstype.c. Signed-off-by: Richard Fearn Signed-off-by: Steven Whitehouse commit 2e95b6653bb69c893e6ee1b42b537939c1ea2b9c Author: Josef Whiter Date: Tue Feb 20 00:03:29 2007 -0500 [GFS2] fix locking mistake This patch fixes a locking mistake in the quota code, we do a mutex_lock instead of a mutex_unlock. Signed-off-by: Josef Whiter Signed-off-by: Steven Whitehouse commit d04f41e35343f1d788551fd3f753f51794f4afcf Author: Ingo Molnar Date: Wed Mar 7 18:12:31 2007 +0100 [PATCH] CPU hotplug: call check_tsc_sync_source() with irqs off check_tsc_sync_source() depends on being called with irqs disabled (it checks whether the TSC is coherent across two specific CPUs). This is incidentally true during bootup, but not during cpu hotplug __cpu_up(). This got found via smp_processor_id() debugging. disable irqs explicitly and remove the unconditional enabling of interrupts. Add touch_nmi_watchdog() to the cpu_online_map busy loop. this bug is present both on i386 and on x86_64. Reported-by: Michal Piotrowski Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit b5d99e64bc6ec1eef03ed5ffe99088b28f5ad4a4 Author: Benjamin Herrenschmidt Date: Wed Mar 7 11:27:55 2007 +0100 [POWERPC] Fix warning in powermac pci.c This fixes a warning due to unused result from pci_enable_device() in powermac pci.c Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit e71c5c38ed578b4fff3139cc5c76fb5d0544f80c Author: Benjamin Herrenschmidt Date: Wed Mar 7 11:27:45 2007 +0100 [POWERPC] Fix warning in powermac feature.c This fixes a warning due to unused return from pci_enable_device() in powermac feature.c core99_ata100_enable() function. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 84532c91206bc6748991fb1ae3ba8a1894d339fa Author: Benjamin Herrenschmidt Date: Wed Mar 7 11:27:37 2007 +0100 [POWERPC] Fix warning in prom_parse.c of_irq_map_oldworld() This function spews a warning due to possible use of an uninitialized variable. This can happen on broken device-trees or when called with a NULL argument. Makes ure we properly fail instead. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 8388374f1cd45ef67039d3ea128d250fac484df3 Author: Ishizaki Kou Date: Fri Mar 2 16:59:25 2007 +0900 [POWERPC] Celleb: bug fix caused by not casting pointer types This fixes a bug caused by changes of pointer type in commit f1fda89522c5aaa1bd4ef69605e85e6ee9c85faf. hose->cfg_addr type is "volatile unsigned int __iomem *", so "hose->cfg_addr + X" will not make an intended address. This patch also adds comments for usage of cfg_addr and cfg_data in pci_controller structure. We use them in irregular way, and the original code is short of explanations about them. Signed-off-by: Kou Ishizaki Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c99176a230097b076c2f98e4bf963399fe114ffd Author: Michael Ellerman Date: Mon Feb 26 18:14:06 2007 +0900 [POWERPC] Add missing newline in xmon help output My patch to add spu disassembly (af89fb8041562508895c8f3ba04790d7c2f4338c) removed a newline from the xmon help that it shouldn't have, put it back. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 3546e811f13673f2364c15d966a178e8b670cbce Author: Olof Johansson Date: Mon Feb 26 00:35:14 2007 -0600 [POWERPC] No DEEPNAP on 970MP 1.0 970MP rev 1.0 is reported to have nonworking DEEPNAP support, we've had bug reports of lockups on those machines. Appearantly Apple used them on some dual-core dual-cpu systems. Rev 1.1 is OK, and that's the one that all 4-way systems seem to use. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit a9e28d9b0b269a68a19e4ff0f6b9473f86b01358 Author: Gary Zambrano Date: Fri Mar 2 16:57:46 2007 -0800 avr32: dma-mapping.h Added dma_sync_single_range_for_cpu/device to dma-mapping.h in asm-avr32 to call dma_sync_single_for_cpu/device. This patch enables b44 to compile on systems with these cpus. This patch was created with the assumption that another method of dma_sync_single_range_for_cpu/device does not exist on these architectures. Signed-off by: Gary Zambrano Signed-off-by: Andrew Morton Signed-off-by: Haavard Skinnemoen commit 28c1d39db83357bad55e3482fe09386429728ded Author: Haavard Skinnemoen Date: Thu Mar 1 16:32:31 2007 +0100 [AVR32] Don't use kmap() in flush_icache_page() flush_icache_page() can be called from atomic context, so we can't use kmap(). Use page_address() instead. Signed-off-by: Haavard Skinnemoen commit a19b4a14053f24e2df93b6bcc72ed1086cce0de4 Author: Haavard Skinnemoen Date: Thu Mar 1 10:37:35 2007 +0100 [AVR32] Fix bogus ti->flags manipulation in debug handler We should OR in a bitmask, not a bit offset, into ti->flags. This might fix some strange behaviour when single stepping. Also, use set_ti_thread_flag() to manipulate the flags to avoid surprises in the future. Signed-off-by: Haavard Skinnemoen commit bfa4f55cc8d17e3944a4b5d08e2cce7d5a55a2d6 Author: Haavard Skinnemoen Date: Thu Feb 22 18:58:18 2007 +0100 [AVR32] Fix typo in include/asm-avr32/Kbuild It's header-y, not headers-y. Signed-off-by: Haavard Skinnemoen commit 3338368e922a6686a3b3d6f4da07babd224788d4 Author: Haavard Skinnemoen Date: Wed Feb 21 13:08:06 2007 +0100 [AVR32] show_trace: Only walk valid stack addresses Terminate the frame pointer walk if (a) the address is outside the task's kernel stack or (b) if the frame pointer isn't monotonically increasing. Without this fix, show_trace() may enter an infinite loop, walking through random data anywhere in memory. Since any address within the kernel stack is guaranteed to be valid, we may eliminate the __get_user() calls as well. Signed-off-by: Haavard Skinnemoen commit 9a596a6236e1b4d6c2e6105bd85eac19c9f4ec4c Author: Haavard Skinnemoen Date: Mon Feb 19 10:38:04 2007 +0100 [AVR32] at32_spi_setup_slaves should be __init Signed-off-by: Haavard Skinnemoen commit 474844f7083b2381db9b3523dc6de9108fc4c732 Author: Richard Woodruff Date: Fri Jan 26 12:08:51 2007 -0800 ARM: OMAP: Fix OMAP2 dss2 so clk_set_parent works This adds the delayed application attribute to the dss2 clock. DSS2 can't select the 48MHz APLL with properly with out validating the configuration as trigged by this flag. Signed-off-by: Richard Woodruff Signed-off-by: Tony Lindgren commit e6da2aa74ac878ebc5b49c42a0ee94a69884b9af Author: Dirk Behme Date: Thu Jan 25 16:28:50 2007 -0800 ARM: OMAP: Fix missing workqueue include in board-h2.c ARM: OMAP: Fix missing #include in board-h2.c resulting in In file included from arch/arm/mach-omap1/board-h2.c:40: include/asm/arch/irda.h:27: error: field 'gpio_expa' has incomplete type Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren commit 766314867ba908133b8e1338bb2cc39577df3611 Author: Tony Lindgren Date: Tue Dec 12 23:02:43 2006 -0800 ARM: OMAP: Include missing header Include missing header for do_div() Signed-off-by: Tony Lindgren commit ff24ba74b6d3befbfbafa142582211b5a6095d45 Author: Konstantin Karasyov Date: Wed Mar 7 03:50:11 2007 -0500 ACPI: ThinkPad Z60m: usb mouse stops working after suspend to RAM (http://www.mail-archive.com/linux-acpi@vger.kernel.org/msg05270.html): References : http://lkml.org/lkml/2007/2/21/413 http://lkml.org/lkml/2007/2/28/172 Submitter : Arkadiusz Miskiewicz Caused-By : Konstantin Karasyov commit 0a6139027f3986162233adc17285151e78b39cac Do not disable power resources on resume even if there are no devices referencing it. Signed-off-by: Konstantin Karasyov Signed-off-by: Len Brown commit 03d926f82800f32642b32ba547c7a002a371a78f Author: Bernhard Walle Date: Tue Mar 6 02:29:44 2007 -0800 ACPI: Add kernel-parameters hint that acpi=off doesn't work on IA64. Signed-off-by: Bernhard Walle Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 8607c673bdd593d4ce439a36412a213a8efb282b Author: Andrew Morton Date: Tue Mar 6 02:29:42 2007 -0800 sony-laptop: fix uninitialised variable drivers/misc/sony-laptop.c: In function 'sony_acpi_add': drivers/misc/sony-laptop.c:456: warning: 'result' may be used uninitialized in this function The compiler seems to actually be telling the truth this time. Cc: Mattia Dongili Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 610a3d069665ba2b27e42c90129ce640c4d6e515 Author: Alexey Starikovskiy Date: Wed Mar 7 00:57:30 2007 -0500 ACPICA: Fix ACPI Global Lock re-entrancy patch "Delete recursive feature of ACPI Global Lock" broke re-entrancy of the Global Lock. The common routine to acquire GL is acpi_ev_acquire_global_lock, so check for re-entrancy _must_ be there, and not anywhere else. http://bugzilla.kernel.org/show_bug.cgi?id=8066#c9 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 3492856e33da734501f2bdd8656cbfdf61f60330 Author: Sean Hefty Date: Tue Mar 6 11:58:32 2007 -0800 RDMA/ucma: Avoid sending reject if backlog is full Change the returned error code to ENOMEM if the connection event backlog is full. This prevents the ib_cm from issuing a reject on the connection, which can allow retries to succeed. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit e64518f3736971f22d5c22a6bab40891d2db337f Author: Steve Wise Date: Tue Mar 6 14:44:07 2007 -0600 RDMA/cxgb3: Fix MR permission problems Fix memory region permission problems: - remove useless and redundant iwch_mem_perms enum. - create ib_to_tpt_access_rights() for mapping ib access rights to T3 TPT permissions. - create ib_to_mwbind_access_rights() for mapping ib access rights to T3 MWBIND WR permissions. - fix up the mem reg code to utilize the new functions. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 1f6a849b7ce6c3007088cd437dfc2b9c7cb5d21e Author: Steve Wise Date: Tue Mar 6 14:44:05 2007 -0600 RDMA/cxgb3: Don't reuse skbs that are non-linear or cloned Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 8cfccf02bb63b9733e852d475a8be58baaefef8a Author: Steve Wise Date: Tue Mar 6 14:44:03 2007 -0600 RDMA/cxgb3: Squelch logging AE errors Only print one AE error for a given connection in the kernel log. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit adf376b3708f6111e87916fae083633c1be2f88f Author: Steve Wise Date: Tue Mar 6 14:44:01 2007 -0600 RDMA/cxgb3: Stop EP timer when MPA exchange is aborted by peer Stop the endpoint timer when the MPA exchange is aborted by the peer. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 2df50da00e679439aca08a59cd0b4db484159540 Author: Steve Wise Date: Tue Mar 6 14:43:58 2007 -0600 RDMA/cxgb3: Move QP to error on destroy if the state is IDLE Change iwch_destroy_qp() to always move the QP to ERROR and let iwch_modify_qp() decide what to do. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 42e31753546d2186d4a675e7d00daa02ea7c8e85 Author: Steve Wise Date: Tue Mar 6 14:43:56 2007 -0600 RDMA/cxgb3: Fixes for "normal close" failures Fixes for "normal close" failures: - Start normal close timer when moving to CLOSING state. - Handle ABORTING state in close_con_rpl(). - Stop timer correctly on abort during a normal close. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit c3bb1092c80fa2b9117cb0382d136a409496a07f Author: David Miller Date: Mon Mar 5 15:21:29 2007 -0800 RDMA/cxgb3: Fix build on sparc64 cxgb3 uses dma_alloc_coherent() et al. thus needs linux/dma-mapping.h include in order to build reliably. Noticed on sparc64. Signed-off-by: David S. Miller Acked-by: Steve Wise Signed-off-by: Roland Dreier commit cb164b8c6a2bdf995c938e5f157d41465b18e5c3 Author: Sean Hefty Date: Mon Mar 5 12:50:17 2007 -0800 RDMA/cma: Initialize rdma_bind_list in cma_alloc_any_port() The struct rdma_bind_list fields for hlist are not being initialized, resulting in a corrupted list. Fix this by using kzalloc() to make sure all pointers are NULL. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit aeb100e2466b11e6087ee6f467b712e119213158 Author: Steve Wise Date: Fri Mar 2 16:06:36 2007 -0600 RDMA/cxgb3: Don't use mm after it's freed in iwch_mmap() Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 7d526e6b2c5d6bba70fdc1fc2943bdaf9cc6147d Author: Steve Wise Date: Mon Mar 5 17:32:46 2007 -0600 RDMA/cxgb3: Start ep timer on a MPA reject If the consumer rejects the connection we end up under-referencing the endpoint structure. The fix is to call iwch_ep_disconnect() instead of the low level disconnect functions so that the endpoint close timer is started correctly. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit ccd45ad405bcb1504bd923bd0487902374c942c8 Author: Paul Mundt Date: Mon Mar 5 20:19:57 2007 +0900 sh: Kill off I/O cruft for R7780RP. We don't have any use for these machvec fixups anymore, kill them all off and go with the generic instead. Signed-off-by: Paul Mundt commit 39e688a94b94eaba768b1494e19e96f828fc2688 Author: Paul Mundt Date: Mon Mar 5 19:46:47 2007 +0900 sh: Revert lazy dcache writeback changes. These ended up causing too many problems on older parts, revert for now.. Signed-off-by: Paul Mundt commit c87a7111349891043cb0a62b0ba745264d4b600a Author: Paul Mundt Date: Thu Mar 1 18:47:08 2007 +0900 sh: Enable SM501 support for RTS7751R2D. This enables the SM501 drivers for the R2D board. Additional work needs to be done to migrate off of the VoyagerGX cchip code to make use of the rest of the mfd infrastructure. Signed-off-by: Paul Mundt commit 87e29cacb7d09c81b09224bec395f970df958af4 Author: Paul Mundt Date: Thu Mar 1 15:56:31 2007 +0900 sh: Use L1_CACHE_BYTES for .data.cacheline_aligned. Previously this was using a hardcoded 32, use L1_CACHE_BYTES for cacheline alignment instead. Signed-off-by: Paul Mundt commit 5c36e6578d81f79ede871d3e66a0d6beeffeb3dc Author: Paul Mundt Date: Thu Mar 1 10:07:42 2007 +0900 sysctl: Support vdso_enabled sysctl on SH. All of the logic for this was already in place, we just hadn't wired it up in the sysctl table. Signed-off-by: Paul Mundt commit e6bcf562e58662b9765748d346e4c076b20e3aa5 Author: Hideo Saito Date: Wed Feb 28 18:35:42 2007 +0900 sh: Fix kernel thread stack corruption with preempt. When I run a preemptive kernel-2.6.20 for SH7780, a created kthread(pdflush) can not exit by do_exit() in kernel_thread_helper. I think that the created kthread should have a room for 'struct pt_regs' space on the stack top, because __switch_to() will refer to the space as follows using 'regs = task_pt_regs(prev)' and next condition may be true. Signed-off-by: Hideo Saito Signed-off-by: Paul Mundt commit e523d93c8487667552dd29ff756d6ea6bce30851 Author: Paul Mundt Date: Wed Feb 28 18:30:01 2007 +0900 doc: Add SH to vdso and earlyprintk in kernel-parameters.txt SH supports both of these options, add it to the docs. Signed-off-by: Paul Mundt commit c8bfa1fdc84af7b5e3c7f825a9f0bc6e8a19f5d5 Author: Ryusuke Sakato Date: Fri Feb 23 13:22:56 2007 +0900 sh: Fix sigmask trampling in signal delivery. There was a missing return in do_signal() that caused the saved sigmask to be written back after having successfully delivered the signal. Signed-off-by: Ryusuke Sakato Signed-off-by: Paul Mundt commit 9432f96803139adaff0cd9f4fa38b7fb99cda366 Author: Stuart Menefy Date: Fri Feb 23 13:22:17 2007 +0900 sh: Clear UBC when not in use. This takes care of tearing down the UBC so it's not inadvertently left configured at the next context switch time. Failure to do this results in spurious SIGTRAPs in certain debug sequences. Signed-off-by: Stuart Menefy Signed-off-by: Paul Mundt commit 88171cfed5810a2354eb1977883589a05ce8d304 Author: Roland Dreier Date: Thu Mar 1 13:17:14 2007 -0800 IB/mthca: Fix error path in mthca_alloc_memfree() The garbled logic in mthca_alloc_memfree() causes it to return 0, even if it fails to allocate all doorbell records. Fix it to return -ENOMEM when it fails. Signed-off-by: Roland Dreier commit 31726798bd8fbef6244b28cf962f4a4c45793dea Author: Hoang-Nam Nguyen Date: Wed Feb 28 18:01:02 2007 +0100 IB/ehca: Fix sync between completion handler and destroy cq This patch fixes two issues reported by Roland Dreier and Christoph Hellwig: - Mismatched sync/locking between completion handler and destroy cq We introduced a counter nr_events per cq to track number of irq events seen. This counter is incremented when an event queue entry is seen and decremented after completion handler has been called regardless if scaling code is active or not. Note that nr_callbacks tracks number of events assigned to a cpu and both counters can potentially diverge. The sync between running completion handler and destroy cq is done by using the global spin lock ehca_cq_idr_lock. - Replace yield by wait_event on the counter above to become zero. Signed-off-by: Hoang-Nam Nguyen Signed-off-by: Roland Dreier commit 3fd0b2d9ad7612f249e5516d887ab7c61b24ddb9 Author: John Keller Date: Wed Feb 28 17:47:27 2007 -0600 ACPI: Altix: reinitialize acpi tables To provide compatibilty with SN kernels that do and do not have ACPI IO support, the SN PROM must build different versions of some ACPI tables based on which kernel is booting. As such, the tables may have to change at kernel boot time. By default, prior to kernel boot, the PROM builds an empty DSDT (header only) and no SSDTs. If an ACPI capable kernel boots, the kernel will notify the PROM, at platform setup time, and the PROM will build full DSDT and SSDT tables. With the latest changes to acpi_table_init(), the table lengths are saved, and when our PROM changes them, the changes are not seen, and the kernel will crash on boot. Because of issues with kexec support, we are not able to create the tables prior to acpi_table_init(). As a result, we are making a second call to acpi_table_init() to process the rebuilt DSDT and SSDTs. Signed-off-by: John Keller Signed-off-by: Len Brown commit a27cbe878203076247c1b5287f5ab59ed143b560 Author: Roland Dreier Date: Tue Feb 27 07:37:49 2007 -0800 IPoIB: Only handle async events for one port An asynchronous event carries the port number that the event occurred on, so there's no reason for an IPoIB interface to process an event associated with a different local HCA port. Signed-off-by: Roland Dreier commit 690b8d9d54941c90af1d43b0cc24903d20386f5b Author: John Keller Date: Fri Feb 23 16:24:16 2007 -0600 ACPI: Altix: cannot register acpi bus driver before bus scan SN code to initialize the Hub/TIO infrastructure needs to execute before bus scanning. This was previously done with an early call to acpi_bus_register_driver(). But now that ACPI is using the Linux driver model, a driver cannot be registered that early. Make changes to have the init routines invoked via calls to acpi_get_devices(). Signed-off-by: John Keller Signed-off-by: Len Brown commit 2bc808a8c4821a8ef4e3dc35b8fc577a9d2c6f0d Author: Henrique de Moraes Holschuh Date: Wed Feb 21 13:05:38 2007 -0200 ACPI: ibm-acpi: make ibm-acpi bay support optional Make ibm-acpi bay support optional at kernel compile time. Signed-off-by: Henrique de Moraes Holschuh commit adb005818b71e9476581a1de5742e2f427ac9e2b Author: Henrique de Moraes Holschuh Date: Thu Feb 22 16:04:55 2007 -0200 ACPI: ibm-acpi: fix initial status of backlight device The brightness class core does not update the initial status of the device's brightness at register time. Do it by ourselves. Signed-off-by: Henrique de Moraes Holschuh Acked-by: Richard Purdie commit 7292576043666ff39946dee14641fe719ba8c7e8 Author: Konstantin Karasyov Date: Wed Feb 21 02:05:58 2007 -0500 ACPI: fix S3 fan resume issue http://bugzilla.kernel.org/show_bug.cgi?id=7570#c14 Signed-off-by: Konstantin Karasyov Signed-off-by: Len Brown