commit 9be260a646bf76fa418ee519afa10196b3164681 Author: Masami Hiramatsu Date: Thu Feb 5 17:12:39 2009 -0500 prevent kprobes from catching spurious page faults Prevent kprobes from catching spurious faults which will cause infinite recursive page-fault and memory corruption by stack overflow. Signed-off-by: Masami Hiramatsu Cc: [2.6.28.x] Signed-off-by: Linus Torvalds commit 767b5828ad9a1b435488b5d39b5a66aeef4d25e4 Author: Al Viro Date: Fri Feb 6 00:32:27 2009 +0000 braino in sg_ioctl_trans() ... and yes, gcc is insane enough to eat that without complaint. We probably want sparse to scream on those... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 082256333f4e879bc4b56e294921aaff6d035da0 Merge: 09cd5b8... 436443f... Author: Linus Torvalds Date: Thu Feb 5 16:12:38 2009 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: Revert "configfs: Silence lockdep on mkdir(), rmdir() and configfs_depend_item()" commit 09cd5b8f9dbdc161aec404eea572fbca7d162920 Merge: cc5724c... c20f326... Author: Linus Torvalds Date: Thu Feb 5 16:11:54 2009 -0800 Merge branch 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix up T-bit error handling in SH-4A mutex fastpath. sh: Fix up spurious syscall restarting. sh: fcnvds fix with denormalized numbers on SH-4 FPU. sh: Only reserve memory under CONFIG_ZERO_PAGE_OFFSET when it != 0. sh: Handle calling csum_partial with misaligned data sh: ap325rxa: Enable ov772x in defconfig. sh: ap325rxa: Add ov772x support. sh: ap325rxa: control camera power toggling. sh: mach-migor: Enable ov772x and tw9910 in defconfig. commit cc5724ce10c21cb44f9413266bb100ab89b18e2a Merge: f01d1d5... a23f4bb... Author: Linus Torvalds Date: Thu Feb 5 16:11:32 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: Revert "tcp: Always set urgent pointer if it's beyond snd_nxt" ipv6: Copy cork options in ip6_append_data udp: Fix UDP short packet false positive gianfar: Fix potential soft reset race gianfar: Fix BD_LENGTH_MASK definition cxgb3: Fix lro switch iwlwifi: save PCI state before suspend, restore after resume iwlwifi: clean key table in iwl_clear_stations_table commit a23f4bbd8d27ac8ddc5d71ace1f91bb503f0469a Author: David S. Miller Date: Thu Feb 5 15:38:31 2009 -0800 Revert "tcp: Always set urgent pointer if it's beyond snd_nxt" This reverts commit 64ff3b938ec6782e6585a83d5459b98b0c3f6eb8. Jeff Chua reports that it breaks rlogin for him. Signed-off-by: David S. Miller commit 0178b695fd6b40a62a215cbeb03dd51ada3bb5e0 Author: Herbert Xu Date: Thu Feb 5 15:15:50 2009 -0800 ipv6: Copy cork options in ip6_append_data As the options passed to ip6_append_data may be ephemeral, we need to duplicate it for corking. This patch applies the simplest fix which is to memdup all the relevant bits. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 12402b5b7a2aa7ebed246db4570a5eb905fe79ea Merge: 7b5e56f... c4e061a... Author: David S. Miller Date: Thu Feb 5 15:08:11 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 7b5e56f9d635643ad54f2f42e69ad16b80a2cff1 Author: Jesper Dangaard Brouer Date: Thu Feb 5 15:05:45 2009 -0800 udp: Fix UDP short packet false positive The UDP header pointer assignment must happen after calling pskb_may_pull(). As pskb_may_pull() can potentially alter the SKB buffer. This was exposted by running multicast traffic through the NIU driver, as it won't prepull the protocol headers into the linear area on receive. Signed-off-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller commit f01d1d546abb2f4028b5299092f529eefb01253a Author: Alexey Dobriyan Date: Fri Feb 6 00:30:05 2009 +0300 seq_file: fix big-enough lseek() + read() lseek() further than length of the file will leave stale ->index (second-to-last during iteration). Next seq_read() will not notice that ->f_pos is big enough to return 0, but will print last item as if ->f_pos is pointing to it. Introduced in commit cb510b8172602a66467f3551b4be1911f5a7c8c2 aka "seq_file: more atomicity in traverse()". Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 33da8892a2f9e7d4b2d9a35fc80833ba2d2b1aa6 Author: Eric Biederman Date: Wed Feb 4 15:12:25 2009 -0800 seq_file: move traverse so it can be used from seq_read In 2.6.25 some /proc files were converted to use the seq_file infrastructure. But seq_files do not correctly support pread(), which broke some usersapce applications. To handle pread correctly we can't assume that f_pos is where we left it in seq_read. So move traverse() so that we can eventually use it in seq_read and do thus some day support pread(). Signed-off-by: Eric Biederman Cc: Paul Turner Cc: Alexey Dobriyan Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 361916a943cd9dbda1c0b00879d0225cc919d868 Author: Dean Nelson Date: Wed Feb 4 15:12:24 2009 -0800 sgi-xp: fix writing past the end of kzalloc()'d space A missing type cast results in writing way beyond the end of a kzalloc()'d memory segment resulting in slab corruption. But it seems like the better solution is to define ->recv_msg_slots as a 'void *' rather than a 'struct xpc_notify_mq_msg_uv *' and add the type cast. Signed-off-by: Dean Nelson Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb9a68001175cc04bbbe711e6e29e1c6c353107b Author: Alexey Dobriyan Date: Wed Feb 4 15:12:21 2009 -0800 alpha: fixup BUG macro Do usual do {} while (0) dance, otherwise fs/gfs2/util.c:99: error: expected expression before 'else' drivers/scsi/lpfc/lpfc_sli.c:363: error: expected expression before 'else' Signed-off-by: Alexey Dobriyan Acked-by: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 736d54533aedbcbde8cfb2f9ccd542595db4d78d Author: Dan Carpenter Date: Wed Feb 4 15:12:20 2009 -0800 sx.c: fix missed unlock_kernel() on error path in sx_fw_ioctl() If we return directly with -EPERM then lock_kernel() is still held. This was found with a code checker (http://repo.or.cz/w/smatch.git/). [akpm@linux-foundation.org: fix another such path - missed func_exit()] Signed-off-by: Dan Carpenter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe86175bce50bc3d65ff09c287fed955c4da1eb3 Author: Randy Dunlap Date: Wed Feb 4 15:12:20 2009 -0800 atyfb: fix CONFIG_ namespace violations Fix namespace violations by changing non-kconfig CONFIG_ names to CNFG_*. Fixes breakage in staging/, which adds a real CONFIG_PANEL. Signed-off-by: Randy Dunlap Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd29cf7d112aa022cfcfb257ffe3d89ffbd1d820 Author: Manish Katiyar Date: Wed Feb 4 15:12:19 2009 -0800 rtc-ds1390: fix compilation warnings in drivers/rtc/rtc-ds1390.c drivers/rtc/rtc-ds1390.c:125: warning: unused variable 'rtc' Signed-off-by: Manish Katiyar Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce43ae538b540cf3e9f5036d8023b88bf9f8fa40 Author: Mike Rapoport Date: Wed Feb 4 15:12:18 2009 -0800 drivers/video/backlight: rename da903x to da903x_bl Currently both da903x backlight and voltage reulator drivers have the same name. Rename the backlight driver to allow use of both drivers as modules. Signed-off-by: Mike Rapoport Acked-by: Eric Miao Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfecb7164eb81fbfae93fee1ad1da2ac58bb224d Author: Hans-Christian Egtvedt Date: Wed Feb 4 15:12:17 2009 -0800 atmel-ssc: fix misuse of dev_dbg when requested ssc instance is not found The ssc pointer is not valid when the id is not found in the list. Convert the message from a debug one into an error message and avoid dereferencing the bad pointer. Signed-off-by: Hans-Christian Egtvedt Cc: Kay Sievers Cc: Huang Weiyi Acked-by: Haavard Skinnemoen Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab92661d5d9514647346047f30f67a7f35ffea67 Author: Carsten Otte Date: Wed Feb 4 15:12:16 2009 -0800 do_wp_page: fix regression with execute in place Fix do_wp_page for VM_MIXEDMAP mappings. In the case where pfn_valid returns 0 for a pfn at the beginning of do_wp_page and the mapping is not shared writable, the code branches to label `gotten:' with old_page == NULL. In case the vma is locked (vma->vm_flags & VM_LOCKED), lock_page, clear_page_mlock, and unlock_page try to access the old_page. This patch checks whether old_page is valid before it is dereferenced. The regression was introduced by "mlock: mlocked pages are unevictable" (commit b291f000393f5a0b679012b39d79fbc85c018233). Signed-off-by: Carsten Otte Cc: Nick Piggin Cc: Heiko Carstens Cc: [2.6.28.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 777c6c5f1f6e757ae49ecca2ed72d6b1f523c007 Author: Johannes Weiner Date: Wed Feb 4 15:12:14 2009 -0800 wait: prevent exclusive waiter starvation With exclusive waiters, every process woken up through the wait queue must ensure that the next waiter down the line is woken when it has finished. Interruptible waiters don't do that when aborting due to a signal. And if an aborting waiter is concurrently woken up through the waitqueue, noone will ever wake up the next waiter. This has been observed with __wait_on_bit_lock() used by lock_page_killable(): the first contender on the queue was aborting when the actual lock holder woke it up concurrently. The aborted contender didn't acquire the lock and therefor never did an unlock followed by waking up the next waiter. Add abort_exclusive_wait() which removes the process' wait descriptor from the waitqueue, iff still queued, or wakes up the next waiter otherwise. It does so under the waitqueue lock. Racing with a wake up means the aborting process is either already woken (removed from the queue) and will wake up the next waiter, or it will remove itself from the queue and the concurrent wake up will apply to the next waiter after it. Use abort_exclusive_wait() in __wait_event_interruptible_exclusive() and __wait_on_bit_lock() when they were interrupted by other means than a wake up through the queue. [akpm@linux-foundation.org: coding-style fixes] Reported-by: Chris Mason Signed-off-by: Johannes Weiner Mentored-by: Oleg Nesterov Cc: Peter Zijlstra Cc: Matthew Wilcox Cc: Chuck Lever Cc: Nick Piggin Cc: Ingo Molnar Cc: ["after some testing"] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40b0bb1e734700b81d2ec69367c035cd1537f4fa Author: Randy Dunlap Date: Wed Feb 4 15:12:13 2009 -0800 maintainers: general@lists.openfabrics.org is moderated I got the "list is moderated message," so add it here. Signed-off-by: Randy Dunlap Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87357d277a024934389ddc37808290c53c74339e Author: Martin Kebert Date: Wed Feb 4 15:12:12 2009 -0800 lis3lv02d: add axes knowledge for HP 6710 Add support for the HP laptops of model 6710x for having correctly setup axes. Signed-off-by: Martin Kebert Signed-off-by: Eric Piel Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c77a022d2994b0ccfb583c7dfd6392e3cd0391fe Author: Pavel Herrmann Date: Wed Feb 4 15:12:11 2009 -0800 lis3lv02d: add axes knowledge for HP 6730 Add support for the HP laptops of model 6730x for having correctly setup axes. Signed-off-by: Pavel Herrmann Signed-off-by: Eric Piel Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80eda5fb5885d601ed2c712a0530770c0a23cc04 Author: Eric Piel Date: Wed Feb 4 15:12:11 2009 -0800 lis3lv02d: add axes knowledge for HP 6530 Add support for the HP laptops of model 6530x for having correctly setup axes. Reported-by: Jerome Poulin Signed-off-by: Eric Piel Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bfef2b3cfe1144bd1dc3aface9c63a3f06732a7 Author: Jiri Tersel Date: Wed Feb 4 15:12:09 2009 -0800 lis3lv02d: add axes knowledge for HP 6510b According to dmesg my laptop model HP 6510b is not being recognized by this driver. After I have modified "lis3lv02d.c" axes in Neverball are OK. Signed-off-by: Jiri Tersel Signed-off-by: Eric Piel Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44f0606d52d98ff05b3b62bb694821857e36819d Author: Andrew Morton Date: Wed Feb 4 15:12:07 2009 -0800 hp-wmi: fix error path in hp_wmi_bios_setup() The error-path code can call rfkill_unregister() with a pointer which does not contain the result of a call to rfkill_register(). It goes BUG(). Addresses http://bugzilla.kernel.org/show_bug.cgi?id=12560. Cc: Frans Pop Cc: Larry Finger Cc: Len Brown Acked-by: Matthew Garrett Reported-by: Helge Deller Testted-by: Helge Deller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60fd760fb9ff7034360bab7137c917c0330628c2 Author: Andrew Morton Date: Wed Feb 4 15:12:06 2009 -0800 revert "rlimit: permit setting RLIMIT_NOFILE to RLIM_INFINITY" Revert commit 0c2d64fb6cae9aae480f6a46cfe79f8d7d48b59f because it causes (arguably poorly designed) existing userspace to spend interminable periods closing billions of not-open file descriptors. We could bring this back, with some sort of opt-in tunable in /proc, which defaults to "off". Peter's alanysis follows: : I spent several hours trying to get to the bottom of a serious : performance issue that appeared on one of our servers after upgrading to : 2.6.28. In the end it's what could be considered a userspace bug that : was triggered by a change in 2.6.28. Since this might also affect other : people I figured I'd at least document what I found here, and maybe we : can even do something about it: : : : So, I upgraded some of debian.org's machines to 2.6.28.1 and immediately : the team maintaining our ftp archive complained that one of their : scripts that previously ran in a few minutes still hadn't even come : close to being done after an hour or so. Downgrading to 2.6.27 fixed : that. : : Turns out that script is forking a lot and something in it or python or : whereever closes all the file descriptors it doesn't want to pass on. : That is, it starts at zero and goes up to ulimit -n/RLIMIT_NOFILE and : closes them all with a few exceptions. : : Turns out that takes a long time when your limit -n is now 2^20 (1048576). : : With 2.6.27.* the ulimit -n was the standard 1024, but with 2.6.28 it is : now a thousand times that. : : 2.6.28 included a patch titled "rlimit: permit setting RLIMIT_NOFILE to : RLIM_INFINITY" (0c2d64fb6cae9aae480f6a46cfe79f8d7d48b59f)[1] that : allows, as the title implies, to set the limit for number of files to : infinity. : : Closer investigation showed that the broken default ulimit did not apply : to "system" processes (like stuff started from init). In the end I : could establish that all processes that passed through pam_limit at one : point had the bad resource limit. : : Apparently the pam library in Debian etch (4.0) initializes the limits : to some default values when it doesn't have any settings in limit.conf : to override them. Turns out that for nofiles this is RLIM_INFINITY. : Commenting out "case RLIMIT_NOFILE" in pam_limit.c:267 of our pam : package version 0.79-5 fixes that - tho I'm not sure what side effects : that has. : : Debian lenny (the upcoming 5.0 version) doesn't have this issue as it : uses a different pam (version). Reported-by: Peter Palfrader Cc: Adam Tkac Cc: Michael Kerrisk Cc: [2.6.28.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a68e61e8ff2d46327a37b69056998b47745db6fa Author: Tony Battersby Date: Wed Feb 4 15:12:04 2009 -0800 shm: fix shmctl(SHM_INFO) lockup with !CONFIG_SHMEM shm_get_stat() assumes that the inode is a "struct shmem_inode_info", which is incorrect for !CONFIG_SHMEM (see fs/ramfs/inode.c: ramfs_get_inode() vs. mm/shmem.c: shmem_get_inode()). This bad assumption can cause shmctl(SHM_INFO) to lockup when shm_get_stat() tries to spin_lock(&info->lock). Users of !CONFIG_SHMEM may encounter this lockup simply by invoking the 'ipcs' command. Reported by Jiri Olsa back in February 2008: http://lkml.org/lkml/2008/2/29/74 Signed-off-by: Tony Battersby Cc: Jiri Kosina Reported-by: Jiri Olsa Cc: Hugh Dickins Cc: [2.6.everything] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f5e31d7e55ac7fbd4ec5e5b20c8868b0e4564c9 Author: Andrea Righi Date: Wed Feb 4 15:12:03 2009 -0800 fbmem: don't call copy_from/to_user() with mutex held Avoid calling copy_from/to_user() with fb_info->lock mutex held in fbmem ioctl(). fb_mmap() is called under mm->mmap_sem (A) held, that also acquires fb_info->lock (B); fb_ioctl() takes fb_info->lock (B) and does copy_from/to_user() that might acquire mm->mmap_sem (A), causing a deadlock. NOTE: it doesn't push down the fb_info->lock in each own driver's fb_ioctl(), so there are still potential deadlocks elsewhere. Signed-off-by: Andrea Righi Cc: Dave Jones Cc: "Rafael J. Wysocki" Cc: Johannes Weiner Cc: Krzysztof Helt Cc: Harvey Harrison Cc: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afd8d0f940ba5078f38e435440089117ac7d9eb4 Author: David Brownell Date: Wed Feb 4 15:12:01 2009 -0800 rtc: rtc-dm355evm driver Simple RTC driver for the MSP430 firmware on the DM355 EVM board. Other than not supporting atomic reads/writes of all four bytes, this is reasonable as a basic no-alarm RTC. Signed-off-by: David Brownell Signed-off-by: Kevin Hilman Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77a592655cdb8d838b85fd7ecf8f36fd2870abfc Author: Matthew Garrett Date: Wed Feb 4 15:12:00 2009 -0800 misc: dell-laptop should depend on POWER_SUPPLY dell-laptop makes use of the power supply class information to choose which backlight interface to change. Add a depends on it. Signed-off-by: Matthew Garrett Cc: Ingo Molnar Cc: "Rafael J. Wysocki" Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac7b9004909d03d67016368093e81d37cae72895 Author: Peter Zijlstra Date: Wed Feb 4 15:11:59 2009 -0800 generic swap(): don't return a value from swap() The swap() macro is accidentally retuning the value of its first argument. Change it into a doesn't-return-anything macro before someone goes and relies upon this behaviour. Signed-off-by: Peter Zijlstra Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c073b2db006ba9370be1eecc36a1be1d9ce31310 Author: David Altobelli Date: Wed Feb 4 15:11:58 2009 -0800 hpilo: open/close fix The device can take a while to respond to an open/close request, so increase the time kernel will wait for response (1 ms to 10ms). Also, properly clean up a channel on a failed open, by calling the channel close routine. Just freeing the memory isn't sufficient, the device needs to be informed that the channel is no longer open, and the device memory cleared of references to freed dma buffer. Signed-off-by: David Altobelli Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58763a297405024d23d8f1d0bba3e6603660c4b6 Author: Andrew Morton Date: Wed Feb 4 15:11:58 2009 -0800 kernel/async.c: fix printk warnings alpha: kernel/async.c: In function 'run_one_entry': kernel/async.c:141: warning: format '%lli' expects type 'long long int', but argument 2 has type 'async_cookie_t' kernel/async.c:149: warning: format '%lli' expects type 'long long int', but argument 2 has type 'async_cookie_t' kernel/async.c:149: warning: format '%lld' expects type 'long long int', but argument 4 has type 's64' kernel/async.c: In function 'async_synchronize_cookie_special': kernel/async.c:250: warning: format '%lli' expects type 'long long int', but argument 3 has type 's64' Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b98ac702f49042ab0c382b839465b95a2bd0cd65 Author: Andy Fleming Date: Wed Feb 4 16:38:05 2009 -0800 gianfar: Fix potential soft reset race SOFT_RESET must be asserted for at least 3 TX clocks in order for it to work properly. The syncs in the gfar_write() commands have been hiding this, but we need to guarantee it. Signed-off-by: Andy Fleming Signed-off-by: David S. Miller commit 1fbe49328f7442090439addddf441fb5b3186e71 Author: Andy Fleming Date: Wed Feb 4 16:37:40 2009 -0800 gianfar: Fix BD_LENGTH_MASK definition BD_LENGTH_MASK is supposed to catch the low 16-bits of the status field, not the low byte. The old way, we would never be able to clean up tx packets with sizes divisible by 256. Signed-off-by: Andy Fleming Signed-off-by: David S. Miller commit 65ab8385b67854792e89267907f9fcb27e779f95 Author: Divy Le Ray Date: Wed Feb 4 16:31:39 2009 -0800 cxgb3: Fix lro switch The LRO switch is always set to 1 in the rx processing loop. It breaks the accelerated iSCSI receive traffic. Fix its computation. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 647802d6db5f2e62e53f44bfdc61416547ba7f5b Merge: 3e561f9... bb960a1... Author: Linus Torvalds Date: Wed Feb 4 13:58:50 2009 -0800 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: APIC: enable workaround on AMD Fam10h CPUs xen: disable interrupts before saving in percpu x86: add x86@kernel.org to MAINTAINERS x86: push old stack address on irqstack for unwinder irq, x86: fix lock status with numa_migrate_irq_desc x86: add cache descriptors for Intel Core i7 x86/Voyager: make it build and boot commit 3e561f975cd6db846b2bbd684cd107a27f5d8aaa Merge: 9f96ae6... 3562612... Author: Linus Torvalds Date: Wed Feb 4 13:58:37 2009 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: add missing kernel-doc in sched.h commit 9f96ae6ee049b78dc334965a38fb441f7a16201f Merge: 9dfea1b... 229c4ef... Author: Linus Torvalds Date: Wed Feb 4 13:58:24 2009 -0800 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: do_each_pid_task() needs rcu lock commit c4e061ace75513aee227090486cc46dec7810c00 Author: Reinette Chatre Date: Tue Feb 3 10:20:03 2009 -0800 iwlwifi: save PCI state before suspend, restore after resume This is the right thing to do and fixes the following warning: [ 115.012278] ------------[ cut here ]------------ [ 115.012281] WARNING: at drivers/pci/pci-driver.c:370 pci_legacy_suspend+0x85/0xc2() [ 115.012285] Hardware name: Latitude D630 [ 115.012301] PCI PM: Device state not saved by iwl3945_pci_suspend+0x0/0x4c [iwl3945] [ 115.012304] Modules linked in: fuse nfsd lockd nfs_acl auth_rpcgss exportfs sunrpc ipv6 acpi_cpufreq kvm_intel kvm snd_hda_codec_idt snd_hda_intel snd_hda_codec snd_hwdep arc4 snd_seq_device snd_pcm_oss snd_mixer_oss ecb snd_pcm cryptomgr aead snd_timer crypto_blkcipher snd snd_page_alloc ohci1394 crypto_hash crypto_algapi ch341 ieee1394 usbserial thermal iwl3945 mac80211 led_class lib80211 tg3 processor i2c_i801 i2c_core sg cfg80211 libphy usbhid battery ac button sr_mod cdrom evdev dcdbas ata_generic ata_piix libata sd_mod scsi_mod ext3 jbd mbcache uhci_hcd ohci_hcd ehci_hcd usbcore [last unloaded: microcode] [ 115.012374] Pid: 4163, comm: pm-suspend Not tainted 2.6.29-rc3-00227-gf1dd849-dirty #67 [ 115.012377] Call Trace: [ 115.012382] [] warn_slowpath+0xb1/0xed [ 115.012387] [] ? _spin_unlock_irqrestore+0x5c/0x78 [ 115.012390] [] ? up+0x34/0x39 [ 115.012394] [] ? acpi_ut_release_mutex+0x5d/0x61 [ 115.012397] [] ? acpi_get_data+0x5e/0x70 [ 115.012400] [] ? acpi_bus_get_device+0x25/0x39 [ 115.012403] [] ? acpi_bus_power_manageable+0x11/0x29 [ 115.012406] [] ? acpi_pci_power_manageable+0x17/0x19 [ 115.012410] [] ? pci_set_power_state+0xcc/0x101 [ 115.012418] [] ? iwl3945_pci_suspend+0x0/0x4c [iwl3945] [ 115.012422] [] pci_legacy_suspend+0x85/0xc2 [ 115.012425] [] pci_pm_suspend+0x34/0x86 [ 115.012429] [] pm_op+0x52/0xe5 [ 115.012432] [] device_suspend+0x32a/0x451 [ 115.012436] [] suspend_devices_and_enter+0x3e/0x13a [ 115.012439] [] enter_state+0x110/0x164 [ 115.012442] [] state_store+0xb7/0xd7 [ 115.012446] [] kobj_attr_store+0x17/0x19 [ 115.012449] [] sysfs_write_file+0xe4/0x119 [ 115.012453] [] vfs_write+0xae/0x137 [ 115.012456] [] sys_write+0x47/0x70 [ 115.012459] [] system_call_fastpath+0x16/0x1b [ 115.012467] ---[ end trace 829828966f6f24dc ]--- Signed-off-by: Reinette Chatre Tested-by: Ming Lei Cc: Rafael J. Wysocki Signed-off-by: John W. Linville commit 5e46882e2ecacd2ebd1bfba3caaa4a25ffbcb94d Author: Reinette Chatre Date: Wed Jan 28 09:38:30 2009 -0800 iwlwifi: clean key table in iwl_clear_stations_table Cleans uCode key table bit map iwl_clear_stations_table since all stations are cleared also the key table must be. Since the keys are not removed properly on suspend by mac80211 this may result in exhausting key table on resume leading to memory corruption during removal Signed-off-by: Tomas Winkler Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 436443f0f77f730f9f700095799c485356695c08 Author: Mark Fasheh Date: Tue Feb 3 23:12:34 2009 -0800 Revert "configfs: Silence lockdep on mkdir(), rmdir() and configfs_depend_item()" This reverts commit 0e0333429a6280e6eb3c98845e4eed90d5f8078a. I committed this by accident - Joel and Louis are working with the lockdep maintainer to provide a better solution than just turning lockdep off. Signed-off-by: Mark Fasheh Acked-by: commit 9dfea1b46d9f147478ccdfa4a4ef472fdc98d6dd Merge: eda58a8... 7df0eb4... Author: Linus Torvalds Date: Wed Feb 4 09:39:12 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: pcm_oss: AFMT_S24_LE is set twice in return value ALSA: ASoC: email - update email addresses. OMAP: ASoC: Fix spinlock misuse in omap-pcm.c ALSA: hda - No widget selection for volume knob widgets in proc output ALSA: hda - Add support of iMac 24 Aluminium ALSA: alsa: time reaches -1, tested 0 ALSA: hda - Add quirk for another HP dv5 model commit 7df0eb424d7f5bfb948c921500e0470f4a27c4cb Merge: af7af69... 64ca040... Author: Takashi Iwai Date: Wed Feb 4 18:19:11 2009 +0100 Merge branch 'fix/asoc' into for-linus commit af7af690397296b663c8bc152a5f79f32abcef24 Merge: 7924f0c... 516a1ce... Author: Takashi Iwai Date: Wed Feb 4 18:19:07 2009 +0100 Merge branch 'fix/hda' into for-linus commit 7924f0cadcf52cb316d6eca60a6ae3fc9e42b465 Author: Roel Kluin Date: Wed Feb 4 18:14:55 2009 +0100 ALSA: pcm_oss: AFMT_S24_LE is set twice in return value AFMT_S24_LE is set twice in return value vi sound/core/oss/pcm_oss.c +640 #define AFMT_S24_LE 0x00008000 #define AFMT_S24_BE 0x00010000 Signed-off-by: Roel Kluin Signed-off-by: Takashi Iwai commit eda58a85ec3fc05855a26654d97a2b53f0e715b9 Merge: 024bb96... c8e6741... Author: Linus Torvalds Date: Wed Feb 4 07:56:25 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (40 commits) Blackfin arch: Remove outdated code Blackfin arch: Fix udelay implementation Blackfin arch: Update Copyright information Blackfin arch: Add BF561 PPI POLS, POLC Masks Blackfin arch: Update CM-BF527 kernel config Blackfin arch: define bfin_memmap as static since it is only used here Blackfin arch: cplb mananger: use a do...while loop rather than a for loop Blackfin arch: fix bug - traps test case 19 for exception 0x2d fails Blackfin arch: add platform device bfin_mii-bus and KSZ8893M switch driver platform resources to board files Blackfin arch: build jtag tty driver as a module by default Blackfin arch: fix 2 bugs related to debug Blackfin arch: Add ANOMALY_05000380 to BF54x to kill the compile warning Blackfin arch: Fix bug - 561 SMP kernel can't boot from jffs2 Blackfin arch: base SIC_IWR# programming on whether the MMR exists Blackfin arch: read SYSCR on newer parts that mirror the bits of SWRST in it Blackfin arch: fixup board init function name Blackfin arch: drop CONFIG_I2C_BOARDINFO ifdefs Blackfin arch: bfin_reset->_bfin_reset redirection no longer needed Blackfin arch: sync reboot handler with version in u-boot Blackfin arch: Faster Implementation of csum_tcpudp_nofold() ... commit 024bb9617e01716c5ac7d235f54483cc6018978f Merge: 25431e9... 9b02605... Author: Linus Torvalds Date: Wed Feb 4 07:54:00 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Kill bogus TPC/address truncation during 32-bit faults. sparc: fixup for sparseirq changes sparc64: Validate kernel generated fault addresses on sparc64. sparc64: On non-Niagara, need to touch NMI watchdog in NOHZ mode. sparc64: Implement NMI watchdog on capable cpus. sparc: Probe PMU type and record in sparc_pmu_type. sparc64: Move generic PCR support code to seperate file. commit 25431e900dc47abb312c9ae8599e8c8ae038eb5a Merge: 0d7a063... 55128bc... Author: Linus Torvalds Date: Wed Feb 4 07:52:21 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: sunrpc: fix rdma dependencies e1000: Fix PCI enable to honor the need_ioport flag sgi-xp: link XPNET's net_device_ops to its net_device structure pcnet_cs: Fix misuse of the equality operator. hso: add new device id's dca: redesign locks to fix deadlocks cassini/sungem: limit reaches -1, but 0 tested net: variables reach -1, but 0 tested qlge: bugfix: Add missing netif_napi_del call. qlge: bugfix: Add flash offset for second port. qlge: bugfix: Fix endian issue when reading flash. udp: increments sk_drops in __udp_queue_rcv_skb() net: Fix userland breakage wrt. linux/if_tunnel.h net: packet socket packet_lookup_frame fix commit 0d7a063fa7b918d2a61cdd63232286d4131774de Merge: dcf6a79... 9e6f8ed... Author: Linus Torvalds Date: Wed Feb 4 07:40:54 2009 -0800 Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd * 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: Remove non exported references from pcf50633 commit bb960a1e42042e82447a5bc0941b3ab6d614bac3 Merge: 8587706... 06fc732... Author: Ingo Molnar Date: Wed Feb 4 14:54:56 2009 +0100 Merge branch 'core/xen' into x86/urgent commit c8e674125e03c5f36ccfd61d83b933e6956074b0 Author: Michael Hennerich Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Remove outdated code The removed version with the loop registers saved on the stack was originally intended to workaround the missing toolchain support for LoopReg Clobbers. Since our toolchain now supports these there is no point in keeping this workaround. And since we don't touch LoopRegs anymore we're no longer subject for ANOMALY_05000312. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 4e653e04cc1c3553af539ffc81fb56d83d83c733 Author: Michael Hennerich Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Fix udelay implementation Avoid possible overflow during 32*32->32 multiplies. Reported-by: Marco Reppenhagen Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 972de7d9292439c9429c301cf377fbf56b6e654e Author: Michael Hennerich Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Update Copyright information Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 772c258fd056a77fd808385a1c551dcd141cf8a3 Author: Michael Hennerich Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Add BF561 PPI POLS, POLC Masks Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit dfd700baf2ddab395cc059ce9f294306bf56a735 Author: Michael Hennerich Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Update CM-BF527 kernel config Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit af4c7d4b4eddc297bbb516abdd6154bffc8e05e5 Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: define bfin_memmap as static since it is only used here Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit d04dfc4c0e6056350175edc36b900a69703e9467 Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: cplb mananger: use a do...while loop rather than a for loop use a do...while loop rather than a for loop to get slightly better optimization and to avoid gcc "may be used uninitialized" warnings ... we know that the [id]cplb_nr_bounds variables will never be 0, so this is OK Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit bf324cb81a2f7da357eba00b6b1ef1cf38c264b8 Author: Bernd Schmidt Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: fix bug - traps test case 19 for exception 0x2d fails Enable null pointer checking for ICPLBs. The code was there but for some reason I had commented it out at some stage during development. Should restrict this to 1K since atomic ops start there. Signed-off-by: Bernd Schmidt Signed-off-by: Bryan Wu commit 65319628db2c7a630daadfeec4d371aaca788482 Author: Graf Yang Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: add platform device bfin_mii-bus and KSZ8893M switch driver platform resources to board files Signed-off-by: Graf Yang Signed-off-by: Bryan Wu commit 583947c6bc397854a3a57d45539654c9d8223966 Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: build jtag tty driver as a module by default Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 3aee91bafef01bd5c59853346f1fcb85f701fdc1 Author: Jie Zhang Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: fix 2 bugs related to debug - unable to single step over emuexcpt instruction - gdbproxy goes into infinite loop when doing gdb does "next" over "emuexcpt" Don't decrement PC after software breakpoint. Signed-off-by: Jie Zhang Signed-off-by: Bryan Wu commit 1c302b6ccb1296bda3754708099233290f6cf689 Author: Bryan Wu Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Add ANOMALY_05000380 to BF54x to kill the compile warning Signed-off-by: Bryan Wu commit 9960aa6a07bc41223a3bf2df1dfd284698486eb0 Author: Graf Yang Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Fix bug - 561 SMP kernel can't boot from jffs2 bss_l2 section is garbage when the data in this section is used by _bfin_relocate_l1_mem, so move the zero out function ahead. Signed-off-by: Graf Yang Signed-off-by: Bryan Wu commit be1d8543a82d3a8f466509bbd355a5861193135f Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: base SIC_IWR# programming on whether the MMR exists base SIC_IWR# programming on whether the MMR exists rather than having to maintain another list of processors Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit ed1fb6048c3eef68df5fe19e9022fdad6e53357d Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: read SYSCR on newer parts that mirror the bits of SWRST in it Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 7f6678c52fea7ff3e7eb6a5f0e0b705c1991eaa2 Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: fixup board init function name Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 2678479c33774f297ea2a5d232cad11c4d56ef6c Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: drop CONFIG_I2C_BOARDINFO ifdefs Drop CONFIG_I2C_BOARDINFO ifdefs as the common i2c header handles this already by stubbing things out Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit a6595bf04b9cc9a4997e6d849b62d69439dd1eff Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: bfin_reset->_bfin_reset redirection no longer needed Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit adab7eb883a0b0fb7f13b1d7b30b596139f6f40d Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: sync reboot handler with version in u-boot Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit aa9c33b496ca9434f26beaa1b447a6e2e5d8ad6a Author: Michael Hennerich Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Faster Implementation of csum_tcpudp_nofold() Avoid conditional branch instructions during carry bit additions. Special thanks to Bernd. Simplify: Use ((len + proto) << 8) like every other __LITTLE_ENDIAN__ machine Cc: Bernd Schmidt Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 0ce5eaf8ec156926a29313de877d9d5e0a692054 Author: Graf Yang Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Fix bug - BF518 port F, G, and H have different mux offset compare to BF527 [Mike Frysinger : keep the ifdef nest down] Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 047481f348668340fab7164b12be130ca2ad2522 Author: Grace Pan Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Add in cflag to support mlong-calls for kgdb_test Signed-off-by: Grace Pan Signed-off-by: Bryan Wu commit b52dae3139066765a7d96563e9cd33d9e60efe33 Author: Sonic Zhang Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Fix bug - Run "reboot" hangs bf518-ezbrd [Mike Frysinger : - setup P_DEFAULT_BOOT_SPI_CS for every arch based on the default bootrom behavior and convert all our boards to it - revert previous anomaly change ... bf51x is not affected by anomaly 05000353] Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 5b93e13ffa8b06ff80eaa8e0ae92e44ebf61cde9 Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 MAINTIANERS: Blackfin: remove subscribers-only marking remove subscribers-only marking as the list is automatically & silently moderated for people Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 3605fb09652beeb2e8244c52a9db5b76cc12295e Author: Robin Getz Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Add ability to count and display number of NMI interrupts Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 0be58939146f28394a04b61fec7e0676cdafa47e Author: Robin Getz Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Add a few more instructions that can cause the trace buffer to be discontiguous Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit e48df47c1adabece6823395657ea6c677eb653db Author: Robin Getz Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Fix URL Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit f556309ea0d6a4adb0ad9775e5a18aa3564a0e4f Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: cleanup bf54x ifdef mess in gpio code merge more of the bf54x and !bf54x gpio code together to cut down on #ifdef mess Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 881eb621fc191e58fa638c533073683be2b63c24 Author: Jie Zhang Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Add one more check on `fp' to prevent double fault Signed-off-by: Jie Zhang Signed-off-by: Bryan Wu commit 45c4f2a0b6c6302c5617534b8189c0e9b5a4a048 Author: Uwe Kleine-Koenig Date: Wed Feb 4 17:02:30 2009 +0800 Blackfin arch: explicit add a might sleep to gpio_free According to the documentation gpio_free should only be called from task context only. To make this more explicit add a might sleep to all implementations. This patch changes the gpio_free implementations for the blackfin architecture. Signed-off-by: Uwe Kleine-Koenig Cc: David Brownell Acked-by: Bryan Wu Signed-off-by: Andrew Morton commit 2f95d5bd84bfbe8cf62cb1c4306354cfc139370b Author: Robin Getz Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: don't accidently re-enable interrupts Make sure we don't accidently re-enable interrupts if we are being called in atomic context Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit 76e8fe4da652b020e08089415c684a365bb5b6a9 Author: Robin Getz Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Print out where the bootmode is coming from (for easier debugging). Signed-off-by: Robin Getz Signed-off-by: Bryan Wu commit a2be3931144b8fab73c3d876c148ada7a3c09066 Author: Michael Hennerich Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: reset POLAR setting when acquiring a gpio for the first time when requesting a GPIO for the first time, the POLAR setting is not set to a sane state. this can lead to indeterminate behavior that cannot be resolved without an explicit write to the Blackfin port POLAR register. when requesting a GPIO for the first time via gpio_request(), the POLAR setting for the GPIO in question should be set to sane state. this should occur if the GPIO has not been allocated in any other way. some examples: - when doing something like "request_irq(); gpio_request();" on the same GPIO, the POLAR setting should not be reset. - when doing "gpio_request(); gpio_request();" on the same GPIO, the POLAR setting should be reset only the first time and not the second. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 5e7bb132bbed2088b8b103e410d143b341dcb837 Author: Michael Hennerich Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Fix Bug - request lines with peripheral_request_list, but don't get freed with peripheral_free_list Remove erroneous check_gpio(ident) in peripheral_free() Reported-by: Michael McTernan Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 331693129d1764e38b15561e5712347fd591b2a9 Author: Michael Hennerich Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: Fix Bug - Kernel does not boot if re-program clocks On BF561 EBIU_SDGCTL bit 31 controls the SDRAM external data path width, typically set 0 for a 32-bit bus width. On other Blackfin derivatives this bit should be set by default. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu commit 41245ac5952e5b05e6fbb7c188eae0947f640189 Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: fix bug - Dmacopy failed in BF537-STAMP Dmacopy failed in BF537-STAMP when copy from SRAM to SDRAM and kernel will reboot automatically. Fixing by doing a SSYNC before mucking with DMA registers Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit c6bbd8ac54742f657bd223e03b5b70e73ba092cd Author: Sonic Zhang Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: enable bfin_eth in bf51x by default Signed-off-by: Sonic Zhang Signed-off-by: Bryan Wu commit 4c4073d49f578422537ce16f6d42ebeb4f741e6d Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: line up machine-/cpu- vars after BF54xM addition Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 2f89c0632f6e27cc3e5eb66605490ddf67ef4953 Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: add support for mobile ddr bf54x parts Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit d3522648676d4c8869e5539bca081820e69e24a4 Author: Mike Frysinger Date: Wed Feb 4 16:49:45 2009 +0800 Blackfin arch: scrub comments/whitespace/cvs keywords Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu commit 858770619debfb9269add63e4ba8b7c6b5538dd1 Author: Borislav Petkov Date: Tue Feb 3 16:24:22 2009 +0100 x86: APIC: enable workaround on AMD Fam10h CPUs Impact: fix to enable APIC for AMD Fam10h on chipsets with a missing/b0rked ACPI MP table (MADT) Booting a 32bit kernel on an AMD Fam10h CPU running on chipsets with missing/b0rked MP table leads to a hang pretty early in the boot process due to the APIC not being initialized. Fix that by falling back to the default APIC base address in 32bit code, as it is done in the 64bit codepath. Signed-off-by: Borislav Petkov Signed-off-by: H. Peter Anvin commit 06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a Author: Jeremy Fitzhardinge Date: Tue Feb 3 16:01:46 2009 -0800 xen: disable interrupts before saving in percpu Impact: Fix race condition xen_mc_batch has a small preempt race where it takes the address of a percpu variable immediately before disabling interrupts, thereby leaving a small window in which we may migrate to another cpu and save the flags in the wrong percpu variable. Disable interrupts before saving the old flags in a percpu. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: H. Peter Anvin commit dcf6a79dda5cc2a2bec183e50d829030c0972aaa Author: Artem Bityutskiy Date: Mon Feb 2 18:33:49 2009 +0200 write-back: fix nr_to_write counter Commit 05fe478dd04e02fa230c305ab9b5616669821dd3 introduced some @wbc->nr_to_write breakage. It made the following changes: 1. Decrement wbc->nr_to_write instead of nr_to_write 2. Decrement wbc->nr_to_write _only_ if wbc->sync_mode == WB_SYNC_NONE 3. If synced nr_to_write pages, stop only if if wbc->sync_mode == WB_SYNC_NONE, otherwise keep going. However, according to the commit message, the intention was to only make change 3. Change 1 is a bug. Change 2 does not seem to be necessary, and it breaks UBIFS expectations, so if needed, it should be done separately later. And change 2 does not seem to be documented in the commit message. This patch does the following: 1. Undo changes 1 and 2 2. Add a comment explaining change 3 (it very useful to have comments in _code_, not only in the commit). Signed-off-by: Artem Bityutskiy Acked-by: Nick Piggin Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 5193535517825f9a07967e4868a1103013d0a99d Author: Samuel Thibault Date: Tue Feb 3 13:12:58 2009 +0100 Fix my email address in qd65xx.[ch]/pata_qdi.c The @fnac.net will be shut down within a couple of months, so fix my email address. Signed-off-by: Samuel Thibault Signed-off-by: Linus Torvalds commit f96c08e8c5935d80bb9fd48c61b5bfa00878519e Merge: 7420b73... 27ad279... Author: Linus Torvalds Date: Tue Feb 3 16:52:44 2009 -0800 Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 * 'linux-next' of git://git.infradead.org/ubifs-2.6: UBIFS: remove fast unmounting UBIFS: return sensible error codes UBIFS: remount ro fixes UBIFS: spelling fix 'date' -> 'data' UBIFS: sync wbufs after syncing inodes and pages UBIFS: fix LPT out-of-space bug (again) UBIFS: fix no_chk_data_crc UBIFS: fix assertions UBIFS: ensure orphan area head is initialized UBIFS: always clean up GC LEB space UBIFS: add re-mount debugging checks UBIFS: fix LEB list freeing UBIFS: simplify locking UBIFS: document dark_wm and dead_wm better UBIFS: do not treat all data as short term UBIFS: constify operations UBIFS: do not commit twice commit 7420b73dc05ae1faa36b49774210a13d29349c53 Merge: 3e1c400... de86962... Author: Linus Torvalds Date: Tue Feb 3 16:52:10 2009 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: NVRAM depends on RTC_DRV_CMOS rename platform_driver name "flash" to "sa1100-mtd" annotate that [fp, #-4] is the saved lr Use __SPIN_LOCK_UNLOCKED to initialize bad_irq_desc.lock ARM: OMAP: fix fault in enter_full_retention() ARM: OMAP: Mask interrupts when disabling interrupts, v2 ARM: OMAP: gptimer min_delta_ns corrected ARM: OMAP: Fix hsmmc init, v2 ARM: OMAP: Fix omap34xx revision detection for ES3.1 ARM: OMAP: DMA: Fix uninitialized channel flags ARM: OMAP: Fix race in OMAP2/3 DMA IRQ handling ARM: OMAP: Fix McBSP spin_lock deadlock [ARM] 5366/1: fix shared memory coherency with VIVT L1 + L2 caches [ARM] call undefined instruction exception handler with irqs enabled [ARM] msm: fix build errors [ARM] etherh: continue fixing build failure commit 3e1c4005134e3a090c64c1bc35f965043bb451f4 Merge: b987e8e... fd4ef23... Author: Linus Torvalds Date: Tue Feb 3 16:50:20 2009 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: add quota call to ocfs2_remove_btree_range() ocfs2: Wakeup the downconvert thread after a successful cancel convert ocfs2: Access the xattr bucket only before modifying it. configfs: Silence lockdep on mkdir(), rmdir() and configfs_depend_item() ocfs2: Fix possible deadlock in ocfs2_write_dquot() ocfs2: Push out dropping of dentry lock to ocfs2_wq commit b987e8e5a986e77069c99fda5da6878751808fe9 Merge: 52a84ec... 43f3f05... Author: Linus Torvalds Date: Tue Feb 3 16:49:54 2009 -0800 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: [XFS] Warn on transaction in flight on read-only remount xfs: Check buffer lengths in log recovery don't reallocate sxp variable passed into xfs_swapext commit 9b02605826903203d5301049c1f52e722584785c Author: David S. Miller Date: Tue Feb 3 16:28:23 2009 -0800 sparc64: Kill bogus TPC/address truncation during 32-bit faults. This builds upon eeabac7386ca13bfe1a58afeb04326a9e1a3a20e ("sparc64: Validate kernel generated fault addresses on sparc64.") Upon further consideration, we actually should never see any fault addresses for 32-bit tasks with the upper 32-bits set. If it does every happen, by definition it's a bug. Whatever context created that fault would only have that fault satisfied if we used the full 64-bit address. If we truncate it, we'll always fault the wrong address and we'll always loop faulting forever. So catch such conditions and mark them as errors always. Log the error and fail the fault. Signed-off-by: David S. Miller commit 55128bc23e9ab44e97f81f6cd349035230ee59a6 Author: Randy Dunlap Date: Tue Feb 3 15:20:13 2009 -0800 sunrpc: fix rdma dependencies Fix sunrpc/rdma build dependencies. Survives 12 build combinations of INET, IPV6, SUNRPC, INFINIBAND, and INFINIBAND_ADDR_TRANS. ERROR: "rdma_destroy_id" [net/sunrpc/xprtrdma/xprtrdma.ko] undefined! ERROR: "rdma_connect" [net/sunrpc/xprtrdma/xprtrdma.ko] undefined! ERROR: "rdma_destroy_qp" [net/sunrpc/xprtrdma/xprtrdma.ko] undefined! ERROR: "rdma_create_id" [net/sunrpc/xprtrdma/xprtrdma.ko] undefined! ERROR: "rdma_create_qp" [net/sunrpc/xprtrdma/xprtrdma.ko] undefined! ERROR: "rdma_resolve_route" [net/sunrpc/xprtrdma/xprtrdma.ko] undefined! ERROR: "rdma_disconnect" [net/sunrpc/xprtrdma/xprtrdma.ko] undefined! ERROR: "rdma_resolve_addr" [net/sunrpc/xprtrdma/xprtrdma.ko] undefined! ERROR: "rdma_accept" [net/sunrpc/xprtrdma/svcrdma.ko] undefined! ERROR: "rdma_destroy_id" [net/sunrpc/xprtrdma/svcrdma.ko] undefined! ERROR: "rdma_listen" [net/sunrpc/xprtrdma/svcrdma.ko] undefined! ERROR: "rdma_create_id" [net/sunrpc/xprtrdma/svcrdma.ko] undefined! ERROR: "rdma_create_qp" [net/sunrpc/xprtrdma/svcrdma.ko] undefined! ERROR: "rdma_bind_addr" [net/sunrpc/xprtrdma/svcrdma.ko] undefined! ERROR: "rdma_disconnect" [net/sunrpc/xprtrdma/svcrdma.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 4d7155b932b8129c72e2f2714890e20b2a05e0b7 Author: Karsten Keil Date: Tue Feb 3 15:18:01 2009 -0800 e1000: Fix PCI enable to honor the need_ioport flag On machine were no IO ports are assigned the call to pci_enable_device() will fail, even if need_ioport is false, we need to use pci_enable_device_mem() here. Signed-off-by: Karsten Keil Signed-off-by: David S. Miller commit 714c48f1bb553a2e5dd8d6ff66accc7c51218ac9 Author: Dean Nelson Date: Tue Feb 3 15:16:17 2009 -0800 sgi-xp: link XPNET's net_device_ops to its net_device structure A recent patch by Stephen Hemminger to convert XPNET to use net_device_ops and internal net_device_stats failed to link the net_device_ops structure to the net_device structure. See commit e8ac9c55f28482f5b2f497a8e7eb90985db237c2 ("xpnet: convert devices to new API"). Signed-off-by: Dean Nelson Signed-off-by: David S. Miller commit a9d3a146923d374b945aa388dc884df69564a818 Author: Cord Walter Date: Tue Feb 3 15:14:05 2009 -0800 pcnet_cs: Fix misuse of the equality operator. Signed-off-by: Cord Walter Signed-off-by: Komuro Signed-off-by: David S. Miller commit 67dd82462d553c35bef14de1bf8afcb1095e041d Author: Filip Aben Date: Tue Feb 3 15:13:26 2009 -0800 hso: add new device id's This patch adds a few device ID's. It also removes an ID that was used in an internal engineering version of a device and will never see commercial light. Even if this ID will be 'recycled' in the future, which is very unlikely, we don't know what kind of device will be behind it. Therefore it's safer to remove it. Signed-off-by: Filip Aben Signed-off-by: David S. Miller commit 229c4ef8ae56d69f8dec64533bf1c7f8070c1a4a Author: Oleg Nesterov Date: Tue Feb 3 20:39:04 2009 +0100 ftrace: do_each_pid_task() needs rcu lock "ftrace: use struct pid" commit 978f3a45d9499c7a447ca7615455cefb63d44165 converted ftrace_pid_trace to "struct pid*". But we can't use do_each_pid_task() without rcu_read_lock() even if we know the pid itself can't go away (it was pinned in ftrace_pid_write). The exiting task can detach itself from this pid at any moment. Signed-off-by: Oleg Nesterov Signed-off-by: Ingo Molnar commit 43f3f057c56d030546145696627f13f95735be95 Author: Felix Blyakher Date: Thu Jan 22 21:34:05 2009 -0600 [XFS] Warn on transaction in flight on read-only remount Till VFS can correctly support read-only remount without racing, use WARN_ON instead of BUG_ON on detecting transaction in flight after quiescing filesystem. Signed-off-by: Felix Blyakher Reviewed-by: Christoph Hellwig commit 6139a2360987f55e4490a7813cf69df74ec8b93a Author: Dave Chinner Date: Thu Jan 22 15:37:47 2009 +1100 xfs: Check buffer lengths in log recovery Before trying to obtain, read or write a buffer, check that the buffer length is actually valid. If it is not valid, then something read in the recovery process has been corrupted and we should abort recovery. Reported-by: Eric Sesterhenn Tested-by: Eric Sesterhenn Reviewed-by: Christoph Hellwig Reviewed-by: Felix Blyakher Signed-off-by: Dave Chinner Signed-off-by: Felix Blyakher commit 6d2160bfe7826aca1c94b4bca77093908a452ae7 Merge: f0e0059... b1792e3... Author: Felix Blyakher Date: Tue Feb 3 10:38:41 2009 -0600 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus commit 52a84ec2f33debc86507fe7cffd8171660457bf2 Merge: b1792e3... 9062712... Author: Linus Torvalds Date: Tue Feb 3 07:39:55 2009 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: implement HORKAGE_1_5_GBPS and apply it to WD My Book libata: add no penalty retry request for EH device handling routines libata: improve probe failure handling libata: add @spd_limit to sata_down_spd_limit() libata: clear dev->ering in smarter way libata: check onlineness before using SPD in sata_down_spd_limit() libata: move ata_dev_disable() to libata-eh.c libata: fix EH device failure handling sata_nv: ck804 has borked hardreset too ide/libata: fix ata_id_is_cfa() (take 4) libata: fix kernel-doc warnings ahci: add a module parameter to ignore the SSS flags for async scanning sata_mv: Fix chip type for Hightpoint RocketRaid 1740/1742 [libata] sata_sil: Fix compilation error with libata debugging enabled commit fb53fde9762432d091dac209bdf4f3f850117c55 Merge: eb4400e... b1792e3... Author: David S. Miller Date: Mon Feb 2 23:55:27 2009 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit eb4400e3a040b90a3ad805b01fcbc99a5f615c8f Author: Maciej Sosnowski Date: Mon Feb 2 23:26:57 2009 -0800 dca: redesign locks to fix deadlocks Change spin_locks to irqsave to prevent dead-locks. Protect adding and deleting to/from dca_providers list. Drop the lock during dca_sysfs_add_req() and dca_sysfs_remove_req() calls as they might sleep (use GFP_KERNEL allocation). Signed-off-by: Maciej Sosnowski Acked-by: Jeff Kirsher Signed-off-by: David S. Miller commit ff01b9163655ace76b29b7ff2f56b25c32f795da Author: Roel Kluin Date: Mon Feb 2 23:19:50 2009 -0800 cassini/sungem: limit reaches -1, but 0 tested while (limit--) if (test()) break; if (limit <= 0) goto test_failed; In the last iteration, limit is decremented after the test to 0. If just thereafter test() succeeds and a break occurs, the goto still occurs because limit is 0. Signed-off-by: Roel Kluin Signed-off-by: David S. Miller commit 47a4a0e766e3152dee667ea8fcca8465c8a0759f Author: Stephen Rothwell Date: Mon Feb 2 22:14:28 2009 -0800 sparc: fixup for sparseirq changes Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit eeabac7386ca13bfe1a58afeb04326a9e1a3a20e Author: David S. Miller Date: Mon Feb 2 22:08:15 2009 -0800 sparc64: Validate kernel generated fault addresses on sparc64. In order to handle all of the cases of address calculation overflow properly, we run sparc 32-bit processes in "address masking" mode when running on a 64-bit kernel. Address masking mode zeros out the top 32-bits of the address calculated for every load and store instruction. However, when we're in privileged mode we have to run with that address masking mode disabled even when accessing userspace from the kernel. To "simulate" the address masking mode we clear the top-bits by hand for 32-bit processes in the fault handler. It is the responsibility of code in the compat layer to properly zero extend addresses used to access userspace. If this isn't followed properly we can get into a fault loop. Say that the user address is 0xf0000000 but for whatever reason the kernel code sign extends this to 64-bit, and then the kernel tries to access the result. In such a case we'll fault on address 0xfffffffff0000000 but the fault handler will process that fault as if it were to address 0xf0000000. We'll loop faulting forever because the fault never gets satisfied. So add a check specifically for this case, when the kernel is faulting on a user address access and the addresses don't match up. This code path is sufficiently slow path, and this bug is sufficiently painful to diagnose, that this kind of bug check is warranted. Signed-off-by: David S. Miller commit 64ca0404eed57f6c92290d55e949a7f46cbe4bf4 Author: Liam Girdwood Date: Mon Feb 2 22:23:22 2009 +0000 ALSA: ASoC: email - update email addresses. This just updates my email address on some drivers I'd forgotten in a previous patch. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai commit bcde563c43f138aac3072ab8e2934859cd2ee183 Author: H. Peter Anvin Date: Mon Feb 2 21:42:40 2009 -0800 x86: add x86@kernel.org to MAINTAINERS Impact: Documentation only There is an email alias as well to reach the x86 maintainers: x86@kernel.org. Document it. Signed-off-by: H. Peter Anvin commit 802c64b310e5b9dfda6cb50b850b962ed96a9e81 Author: David S. Miller Date: Mon Feb 2 21:57:48 2009 -0800 sparc64: On non-Niagara, need to touch NMI watchdog in NOHZ mode. When we're idling in NOHZ mode, timer interrupts are not running. Evidence of processing timer interrupts is what the NMI watchdog uses to determine if the CPU is stuck. On Niagara, we'll yield the cpu. This will make the cpu, at worst, hang out in the hypervisor until an interrupt arrives. This will prevent the NMI watchdog timer from firing. However on non-Niagara we just loop executing instructions which will cause the NMI watchdog to keep firing. It won't see timer interrupts happening so it will think the cpu is stuck. Fix this by touching the NMI watchdog in the cpu idle loop on non-Niagara machines. Signed-off-by: David S. Miller commit 46578a6913e6f5e69229561736b94c18c2e88ae4 Author: Roel Kluin Date: Mon Feb 2 21:39:02 2009 -0800 net: variables reach -1, but 0 tested while (timeout--) { ... } timeout becomes -1 if the loop isn't ended otherwise, not 0. Signed-off-by: Roel Kluin Signed-off-by: David S. Miller commit 35626129abcd6a7547e84c817ef5b6eff7a8758b Author: Randy Dunlap Date: Mon Feb 2 16:00:29 2009 -0800 sched: add missing kernel-doc in sched.h Add kernel-doc notation for @lock: include/linux/sched.h:457: No description found for parameter 'lock' Signed-off-by: Randy Dunlap Signed-off-by: Ingo Molnar commit a67798cd7bb130bf37f5ffb28f3260f4c10232db Author: Martin Hicks Date: Fri Jan 30 10:50:54 2009 -0600 x86: push old stack address on irqstack for unwinder Impact: Fixes dumpstack and KDB on 64 bits This re-adds the old stack pointer to the top of the irqstack to help with unwinding. It was removed in commit d99015b1abbad743aa049b439c1e1dede6d0fa49 as part of the save_args out-of-line work. Both dumpstack and KDB require this information. Signed-off-by: Martin Hicks Signed-off-by: H. Peter Anvin commit 9062712fa9ed13b531dfc2228086650b8bd6a255 Author: Tejun Heo Date: Thu Jan 29 20:31:36 2009 +0900 libata: implement HORKAGE_1_5_GBPS and apply it to WD My Book 3Gbps is often much more prone to transmission failures. It's usually okay to let EH handle speed down after transmission failures but some WD My Book drives completely shutdown after certain transmission failures and after it only power cycling can revive them. Combined with the fact that external drives often end up with cable assembly which is longer than usual and more likely to have intervening gender, this makes these drives very likely to shutdown under certain configurations virtually rendering them unusable. This patch implements HOARKGE_1_5_GBPS and applies it to WD My Book such that 1.5Gbps is forced once the device is identified. Please take a look at the following bz for related reports. http://bugzilla.kernel.org/show_bug.cgi?id=9913 Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit cf9a590a9eae3b99ca77d8db17afd2d7dbdd0986 Author: Tejun Heo Date: Thu Jan 29 20:31:35 2009 +0900 libata: add no penalty retry request for EH device handling routines Let -EAGAIN from EH device handling routines trigger EH retry without consuming its tries count. This will be used to implement link SPD horkage which requires hardreset to adjust SPD without affecting other EH decisions. As it bypasses the forward progress guarantee provided by the tries count, the requester is responsible for ensuring forward progress. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c2c7a89c5eabaea8c0c2aa0c1069e510144513ab Author: Tejun Heo Date: Thu Jan 29 20:31:34 2009 +0900 libata: improve probe failure handling When link is flaky at high speed, it isn't uncommon for a device to repeatedly fail probing sequence early after successfully negotiating high link speed. This often leads to consecutive hotplug events without successful probing. This patch improves libata EH such that it remembers probing trials and if there have been more than two unsuccessful trials in the past 60 seconds, slows down link speed to 1.5Gbps. As link speed negotiation is the duty of the PHY layer proper, the goal of this fallback mechanism is to provide the last resort when everything else fails, which unfortunately happens not too infrequently, so no fancy 6->3->1.5 speeding down or highest successful transmission speed seen kind of logics (yet). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a07d499b4759881db1359dd8812eecd00b0e0a28 Author: Tejun Heo Date: Thu Jan 29 20:31:33 2009 +0900 libata: add @spd_limit to sata_down_spd_limit() Add @spd_limit to sata_down_spd_limit() so that the caller can specify the SPD limit it wants. This parameter doesn't get in the way even when it's too low. The closest possible limit is applied. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 99cf610aa4840d822cdc67d194b23b55010ca9bd Author: Tejun Heo Date: Thu Jan 29 20:31:32 2009 +0900 libata: clear dev->ering in smarter way dev->ering used to be cleared together with the rest of ata_device in ata_dev_init() which is called whenever a probing event occurs. dev->ering is about to be used to track probing failures so it needs to remain persistent over multiple porbing events. This patch achieves this by doing the following. * Instead of CLEAR_OFFSET, define CLEAR_BEGIN and CLEAR_END and only clear between BEGIN and END. ering is moved after END. The split of persistent area is to allow hotter items remain at the head. * ering is explicitly cleared on ata_dev_disable() and when device attach succeeds. So, ering is persistent throug a device's life time (unless explicitly cleared of course) and also through periods inbetween disablement of an attached device and successful detection of the next one. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9913ff8abf1c70a8d52560dc931e1901d025ad27 Author: Tejun Heo Date: Thu Jan 29 20:31:31 2009 +0900 libata: check onlineness before using SPD in sata_down_spd_limit() sata_down_spd_limit() should check whether the link is online before using the SPD value to determine how to limit the link speed. Factor out onlineness test and test it from sata_down_spd_limit(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 678afac678061ee41bc3007885003c125912a8e2 Author: Tejun Heo Date: Thu Jan 29 20:31:30 2009 +0900 libata: move ata_dev_disable() to libata-eh.c ata_dev_disable() is about to be more tightly integrated into EH logic. Move it to libata-eh.c. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d89293abd95bfd7dd9229087d6c30c1464c5ac83 Author: Tejun Heo Date: Thu Jan 29 20:31:29 2009 +0900 libata: fix EH device failure handling The dev->pio_mode > XFER_PIO_0 test is there to avoid unnecessary speed down warning messages but it accidentally disabled SATA link spd down during configuration phase after reset where PIO mode is always zero. This patch fixes the problem by moving the test where it belongs. This makes libata probing sequence behave better when the connection is flaky at higher link speeds which isn't too uncommon for eSATA devices. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 8d993eaa9c3c61b8a5929a7f695078a1fcfb4869 Author: Tejun Heo Date: Sun Feb 1 10:56:31 2009 +0900 sata_nv: ck804 has borked hardreset too While playing with nvraid, I found out that rmmoding and insmoding often trigger hardreset failure on the first port (the second one was always okay). Seriously, how diverse can you get with hardreset behaviors? Anyways, make ck804 use noclassify variant too. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2999b58b795ad81f10e34bdbbfd2742172f247e4 Author: Sergei Shtylyov Date: Sun Feb 1 20:46:39 2009 +0400 ide/libata: fix ata_id_is_cfa() (take 4) When checking for the CFA feature set support, ata_id_is_cfa() tests bit 2 in word 82 of the identify data instead the word 83; it also checks the ATA/PI version support in the word 80 (which the CompactFlash specifications have as reserved), this having no slightest chance to work on the modern CF cards that don't have 0x848A in the word 0... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 5eb66fe05f08d515a7377787473bc4e4b1ed5b59 Author: Randy Dunlap Date: Tue Jan 20 16:28:59 2009 -0800 libata: fix kernel-doc warnings Fix libata kernel-doc warnings: Warning(linux-next-20090120//drivers/ata/libata-core.c:4720): Excess function parameter 'dev' description in 'ata_qc_new' Warning(linux-next-20090120//drivers/ata/libata-scsi.c:428): No description found for parameter 'ap' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit f3d7f23f87723a0947164ec88fc40e08254a64d6 Author: Arjan van de Ven Date: Mon Jan 26 02:05:44 2009 -0800 ahci: add a module parameter to ignore the SSS flags for async scanning The SSS flag, which directs the OS to spin up one disk at a time to not have the PSU blow out, sometimes gets set even when not needed. The effect of this is a longer-than-needed boot time. This patch adds a module parameter that makes the driver ignore SSS at least as far as the parallel scan during boot is concerned... Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit 4462254ac6be9150aae87d54d388fc348d6fcead Author: Mark Lord Date: Tue Jan 27 16:33:13 2009 -0500 sata_mv: Fix chip type for Hightpoint RocketRaid 1740/1742 Fix chip type for the Highpoint RocketRAID 1740 and 1742 PCI cards. These really do have Marvell 6042 chips on them, rather than the 5081 chip. Confirmed by multiple (two) users (for the 1740), and by examining the product photographs from Highpoint's web site. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 41137aa61c1ccb7cd06981807113b7e2d0ad89ed Author: Pasi Kärkkäinen Date: Mon Feb 2 21:47:14 2009 +0200 [libata] sata_sil: Fix compilation error with libata debugging enabled I tried compiling 2.6.29-rc1 and 2.6.29-rc3 with libata debugging enabled and got the following error: CC [M] drivers/ata/sata_sil.o drivers/ata/sata_sil.c: In function 'sil_fill_sg': drivers/ata/sata_sil.c:327: error: 'pi' undeclared (first use in this function) drivers/ata/sata_sil.c:327: error: (Each undeclared identifier is reported only once drivers/ata/sata_sil.c:327: error: for each function it appears in.) make[2]: *** [drivers/ata/sata_sil.o] Error 1 make[1]: *** [drivers/ata] Error 2 make: *** [drivers] Error 2 include/linux/libata.h has the following enabled: #define ATA_DEBUG #define ATA_VERBOSE_DEBUG #define ATA_IRQ_TRAP This fixes the compilation. Signed-off-by: Jeff Garzik commit b1792e367053968f2ddb48bc911d314143ce6242 Merge: 859281f... 71a082e... Author: Linus Torvalds Date: Mon Feb 2 19:28:58 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI hotplug: Change link order of pciehp & acpiphp PCI hotplug: fakephp: Allocate PCI resources before adding the device PCI MSI: Fix undefined shift by 32 PCI PM: Do not wait for buses in B2 or B3 during resume PCI PM: Power up devices before restoring their state PCI PM: Fix hibernation breakage on EeePC 701 PCI: irq and pci_ids patch for Intel Tigerpoint DeviceIDs PCI PM: Fix suspend error paths and testing facility breakage commit 859281ff370977f917ec2195f86a5bfccf1fc6d6 Merge: 93bfbd7... f58914e... Author: Linus Torvalds Date: Mon Feb 2 19:27:00 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: fix per cpu kmem_cache_cpu array memory leak kmalloc: return NULL instead of link failure commit 93bfbd71db4d2e01c05e219f285249a74808b1d4 Merge: 31c952d... 7fbb7ca... Author: Linus Torvalds Date: Mon Feb 2 19:26:44 2009 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: fbdev/atyfb: Fix DSP config on some PowerMacs & PowerBooks powerpc: Fix oops on some machines due to incorrect pr_debug() powerpc/ps3: Printing fixups for l64 to ll64 convserion drivers/net powerpc/5200: update device tree binding documentation powerpc/5200: Bugfix for PCI mapping of memory and IMMR powerpc/5200: update defconfigs commit 31c952dcf83d5b0fd57b514cbe8a1664647c26e7 Merge: 9e6235e... 3d39870... Author: Linus Torvalds Date: Mon Feb 2 19:26:29 2009 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched_rt: don't use first_cpu on cpumask created with cpumask_and sched: fix buddie group latency sched: clear buddies more aggressively sched: symmetric sync vs avg_overlap sched: fix sync wakeups cpuset: fix possible deadlock in async_rebuild_sched_domains commit 9e6235e997bf091326b2f3ac92217c2ac2e27eb5 Merge: 5c350d9... 67e70ba... Author: Linus Torvalds Date: Mon Feb 2 19:26:06 2009 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (45 commits) V4L/DVB (10411): s5h1409: Perform s5h1409 soft reset after tuning V4L/DVB (10403): saa7134-alsa: saa7130 doesn't support digital audio V4L/DVB (10229): ivtv: fix memory leak V4L/DVB (10385): gspca - main: Fix memory leak when USB disconnection while streaming. V4L/DVB (10325): em28xx: Fix for fail to submit URB with IRQs and Pre-emption Disabled V4L/DVB (10317): radio-mr800: fix radio->muted and radio->stereo V4L/DVB (10314): cx25840: ignore TUNER_SET_CONFIG in the command callback. V4L/DVB (10288): af9015: bug fix: stick does not work always when plugged V4L/DVB (10287): af9015: fix second FE V4L/DVB (10270): saa7146: fix unbalanced mutex_lock/unlock V4L/DVB (10265): budget.c driver: Kernel oops: "BUG: unable to handle kernel paging request at ffffffff V4L/DVB (10261): em28xx: fix kernel panic on audio shutdown V4L/DVB (10257): em28xx: Fix for KWorld 330U Board V4L/DVB (10256): em28xx: Fix for KWorld 330U AC97 V4L/DVB (10254): em28xx: Fix audio URB transfer buffer race condition V4L/DVB (10250): cx25840: fix regression: fw not loaded on first use V4L/DVB (10248): v4l-dvb: fix a bunch of compile warnings. V4L/DVB (10243): em28xx: fix compile warning V4L/DVB (10240): Fix obvious swapped names in v4l2_subdev logic V4L/DVB (10233): [PATCH] Terratec Cinergy DT XS Diversity new USB ID (0ccd:0081) ... commit 5c350d93ff4736086a1b08fef1d0b5e22138d2e0 Merge: 017f517... b601895... Author: Linus Torvalds Date: Mon Feb 2 19:24:14 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: pxamci: enable DMA for write ops after CMD/RESP pxamci: replace #ifdef CONFIG_PXA27x with if (cpu_is_pxa27x()) ricoh_mmc: Use suspend_late/resume_early mmci: Add support for ST Micro derivate mmc: Add a MX2/MX3 specific SDHC driver commit 017f51788ffdc16b0168143e38ea2c1f3551d983 Merge: 17294ab... d224b62... Author: Linus Torvalds Date: Mon Feb 2 19:23:49 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: icside: fix PCB version 6 support (v2) tx4939ide: typo fix and minor cleanup ide: add CS5536 host driver (v3) ide: Force VIA IDE legacy interrupts for AmigaOne boards IDE: Unregister and disable devices if initialization fails. ide: fix ide_register_port() failure handling ide: struct device - replace bus_id with dev_name(), dev_set_name() ide-cd: fix DMA for non bio-backed requests commit 17294ab2ca8e8c46f2e4825c55541b2b88e52bf4 Merge: 86adf8a... 8f04915... Author: Linus Torvalds Date: Mon Feb 2 19:20:17 2009 -0800 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb: uwb: lock rc->rsvs_lock with spin_lock_bh() wusb: timeout when waiting for ASL/PZL updates in whci-hcd uwb: remove unused #include 's wusb: return -ENOTCONN when resetting a port with no connected device uwb: safely remove all reservations commit 86adf8adfcb3d3f4b6c30aeb40da480da02de1d1 Merge: 3fff017... cbb5901... Author: Linus Torvalds Date: Mon Feb 2 19:19:50 2009 -0800 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: add text file detailing queue/ sysfs files bio.h: If they MUST be inlined, then use __always_inline Fix misleading comment in bio.h block: fix inconsistent parenthesisation of QUEUE_FLAG_DEFAULT block: fix oops in blk_queue_io_stat() commit 3fff0179e33cd7d0a688dab65700c46ad089e934 Author: Mark McLoughlin Date: Tue Feb 3 13:33:53 2009 +1030 virtio-pci: do not oops on config change if driver not loaded The host really shouldn't be notifying us of config changes before the device status is VIRTIO_CONFIG_S_DRIVER or VIRTIO_CONFIG_S_DRIVER_OK. However, if we do happen to be interrupted while we're not attached to a driver, we really shouldn't oops. Prevent this simply by checking that device->driver is non-NULL before trying to notify the driver of config changes. Problem observed by doing a "set_link virtio.0 down" with QEMU before the net driver had been loaded. Signed-off-by: Mark McLoughlin Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit 720eba31f47aeade8ec130ca7f4353223c49170f Author: Eric Dumazet Date: Tue Feb 3 13:31:36 2009 +1030 modules: Use a better scheme for refcounting Current refcounting for modules (done if CONFIG_MODULE_UNLOAD=y) is using a lot of memory. Each 'struct module' contains an [NR_CPUS] array of full cache lines. This patch uses existing infrastructure (percpu_modalloc() & percpu_modfree()) to allocate percpu space for the refcount storage. Instead of wasting NR_CPUS*128 bytes (on i386), we now use nr_cpu_ids*sizeof(local_t) bytes. On a typical distro, where NR_CPUS=8, shiping 2000 modules, we reduce size of module files by about 2 Mbytes. (1Kb per module) Instead of having all refcounters in the same memory node - with TLB misses because of vmalloc() - this new implementation permits to have better NUMA properties, since each CPU will use storage on its preferred node, thanks to percpu storage. Signed-off-by: Eric Dumazet Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit fd4ef231962ab44fd1004e87f9d7c6809f00cd64 Author: Mark Fasheh Date: Thu Jan 29 15:06:21 2009 -0800 ocfs2: add quota call to ocfs2_remove_btree_range() We weren't reclaiming the clusters which get free'd from this function, so any user punching holes in a file would still have those bytes accounted against him/her. Add the call to vfs_dq_free_space_nodirty() to fix this. Interestingly enough, the journal credits calculation already took this into account. Signed-off-by: Mark Fasheh Acked-by: Jan Kara commit a4b91965d39d5d53b470d6aa62cba155a6f3ffe1 Author: Sunil Mushran Date: Thu Jan 29 17:12:31 2009 -0800 ocfs2: Wakeup the downconvert thread after a successful cancel convert When two nodes holding PR locks on a resource concurrently attempt to upconvert the locks to EX, the master sends a BAST to one of the nodes. This message tells that node to first cancel convert the upconvert request, followed by downconvert to a NL. Only when this lock is downconverted to NL, can the master upconvert the first node's lock to EX. While the fs was doing the cancel convert, it was forgetting to wake up the dc thread after a successful cancel, leading to a deadlock. Reported-and-Tested-by: David Teigland Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit 554e7f9e043e29da79c044f7a55efe4fad40701e Author: Tao Ma Date: Thu Jan 8 08:21:43 2009 +0800 ocfs2: Access the xattr bucket only before modifying it. In ocfs2_xattr_value_truncate, we may call b-tree codes which will extend the journal transaction. It has a potential problem that it may let the already-accessed-but-not-dirtied buffers gone. So we'd better access the bucket after we call ocfs2_xattr_value_truncate. And as for the root buffer for the xattr value, b-tree code will acess and dirty it, so we don't need to worry about it. Signed-off-by: Tao Ma Signed-off-by: Mark Fasheh commit 0e0333429a6280e6eb3c98845e4eed90d5f8078a Author: Joel Becker Date: Wed Dec 17 14:23:52 2008 -0800 configfs: Silence lockdep on mkdir(), rmdir() and configfs_depend_item() When attaching default groups (subdirs) of a new group (in mkdir() or in configfs_register()), configfs recursively takes inode's mutexes along the path from the parent of the new group to the default subdirs. This is needed to ensure that the VFS will not race with operations on these sub-dirs. This is safe for the following reasons: - the VFS allows one to lock first an inode and second one of its children (The lock subclasses for this pattern are respectively I_MUTEX_PARENT and I_MUTEX_CHILD); - from this rule any inode path can be recursively locked in descending order as long as it stays under a single mountpoint and does not follow symlinks. Unfortunately lockdep does not know (yet?) how to handle such recursion. I've tried to use Peter Zijlstra's lock_set_subclass() helper to upgrade i_mutexes from I_MUTEX_CHILD to I_MUTEX_PARENT when we know that we might recursively lock some of their descendant, but this usage does not seem to fit the purpose of lock_set_subclass() because it leads to several i_mutex locked with subclass I_MUTEX_PARENT by the same task. >From inside configfs it is not possible to serialize those recursive locking with a top-level one, because mkdir() and rmdir() are already called with inodes locked by the VFS. So using some mutex_lock_nest_lock() is not an option. I am proposing two solutions: 1) one that wraps recursive mutex_lock()s with lockdep_off()/lockdep_on(). 2) (as suggested earlier by Peter Zijlstra) one that puts the i_mutexes recursively locked in different classes based on their depth from the top-level config_group created. This induces an arbitrary limit (MAX_LOCK_DEPTH - 2 == 46) on the nesting of configfs default groups whenever lockdep is activated but this limit looks reasonably high. Unfortunately, this alos isolates VFS operations on configfs default groups from the others and thus lowers the chances to detect locking issues. This patch implements solution 1). Solution 2) looks better from lockdep's point of view, but fails with configfs_depend_item(). This needs to rework the locking scheme of configfs_depend_item() by removing the variable lock recursion depth, and I think that it's doable thanks to the configfs_dirent_lock. For now, let's stick to solution 1). Signed-off-by: Louis Rilling Acked-by: Joel Becker Signed-off-by: Mark Fasheh commit f8afead7169f0f28a4b421bcbdb510e52a2d094d Author: Jan Kara Date: Mon Jan 12 23:20:32 2009 +0100 ocfs2: Fix possible deadlock in ocfs2_write_dquot() It could happen that some limit has been set via quotactl() and in parallel ->mark_dirty() is called from another thread doing e.g. dquot_alloc_space(). In such case ocfs2_write_dquot() must not try to sync the dquot because that needs global quota lock but that ranks above transaction start. Signed-off-by: Jan Kara Signed-off-by: Mark Fasheh commit ea455f8ab68338ba69f5d3362b342c115bea8e13 Author: Jan Kara Date: Mon Jan 12 23:20:31 2009 +0100 ocfs2: Push out dropping of dentry lock to ocfs2_wq Dropping of last reference to dentry lock is a complicated operation involving dropping of reference to inode. This can get complicated and quota code in particular needs to obtain some quota locks which leads to potential deadlock. Thus we defer dropping of inode reference to ocfs2_wq. Signed-off-by: Jan Kara Signed-off-by: Mark Fasheh commit 0047e5d240ede4e84c03bc9001375175900fd259 Author: Ron Mercer Date: Mon Feb 2 13:54:31 2009 -0800 qlge: bugfix: Add missing netif_napi_del call. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit e78f5fa7cc1a211eb9909ef90b0de3311086ba55 Author: Ron Mercer Date: Mon Feb 2 13:54:15 2009 -0800 qlge: bugfix: Add flash offset for second port. Without this the 2nd port gets first ports MAC addr. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 26351479ed43288be92935826c215fbe01e2abb2 Author: Ron Mercer Date: Mon Feb 2 13:53:57 2009 -0800 qlge: bugfix: Fix endian issue when reading flash. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit e408b8dcb5ce42243a902205005208e590f28454 Author: Eric Dumazet Date: Mon Feb 2 13:41:57 2009 -0800 udp: increments sk_drops in __udp_queue_rcv_skb() Commit 93821778def10ec1e69aa3ac10adee975dad4ff3 (udp: Fix rcv socket locking) accidentally removed sk_drops increments for UDP IPV4 sockets. This field can be used to detect incorrect sizing of socket receive buffers. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 0afd4a21ba7d75e93fa79cf05d7a21774e149c0f Author: David S. Miller Date: Mon Feb 2 13:27:44 2009 -0800 net: Fix userland breakage wrt. linux/if_tunnel.h Reported by Andrew Walrond Changeset c19e654ddbe3831252f61e76a74d661e1a755530 ("gre: Add netlink interface") added an include of linux/ip.h to linux/if_tunnel.h We can't really let that get exposed to userspace because this conflicts with types defined in netinet/ip.h which userland is almost certainly going to have included either explicitly or implicitly. So guard this include with a __KERNEL__ ifdef. Signed-off-by: David S. Miller commit b6018958a57f6621d6979c4384e42a3df636beed Author: Cliff Brake Date: Thu Jan 22 17:07:03 2009 -0500 pxamci: enable DMA for write ops after CMD/RESP With the PXA270 MMC hardware, there seems to be an issue of data corruption on writes where a 4KB data block is offset by one byte. If we delay enabling the DMA for writes until after the CMD/RESP has finished, the problem seems to be fixed. related to PXA270 Erratum #91 Tested-by: Vernon Sauder Signed-off-by: Cliff Brake Acked-by: Eric Miao Signed-off-by: Pierre Ossman commit e10a854c4602072c34c03380b99da0a3ee15682c Author: Cliff Brake Date: Thu Jan 22 16:58:58 2009 -0500 pxamci: replace #ifdef CONFIG_PXA27x with if (cpu_is_pxa27x()) Signed-off-by: Cliff Brake Acked-by: Eric Miao Signed-off-by: Pierre Ossman commit 06cc1c880095063fa40b0a640ac0003b43107b40 Author: philipl@overt.org Date: Sun Jan 18 14:11:20 2009 -0500 ricoh_mmc: Use suspend_late/resume_early If ricoh_mmc suspends before sdhci_pci, it will pull the card out from under the controller, which could leave the system in a very confused state. Using suspend_late/resume_early ensures that sdhci_pci suspends first and resumes second. Signed-off-by: Philip Langdale Signed-off-by: Pierre Ossman commit cc30d60e4ca0b68e7e3f906eddd1e5b995d349f8 Author: Linus Walleij Date: Sun Jan 4 15:18:54 2009 +0100 mmci: Add support for ST Micro derivate This patch adds support for the ST Microelectronics version of the PL180 PrimeCell. They use designer ID 0x80 and have a few alterations/bugfixes related to open drain and HW flow control. They also add some SDIO registers, I am unsure if these are in ST HW only or if this is things also added in later ARM revisions, but they are included in the mmci.h file for completeness. Signed-off-by: Linus Walleij Signed-off-by: Pierre Ossman commit d96be879ff469759af6d7fcebdb66237c18da6f8 Author: Sascha Hauer Date: Tue Jan 6 17:04:14 2009 +0100 mmc: Add a MX2/MX3 specific SDHC driver This patch adds a MX2/MX3 specific SDHC driver. The hardware is basically the same as in the MX1, but unlike the MX1 controller the MX2 controller just works as expected. Since the MX1 driver has more workarounds for bugs than anything else I had no success with supporting MX1 and MX2 in a sane way in one driver. Signed-off-by: Sascha Hauer Signed-off-by: Pierre Ossman commit d224b6269e4731a82f648bb0281ea1a4d8b3311d Author: Bartlomiej Zolnierkiewicz Date: Mon Feb 2 20:12:23 2009 +0100 icside: fix PCB version 6 support (v2) We need to pass struct ide_port_info also to ide_host_register(). v2: Fix v5/v6 mismatch noticed by Russell. Cc: Russell King Signed-off-by: Bartlomiej Zolnierkiewicz commit 9711a53721616b0f4c5f21c5811e5c4ef82be46f Author: Atsushi Nemoto Date: Mon Feb 2 20:12:23 2009 +0100 tx4939ide: typo fix and minor cleanup The bcount is greater than 0 and less than or equal to 0x10000. Thus '(bcount & 0xffff) == 0x0000' can be simplified as 'bcount == 0x10000'. Suggested-by: Sergei Shtylyov Signed-off-by: Atsushi Nemoto Signed-off-by: Bartlomiej Zolnierkiewicz commit a77dcc437c1c3bc73887ecac8a304e4adcabb9b7 Author: Bartlomiej Zolnierkiewicz Date: Mon Feb 2 20:12:23 2009 +0100 ide: add CS5536 host driver (v3) This is a port of libata's pata_cs5536.c (written by Martin K. Petersen) to IDE subsystem. Changes done while at it: * Reprogram PIO/MWDMA timings if needed before and after DMA transfer (chipset uses shared PIO/MWDMA timings). * Fix cable detection to report 80-wires cable if BIOS set it for any device on a port (IDE core will do drive-side cable detection later). * Don't disable UDMA while programming PIO timings. * Simplify PCI/MSR support. Pros of having IDE host driver in addition to libata's one: * IDE is much lighter than SCSI+libata, the host driver itself is also a bit smaller: text data bss dec hex filename 1261 496 4 1761 6e1 drivers/ata/pata_cs5536.o 1242 128 4 1374 55e drivers/ide/cs5536.o * This allows use of IDE features which are unavailable under libata. v2: * Fixes per review from Sergei: - simplify dependency check in Kconfig - use IDE_DRV_MASK also for ->drive_data - disable UDMA when programming MWDMA - program new DTC timings only when necessary - fix printk() level in cs5536_init_one() * Fix patch description according to comments from Alan and Sergei. v3: * Smarter masking of UDMA bits per Sergei's suggestion. Cc: Martin K. Petersen Cc: Karl Auerbach Cc: Alan Cox Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 9f6514c1c5b55ab90f3ad1f3fc18b9daa5bd9c8c Author: Gerhard Pircher Date: Mon Feb 2 20:12:22 2009 +0100 ide: Force VIA IDE legacy interrupts for AmigaOne boards The AmigaOne uses the onboard VIA IDE controller in legacy mode (like the Pegasos). Signed-off-by: Gerhard Pircher Cc: "Grant Likely" Signed-off-by: Bartlomiej Zolnierkiewicz commit 51d6ac7011cc354eade4f1282857947930a905aa Author: Ian Campbell Date: Mon Feb 2 20:12:22 2009 +0100 IDE: Unregister and disable devices if initialization fails. On reboot the loop in device_shutdown gets confused by these partially initialized devices and goes into an infinite loop. Therefore unregister and disable these devices. Signed-off-by: Ian Campbell [bart: remove leftover hwif->present clearing + update patch description] Signed-off-by: Bartlomiej Zolnierkiewicz commit 9a100f4b78c4c59fdd1cc38c5fa6a1ec66f23d9a Author: Bartlomiej Zolnierkiewicz Date: Mon Feb 2 20:12:21 2009 +0100 ide: fix ide_register_port() failure handling * Factor out port freeing from ide_host_free() to ide_free_port(). * Add ide_disable_port() and use it on ide_register_port() failure. Cc: Ian Campbell Signed-off-by: Bartlomiej Zolnierkiewicz commit e5461f38b43d5658087a598c8deb2a9928d6b92b Author: Kay Sievers Date: Mon Feb 2 20:12:21 2009 +0100 ide: struct device - replace bus_id with dev_name(), dev_set_name() Signed-off-by: Kay Sievers Cc: linux-ide@vger.kernel.org Acked-by: Greg Kroah-Hartman Signed-off-by: Bartlomiej Zolnierkiewicz commit 9e772d0135a5b5f8355320be429efa339700d52d Author: Borislav Petkov Date: Mon Feb 2 20:12:21 2009 +0100 ide-cd: fix DMA for non bio-backed requests This one fixes http://bugzilla.kernel.org/show_bug.cgi?id=12320. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 8f04915532485d81e7f6c580a396ea7b01094221 Merge: 8f5140a... 45c82b5... Author: David Vrabel Date: Mon Feb 2 17:52:39 2009 +0000 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream commit 21dff4345697ad129b0efeed1b4d0aa53dfd47fe Author: Eero Nurkkala Date: Mon Feb 2 14:20:46 2009 +0200 OMAP: ASoC: Fix spinlock misuse in omap-pcm.c omap_pcm_trigger is called also in interrupt context so CPU flags must be restored when returning. Signed-off-by: Eero Nurkkala Acked-by: Jarkko Nikula Signed-off-by: Mark Brown commit cbb5901b904e122139e97c6f4caed9b1f13c3455 Author: Jens Axboe Date: Mon Feb 2 13:02:31 2009 +0100 block: add text file detailing queue/ sysfs files Signed-off-by: Jens Axboe commit c52440a69df22dca69794936a91e2fb529a707fb Author: Alberto Bertogli Date: Mon Feb 2 12:41:07 2009 +0100 bio.h: If they MUST be inlined, then use __always_inline bvec_kmap_irq() and bvec_kunmap_irq() comments say they MUST be inlined, so mark them as __always_inline. Signed-off-by: Alberto Bertogli Signed-off-by: Jens Axboe commit 20b636bf7c946da260391cd4570b16506f140a2c Author: Alberto Bertogli Date: Mon Feb 2 12:41:07 2009 +0100 Fix misleading comment in bio.h The comment says "remember to add offset!", but the function already adds it. Signed-off-by: Alberto Bertogli Signed-off-by: Jens Axboe commit 516a1ced456a6d118db738f0f09fce0cb0f42794 Author: Takashi Iwai Date: Mon Feb 2 11:37:03 2009 +0100 ALSA: hda - No widget selection for volume knob widgets in proc output Volume-knob widgets have no widget selection although they have widget connections. Thus, the connection list in the proc output shouldn't contain the selection (*). Signed-off-by: Takashi Iwai commit f58914e41473faf15e2dd66ad26be914da1bce71 Merge: 1cf3eb2... 3718909... Author: Pekka Enberg Date: Mon Feb 2 11:18:49 2009 +0200 Merge branches 'topic/slab/fixes' and 'topic/slub/fixes' into for-linus commit 0648e10d71c8e510d80772c4cb4220c97e9c34c7 Author: Jens Axboe Date: Mon Feb 2 08:43:48 2009 +0100 block: fix inconsistent parenthesisation of QUEUE_FLAG_DEFAULT Signed-off-by: Jens Axboe commit fb8ec18c316d869271137c97320dbfd2def56569 Author: Jens Axboe Date: Mon Feb 2 08:42:32 2009 +0100 block: fix oops in blk_queue_io_stat() Some initial probe requests don't have disk->queue mapped yet, so we can't rely on a non-NULL queue in blk_queue_io_stat(). Wrap it in blk_do_io_stat(). Signed-off-by: Jens Axboe commit 7fbb7cadd062baf299fd8b26a80ea99da0c3fe01 Author: Risto Suominen Date: Tue Jan 13 20:09:30 2009 +0000 fbdev/atyfb: Fix DSP config on some PowerMacs & PowerBooks Since the complete re-write in 2.6.10, some PowerMacs (At least PowerMac 5500 and PowerMac G3 Beige rev A) with ATI Mach64 chip have suffered from unstable columns in their framebuffer image. This seems to depend on a value (4) read from PLL_EXT_CNTL register, which leads to incorrect DSP config parameters to be written to the chip. This patch uses a value calculated by aty_init_pll_ct instead, as a starting point. There are questions as to whether this should be extended to other platforms or maybe made dependent on specific chip types, but in the meantime, this has been tested on various powermacs and works for them so let's commit it. Signed-off-by: Risto Suominen Tested-by: Michael Pettersson Cc: Signed-off-by: Benjamin Herrenschmidt commit 59b608c2c33feacc8be281ec3ba9ca2a3a5cb9a7 Author: Benjamin Herrenschmidt Date: Sun Feb 1 17:03:59 2009 +0000 powerpc: Fix oops on some machines due to incorrect pr_debug() Recently, a patch left DEBUG enabled in the powerpc common PCI code, resulting in an old bug in a pr_debug() statement to show up and cause a NULL dereference on some machines. This fixes the pr_debug() statement and reverts to DEBUG not being force-enabled in that file. Signed-off-by: Benjamin Herrenschmidt commit 309ea626b164f2abba8e639b3eb6f2e5d34708b9 Author: Stephen Rothwell Date: Tue Jan 13 20:09:30 2009 +0000 powerpc/ps3: Printing fixups for l64 to ll64 convserion drivers/net Signed-off-by: Stephen Rothwell Acked-by: Geoff Levand Acked-by: David S. Miller Signed-off-by: Benjamin Herrenschmidt commit 27421e211a39784694b597dbf35848b88363c248 Author: Linus Torvalds Date: Sun Feb 1 11:00:16 2009 -0800 Manually revert "mlock: downgrade mmap sem while populating mlocked regions" This essentially reverts commit 8edb08caf68184fb170f4f69c7445929e199eaea. It downgraded our mmap semaphore to a read-lock while mlocking pages, in order to allow other threads (and external accesses like "ps" et al) to walk the vma lists and take page faults etc. Which is a nice idea, but the implementation does not work. Because we cannot upgrade the lock back to a write lock without releasing the mmap semaphore, the code had to release the lock entirely and then re-take it as a writelock. However, that meant that the caller possibly lost the vma chain that it was following, since now another thread could come in and mmap/munmap the range. The code tried to work around that by just looking up the vma again and erroring out if that happened, but quite frankly, that was just a buggy hack that doesn't actually protect against anything (the other thread could just have replaced the vma with another one instead of totally unmapping it). The only way to downgrade to a read map _reliably_ is to do it at the end, which is likely the right thing to do: do all the 'vma' operations with the write-lock held, then downgrade to a read after completing them all, and then do the "populate the newly mlocked regions" while holding just the read lock. And then just drop the read-lock and return to user space. The (perhaps somewhat simpler) alternative is to just make all the callers of mlock_vma_pages_range() know that the mmap lock got dropped, and just re-grab the mmap semaphore if it needs to mlock more than one vma region. So we can do this "downgrade mmap sem while populating mlocked regions" thing right, but the way it was done here was absolutely not correct. Thus the revert, in the expectation that we will do it all correctly some day. Cc: Lee Schermerhorn Cc: Rik van Riel Cc: Andrew Morton Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit de8696203e64f19ea26f8e096ac8a796e78216b3 Merge: 807a96c... 0dc23d7... Author: Russell King Date: Sun Feb 1 17:53:26 2009 +0000 Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 commit 67e70baf043cfdcdaf5972bc94be82632071536b Author: Devin Heitmueller Date: Mon Jan 26 03:07:59 2009 -0300 V4L/DVB (10411): s5h1409: Perform s5h1409 soft reset after tuning Just like with the s5h1411, the s5h1409 needs a soft-reset in order for it to know that the tuner has been told to change frequencies. This change changes the behavior from "random tuning times between 500ms to complete tuning lock failures" to "tuning lock consistently within 700ms". Thanks to Robert Krakora for doing initial testing of the patch on the KWorld 330U. Thanks to Andy Walls for doing testing of the patch on the HVR-1600. Thanks to Michael Krufky for doing additional testing. Signed-off-by: Devin Heitmueller Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 40c41c8cf1d04445013a14772afb3903a17344a6 Author: Mauro Carvalho Chehab Date: Sat Jan 31 08:09:33 2009 -0300 V4L/DVB (10403): saa7134-alsa: saa7130 doesn't support digital audio According with saa7130 public datasheet, saa7130 doesn't support digital audio. This is also confirmed by experimental tests. So, it doesn't make sense to let saa7134-alsa register for those chipsets. Signed-off-by: Mauro Carvalho Chehab commit 10b888d6cec2688e65e9e128b14bf98ecd199da2 Author: Yinghai Lu Date: Sat Jan 31 14:50:07 2009 -0800 irq, x86: fix lock status with numa_migrate_irq_desc Eric Paris reported: > I have an hp dl785g5 which is unable to successfully run > 2.6.29-0.66.rc3.fc11.x86_64 or 2.6.29-rc2-next-20090126. During bootup > (early in userspace daemons starting) I get the below BUG, which quickly > renders the machine dead. I assume it is because sparse_irq_lock never > gets released when the BUG kills that task. Adjust lock sequence when migrating a descriptor with CONFIG_NUMA_MIGRATE_IRQ_DESC enabled. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 9a8ecae87a2b698964b1db9ea504ba1099f479fc Author: Dave Jones Date: Sat Jan 31 20:12:14 2009 -0500 x86: add cache descriptors for Intel Core i7 Signed-off-by: Dave Jones Signed-off-by: Ingo Molnar commit f9e6934502e46c363100245f137ddf0f4b1cb574 Author: Sebastiano Di Paola Date: Fri Jan 30 23:37:17 2009 +0000 net: packet socket packet_lookup_frame fix packet_lookup_frames() fails to get user frame if current frame header status contains extra flags. This is due to the wrong assumption on the operators precedence during frame status tests. Fixed by forcing the right operators precedence order with explicit brackets. Signed-off-by: Paolo Abeni Signed-off-by: Sebastiano Di Paola Signed-off-by: David S. Miller commit 3d398703ef06fd97b4c28c86b580546d5b57e7b7 Author: Rusty Russell Date: Sat Jan 31 23:21:24 2009 +1030 sched_rt: don't use first_cpu on cpumask created with cpumask_and cpumask_and() only initializes nr_cpu_ids bits, so the (deprecated) first_cpu() might find one of those uninitialized bits if nr_cpu_ids is less than NR_CPUS (as it can be for CONFIG_CPUMASK_OFFSTACK). Signed-off-by: Rusty Russell Signed-off-by: Ingo Molnar commit a571bbeafbcc501d9989fbce1cddcd810bd51d71 Author: Peter Zijlstra Date: Wed Jan 28 14:51:40 2009 +0100 sched: fix buddie group latency Similar to the previous patch, by not clearing buddies we can select entities past their run quota, which can increase latency. This means we have to clear group buddies as well. Do not use the group clear for pick_next_task(), otherwise that'll get O(n^2). Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit a9f3e2b549f83a9cdab873abf4140be27c05a3f2 Author: Mike Galbraith Date: Wed Jan 28 14:51:39 2009 +0100 sched: clear buddies more aggressively It was noticed that a task could get re-elected past its run quota due to buddy affinities. This could increase latency a little. Cure it by more aggresively clearing buddy state. We do so in two situations: - when we force preempt - when we select a buddy to run Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 1596e29773eadd96b0a5fc6e736afa52394cafda Author: Peter Zijlstra Date: Wed Jan 28 14:51:38 2009 +0100 sched: symmetric sync vs avg_overlap Reinstate the weakening of the sync hint if set. This yields a more symmetric usage of avg_overlap. Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit d942fb6c7d391baba3dddb566eb735fbf3df8528 Author: Peter Zijlstra Date: Mon Jan 26 17:56:17 2009 +0100 sched: fix sync wakeups Pawel Dziekonski reported that the openssl benchmark and his quantum chemistry application both show slowdowns due to the scheduler under-parallelizing execution. The reason are pipe wakeups still doing 'sync' wakeups which overrides the normal buddy wakeup logic - even if waker and wakee are loosely coupled. Fix an inversion of logic in the buddy wakeup code. Reported-by: Pawel Dziekonski Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 45c82b5a770be66845687a7d027c8b52946d59af Merge: 1347e96... 7cff360... Author: Linus Torvalds Date: Sat Jan 31 15:56:23 2009 -0800 Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (90 commits) headers_check fix: x86, swab.h headers_check fix: x86, sigcontext32.h headers_check fix: x86, sigcontext.h headers_check fix: x86, ptrace-abi.h headers_check fix: x86, mtrr.h headers_check fix: x86, mce.h headers_check fix: x86, kvm.h headers_check fix: x86, e820.h headers_check fix: linux/rtnetlink.h headers_check fix: linux/nubus.h headers_check fix: video/uvesafb.h headers_check fix: video/sisfb.h headers_check fix: sound/hdsp.h headers_check fix: mtd/inftl-user.h headers_check fix: linux/virtio_net.h headers_check fix: linux/virtio_console.h headers_check fix: linux/virtio_blk.h headers_check fix: linux/videodev.h headers_check fix: linux/video_encoder.h headers_check fix: linux/video_decoder.h ... commit 1347e965f5bcfffe82e56d2903ea4f32babaff4e Merge: ac56b94... d7240b9... Author: Linus Torvalds Date: Sat Jan 31 15:55:05 2009 -0800 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic-ipi: use per cpu data for single cpu ipi calls cpumask: convert lib/smp_processor_id to new cpumask ops signals, debug: fix BUG: using smp_processor_id() in preemptible code in print_fatal_signal() commit ac56b94f8049b4c246cd86257ae6c03c0ac75a13 Merge: 5b2d3e6... 14819ea... Author: Linus Torvalds Date: Sat Jan 31 15:54:30 2009 -0800 Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: irq: export __set_irq_handler() and handle_level_irq() commit 5b2d3e6d542c4c7009ba72e047c4c0633f2b5e26 Merge: f649043... b0a9b51... Author: Linus Torvalds Date: Sat Jan 31 15:54:06 2009 -0800 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimer: prevent negative expiry value after clock_was_set() hrtimers: allow the hot-unplugging of all cpus hrtimers: increase clock min delta threshold while interrupt hanging commit f6490438fce5902f840d1f0f905295077c635e7a Merge: e81cfd2... ba2607f... Author: Linus Torvalds Date: Sat Jan 31 15:53:30 2009 -0800 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, ds, bts: cleanup/fix DS configuration ring-buffer: reset timestamps when ring buffer is reset trace: set max latency variable to zero on default trace: stop all recording to ring buffer on ftrace_dump trace: print ftrace_dump at KERN_EMERG log level ring_buffer: reset write when reserve buffer fail tracing/function-graph-tracer: fix a regression while suspend to disk ring-buffer: fix alignment problem commit e81cfd214f97a26ca2b00564258ebcf099214cbb Merge: 4b8d8ab... 7fc49f1... Author: Linus Torvalds Date: Sat Jan 31 15:52:46 2009 -0800 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86 setup: fix asm constraints in vesa_store_edid xen: make sysfs files behave as their names suggest x86: tone down mtrr_trim_uncached_memory() warning x86: correct the CPUID pattern for MSR_IA32_MISC_ENABLE availability commit 4b8d8ab566932bfe023637025c76c0e90c655faf Merge: c5e18af... 8dd2c9e... Author: Linus Torvalds Date: Sat Jan 31 15:52:25 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: leds: Fix bounds checking of wm8350->pmic.led regulator: move bq24022 init back to module_init instead of subsys_initcall commit c5e18af910f4bc2e3d0732ea98b99c0fd884e73c Merge: 878b861... 2d2eca4... Author: Linus Torvalds Date: Sat Jan 31 15:52:02 2009 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (27 commits) MIPS: Alchemy: time.c build fix MIPS: RB532: Export rb532_gpio_set_func() MIPS: RB532: Update headers MIPS: RB532: Simplify dev3 init MIPS: RB532: Remove {get,set}_434_reg() MIPS: RB532: Move dev3 init code to devices.c MIPS: RB532: Fix set_latch_u5() MIPS: RB532: Fix init of rb532_dev3_ctl_res MIPS: RB532: Use driver_data instead of platform_data MIPS: RB532: Detect uart type, add platform device MIPS: RB532: remove useless CF GPIO initialisation MIPS: RB532: Auto disable GPIO alternate function MIPS: RB532: Add set_type() function to IRQ struct. MIPS: RC32434: Define io_map_base for PCI controller MIPS: RB532: Fix bit swapping in rb532_set_bit() MIPS: Use hardware watchpoints on all R1 and R2 CPUs. MIPS: Read watch registers with interrupts disabled. MIPS: Fix a typo in watchpoint register structure. MIPS: TXx9: Add support for TX4939 internal RTC MIPS: R2: Fix broken installation of cache error handler. ... commit 878b8619f711280fd05845e21956434b5e588cc4 Author: Mikulas Patocka Date: Fri Jan 30 15:27:14 2009 -0500 Fix memory corruption in console selection Fix an off-by-two memory error in console selection. The loop below goes from sel_start to sel_end (inclusive), so it writes one more character. This one more character was added to the allocated size (+1), but it was not multiplied by an UTF-8 multiplier. This patch fixes a memory corruption when UTF-8 console is used and the user selects a few characters, all of them 3-byte in UTF-8 (for example a frame line). When memory redzones are enabled, a redzone corruption is reported. When they are not enabled, trashing of random memory occurs. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds commit f984d024190d5df98e448e35aa9e89a46fe50bb9 Merge: fc8744a... 5d0932a... Author: Linus Torvalds Date: Sat Jan 31 15:50:43 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: igb: fix link reporting when using sgmii igb: prevent skb_over panic w/ mtu smaller than 1K igb: Fix DCA errors and do not use context index for 82576 ipv6: compile fix for ip6mr.c packet: Avoid lock_sock in mmap handler sfc: Replace stats_enabled flag with a disable count sfc: SFX7101/SFT9001: Fix AN advertisements sfc: SFT9001: Always enable XNP exchange on SFT9001 rev B sfc: Update board info for hardware monitor on SFN4111T-R5 and later sfc: Test for PHYXS faults whenever we cannot test link state bits sfc: Reinitialise the PHY completely in case of a PHY or NIC reset sfc: Fix post-reset MAC selection sfc: SFN4111T: Fix GPIO sharing between I2C and FLASH_CFG_1 sfc: SFT9001: Fix speed reporting in 1G PHY loopback sfc: SFX7101: Remove workaround for bad link training sfc: SFT9001: Enable robust link training sky2: fix hard hang with netconsoling and iface going up commit fc8744adc870a8d4366908221508bb113d8b72ee Author: Linus Torvalds Date: Sat Jan 31 15:08:56 2009 -0800 Stop playing silly games with the VM_ACCOUNT flag The mmap_region() code would temporarily set the VM_ACCOUNT flag for anonymous shared mappings just to inform shmem_zero_setup() that it should enable accounting for the resulting shm object. It would then clear the flag after calling ->mmap (for the /dev/zero case) or doing shmem_zero_setup() (for the MAP_ANON case). This just resulted in vma merge issues, but also made for just unnecessary confusion. Use the already-existing VM_NORESERVE flag for this instead, and let shmem_{zero|file}_setup() just figure it out from that. This also happens to make it obvious that the new DRI2 GEM layer uses a non-reserving backing store for its object allocation - which is quite possibly not intentional. But since I didn't want to change semantics in this patch, I left it alone, and just updated the caller to use the new flag semantics. Signed-off-by: Linus Torvalds commit 92ab78315c638515d0e81b0c70b2082f713582d9 Author: James Bottomley Date: Sat Jan 31 17:24:43 2009 +0100 x86/Voyager: make it build and boot [ mingo@elte.hu: these fixes are a subset of changes cherry-picked from: git://git.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6.git They fix various problems that recent x86 changes caused in the Voyager subarchitecture: both APIC changes and cpumask changes and certain cleanups caused subarch assumptions to break. Most of these changes are obsolete as the subarch code has been removed from the x86 development tree - but we merge them upstream to make Voyager build and boot. ] Signed-off-by: James Bottomley Signed-off-by: Ingo Molnar commit 3077e44c48242bb5867b41586f23aa8f6921073a Author: Mark Eggleston Date: Sat Jan 31 17:57:54 2009 +0100 ALSA: hda - Add support of iMac 24 Aluminium Added the support for 24" Aluminium iMac (106b:3e00) Signed-off-by: Takashi Iwai commit 67d8a3c1221bc883c821e7695ba6d327a5d6f2af Author: Roel Kluin Date: Sat Jan 31 12:17:28 2009 +0100 ALSA: alsa: time reaches -1, tested 0 With a postfix decrement time will reach -1 rather than 0, so the warning will not be issued. Signed-off-by: Roel Kluin Signed-off-by: Takashi Iwai commit 5d0932a5dd00d83df5d1e15eeffb6edf015a8579 Author: Alexander Duyck Date: Sat Jan 31 00:53:18 2009 -0800 igb: fix link reporting when using sgmii When using sgmii the link was not being properly passed up to the driver from the underlying link management functions. This change corrects it so that get_link_status is cleared when a link has been found. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ec54d7d6e40b04c16dfce0e41e506198a20c8645 Author: Alexander Duyck Date: Sat Jan 31 00:52:57 2009 -0800 igb: prevent skb_over panic w/ mtu smaller than 1K A panic has been observed with frame sizes smaller than 1K. This has been root caused to the hardware spanning larger frames across multiple buffers and then reporting the original frame size in the first descriptor. To prevent this we can enable set the LPE bit which in turn will restrict packet sizes to those set in the RLPML register. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit bbd98fe48a43464b4a044bc4cbeefad284d6aa80 Author: Alexander Duyck Date: Sat Jan 31 00:52:30 2009 -0800 igb: Fix DCA errors and do not use context index for 82576 82576 was being incorrectly flagged as needing a context index. It does not as each ring has it's own table of 2 contexts. Driver was registering after registering the driver instead of the other way around. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5d6e430d3bafe743b18dc443189093bf532e91ed Author: Dave Jones Date: Sat Jan 31 00:51:49 2009 -0800 ipv6: compile fix for ip6mr.c net/ipv6/ip6mr.c: In function 'pim6_rcv': net/ipv6/ip6mr.c:368: error: implicit declaration of function 'csum_ipv6_magic' Signed-off-by: Dave Jones Signed-off-by: David S. Miller commit 807a96cd0e5f5311e7f7a1030b43aab624cd7d9f Author: Uwe Kleine-König Date: Sat Jan 31 01:21:59 2009 +0100 NVRAM depends on RTC_DRV_CMOS drivers/char/nvram.c uses rtc_lock, that (on ARM) is only defined if RTC_DRV_CMOS is enabled. Signed-off-by: Uwe Kleine-König commit bcc8f3e01facc51b9d4f6351cd866f19eac0b5ae Author: Uwe Kleine-König Date: Sat Jan 31 01:21:58 2009 +0100 rename platform_driver name "flash" to "sa1100-mtd" "flash" is a very generic name for a platform_driver that is only available on SA11x0. Signed-off-by: Uwe Kleine-König Cc: Nicolas Pitre commit b3c960b277c440c8a7788d338c9f494ad62e46ab Author: Uwe Kleine-König Date: Sat Jan 31 01:21:56 2009 +0100 annotate that [fp, #-4] is the saved lr Signed-off-by: Uwe Kleine-König commit 6fd7ad96d6c51ba15479cb74dcb189b666422394 Author: Uwe Kleine-König Date: Sat Jan 31 01:21:55 2009 +0100 Use __SPIN_LOCK_UNLOCKED to initialize bad_irq_desc.lock SPIN_LOCK_UNLOCKED is deprecated as lockdep cannot properly work with locks initialized with it. This fix is necessary to compile the linux-rt tree for ARM. Signed-off-by: Uwe Kleine-König Cc: Steven Rostedt commit 7fc49f19813030f2e15ad2ccec5cb701f7f4a3ec Author: Andreas Schwab Date: Tue Jan 27 21:45:57 2009 +0100 x86 setup: fix asm constraints in vesa_store_edid Impact: fix potential miscompile (currently believed non-manifest) As the comment explains, the VBE DDC call can clobber any register. Tell the compiler about that fact. Signed-off-by: Andreas Schwab Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 905db44087855e3c1709f538ecdc22fd149cadd8 Author: Herbert Xu Date: Fri Jan 30 14:12:06 2009 -0800 packet: Avoid lock_sock in mmap handler As the mmap handler gets called under mmap_sem, and we may grab mmap_sem elsewhere under the socket lock to access user data, we should avoid grabbing the socket lock in the mmap handler. Since the only thing we care about in the mmap handler is for pg_vec* to be invariant, i.e., to exclude packet_set_ring, we can achieve this by simply using a new mutex. Signed-off-by: Herbert Xu Tested-by: Martin MOKREJŠ Signed-off-by: David S. Miller commit 1974cc205e63cec4a17a6b3fca31fa4240ded77e Author: Ben Hutchings Date: Thu Jan 29 18:00:07 2009 +0000 sfc: Replace stats_enabled flag with a disable count Currently we use a spin-lock to serialise statistics fetches and also to inhibit them for short periods of time, plus a flag to enable/disable statistics fetches for longer periods of time, during online reset. This was apparently insufficient to deal with the several reasons for stats being disabled. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit af4ad9bca0c4039355b20d760b4fd39afa48c59d Author: Ben Hutchings Date: Thu Jan 29 17:59:37 2009 +0000 sfc: SFX7101/SFT9001: Fix AN advertisements All 10Xpress PHYs require autonegotiation all the time; enforce this in the set_settings() method and do not treat it as a workaround. Remove claimed support for 100M HD mode since it is not supported by current firmware. Do not set speed override bits when AN is enabled, and do not use register 1.49192 for AN configuration as it can override what we set elsewhere. Always set the AN selector bits to 1 (802.3). Fix confusion between Next Page and Extended Next Page. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit c9d5a53f060bb9ac6cd20d9768b4b75e22bc8689 Author: Ben Hutchings Date: Thu Jan 29 17:52:11 2009 +0000 sfc: SFT9001: Always enable XNP exchange on SFT9001 rev B This workaround is not specific to rev A. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 44176b45d1aae04d99c505e6ee98d2d3c3fce173 Author: Ben Hutchings Date: Thu Jan 29 17:51:48 2009 +0000 sfc: Update board info for hardware monitor on SFN4111T-R5 and later Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 67797763c60bfe3bbf99ef81ce1042e71678d109 Author: Steve Hodgson Date: Thu Jan 29 17:51:15 2009 +0000 sfc: Test for PHYXS faults whenever we cannot test link state bits Depending on the loopback mode, there may be no pertinent link state bits. In this case we test the PHYXS RX fault bit instead. Make sure to do this in all cases where there are no link state bits. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4b988280be13a1b4c17f51cc66948aef467e7601 Author: Steve Hodgson Date: Thu Jan 29 17:50:51 2009 +0000 sfc: Reinitialise the PHY completely in case of a PHY or NIC reset In particular, set pause advertising bits properly. A PHY reset is not necessary to recover from the register self-test, so use a "invisible" reset there instead. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 0cc128387969753ae037401eb49e4bbb474186ea Author: Steve Hodgson Date: Thu Jan 29 17:49:59 2009 +0000 sfc: Fix post-reset MAC selection Modify falcon_switch_mac() to always set NIC_STAT_REG, even if the the MAC is the same as it was before. This ensures that the value is correct after an online reset. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 2f08575389ac37ece5922094777442d8fdd8c00a Author: Ben Hutchings Date: Thu Jan 29 17:49:29 2009 +0000 sfc: SFN4111T: Fix GPIO sharing between I2C and FLASH_CFG_1 Change sfn4111t_reset() to change only GPIO output enables so that it doesn't break subsequent I2C operations. Update comments to explain exactly what we're doing. Add a short sleep to make sure the FLASH_CFG_1 value is latched before any subsequent I2C operations. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 8b9dc8dd447cfe27c0214761ced22a8e4aa58f5e Author: Steve Hodgson Date: Thu Jan 29 17:49:09 2009 +0000 sfc: SFT9001: Fix speed reporting in 1G PHY loopback Instead of disabling AN in loopback, just prevent restarting AN and override the speed in sft9001_get_settings(). Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 2d18835d65b7433e7e6583f65395f8c01e7874af Author: Steve Hodgson Date: Thu Jan 29 17:48:43 2009 +0000 sfc: SFX7101: Remove workaround for bad link training Early versions of the SFX7101 firmware could complete link training in a state where it would not adequately cancel noise (Solarflare bug 10750). We previously worked around this by resetting the PHY after seeing many Ethernet CRC errors. This workaround is unsafe since it takes no account of the interval between errors; it also appears to be unnecessary with production firmware. Therefore remove it. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 869b5b3888fbd2024af632e3648c00860ba3cca6 Author: Steve Hodgson Date: Thu Jan 29 17:48:10 2009 +0000 sfc: SFT9001: Enable robust link training Enable a firmware option that appears to be necessary for reliable operation. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit a11da890e4c9850411303efcf6514f048ca880ee Author: Alexey Dobriyan Date: Fri Jan 30 13:45:31 2009 -0800 sky2: fix hard hang with netconsoling and iface going up Printing anything over netconsole before hw is up and running is, of course, not going to work. Signed-off-by: Alexey Dobriyan Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8dd2c9e3128a5784a01084b52d5bb7efd4371ac6 Author: Roel Kluin Date: Sat Jan 17 16:06:40 2009 +0100 leds: Fix bounds checking of wm8350->pmic.led Fix bounds checking of wm8350->pmic.led Signed-off-by: Roel Kluin Signed-off-by: Liam Girdwood commit 9bf503e6bec3f2d28298808454eebde031ab5b5b Author: Philipp Zabel Date: Sun Jan 18 14:32:27 2009 +0100 regulator: move bq24022 init back to module_init instead of subsys_initcall This workaround was needed when regulator/ was not linked before both power/ and usb/otg/ in drivers/Makefile. Now that it is even linked before mfd/, this patch makes sure that bq24022 isn't probed before the GPIO expander is set up. Signed-off-by: Philipp Zabel Signed-off-by: Liam Girdwood commit b0a9b5111abf60ef07eade834f480e89004c7920 Author: Thomas Gleixner Date: Sun Jan 25 11:31:36 2009 +0100 hrtimer: prevent negative expiry value after clock_was_set() Impact: prevent false positive WARN_ON() in clockevents_program_event() clock_was_set() changes the base->offset of CLOCK_REALTIME and enforces the reprogramming of the clockevent device to expire timers which are based on CLOCK_REALTIME. If the clock change is large enough then the subtraction of the timer expiry value and base->offset can become negative which triggers the warning in clockevents_program_event(). Check the subtraction result and set a negative value to 0. Signed-off-by: Thomas Gleixner commit 94df7de0289bc2df3d6e85cd2ece52bf42682f45 Author: Sebastien Dugue Date: Mon Dec 1 14:09:07 2008 +0100 hrtimers: allow the hot-unplugging of all cpus Impact: fix CPU hotplug hang on Power6 testbox On architectures that support offlining all cpus (at least powerpc/pseries), hot-unpluging the tick_do_timer_cpu can result in a system hang. This comes from the fact that if the cpu going down happens to be the cpu doing the tick, then as the tick_do_timer_cpu handover happens after the cpu is dead (via the CPU_DEAD notification), we're left without ticks, jiffies are frozen and any task relying on timers (msleep, ...) is stuck. That's particularly the case for the cpu looping in __cpu_die() waiting for the dying cpu to be dead. This patch addresses this by having the tick_do_timer_cpu handover happen earlier during the CPU_DYING notification. For this, a new clockevent notification type is introduced (CLOCK_EVT_NOTIFY_CPU_DYING) which is triggered in hrtimer_cpu_notify(). Signed-off-by: Sebastien Dugue Cc: Signed-off-by: Ingo Molnar commit 7f22391cbe82a80a9f891d8bd10fc28ff248d1e2 Author: Frederic Weisbecker Date: Mon Dec 22 02:24:48 2008 +0100 hrtimers: increase clock min delta threshold while interrupt hanging Impact: avoid timer IRQ hanging slow systems While using the function graph tracer on a virtualized system, the hrtimer_interrupt can hang the system on an infinite loop. This can be caused in several situations: - the hardware is very slow and HZ is set too high - something intrusive is slowing the system down (tracing under emulation) ... and the next clock events to program are always before the current time. This patch implements a reasonable compromise: if such a situation is detected, we share the CPUs time in 1/4 to process the hrtimer interrupts. This is enough to let the system running without serious starvation. It has been successfully tested under VirtualBox with 1000 HZ and 100 HZ with function graph tracer launched. On both cases, the clock events were increased until about 25 ms periodic ticks, which means 40 HZ. So we change a hard to debug hang into a warning message and a system that still manages to limp along. Signed-off-by: Frederic Weisbecker Signed-off-by: Ingo Molnar commit 2d2eca4d11933bd37a4944aae06e6122efffaea8 Author: Manuel Lauss Date: Tue Jan 6 10:34:52 2009 +0100 MIPS: Alchemy: time.c build fix In Linus' current -git the cpumask member is now a pointer. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 0fc6bc0d6e953f6dd80c286c889d8d581e8f8d7a Author: Phil Sutter Date: Thu Jan 22 19:32:43 2009 +0100 MIPS: RB532: Export rb532_gpio_set_func() This kernel symbol provides a way for drivers to switch on alternate function for a certain GPIO pin. Turning it off is done implicitly when changing the GPIO direction, as that would be fixed when using the given pin als alternate function. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 3828ee047d3c8e0d0e8e9f4d738bd8593220299a Author: Phil Sutter Date: Thu Jan 22 19:28:50 2009 +0100 MIPS: RB532: Update headers Remove the {set,get}_434_reg() prototypes, as the functions have been removed. Also move the prototypes for {get,set}_latch_u5() to the correct place. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 1c4db8e82808a804751be906e8c14bbe0a264a9c Author: Phil Sutter Date: Mon Jan 19 23:42:54 2009 +0100 MIPS: RB532: Simplify dev3 init As rb532_dev3_ctl_res is not used by any platform device, it can be dropped when not used for holding the physical address of the device 3 controller. Also a size of one byte should suffice when ioremapping the physical address mentioned above, as only a single byte is being read from and written to it. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 4ca3803f81bca9081f17ef67ffca8b11790f608d Author: Phil Sutter Date: Mon Jan 19 23:42:53 2009 +0100 MIPS: RB532: Remove {get,set}_434_reg() These kernel symbols are unused. Also, since dev3 init has been moved to devices.c, set_434_reg() breaks compiling as it uses dev3. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 36f2db4b9c01689b1311d57a6297022d82000185 Author: Phil Sutter Date: Mon Jan 19 23:42:52 2009 +0100 MIPS: RB532: Move dev3 init code to devices.c This code doesn't belong to gpio.c, as it's completely unrelated to GPIO. As dev1 and dev2 init code is in devices.c, it seems to be a more adequate place. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 7060886fb745b705bcf189131eb49c50485ba233 Author: Phil Sutter Date: Mon Jan 19 23:42:51 2009 +0100 MIPS: RB532: Fix set_latch_u5() The data to be written is just a byte, so use writeb instead of writel. Also, dev3.base contains the address, not the data so referencing here is wrong. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit deb1003329b65456c4e6702cd3bcc698d565a11e Author: Phil Sutter Date: Mon Jan 19 23:42:50 2009 +0100 MIPS: RB532: Fix init of rb532_dev3_ctl_res This register just contains the address of the actual resource, so initialisation has to be the same as cf_slot0_res and nand_slot0_res. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 94d2cc1b8b2bd2141e141a4f43bce9ab135bd9fd Author: Phil Sutter Date: Thu Jan 15 15:41:44 2009 +0100 MIPS: RB532: Use driver_data instead of platform_data As the korina ethernet driver uses platform_get_drvdata() to extract the driver specific data from the platform device, driver_data has to be used here. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 1452fc7d178c37c6463c95c5cc6858c7b7f478c8 Author: Phil Sutter Date: Thu Jan 15 15:38:38 2009 +0100 MIPS: RB532: Detect uart type, add platform device Auto-detection works just fine, so use it instead of specifying the type manually. Also define a platform device for the uart, as suggested by David Daney. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 84c2c562c101bd84ea0f796b9838296da1bf859e Author: Phil Sutter Date: Fri Nov 28 20:46:22 2008 +0100 MIPS: RB532: remove useless CF GPIO initialisation As the pata-rb532-cf driver calls gpio_direction_input(), the calls to rb532_gpio_set_func() and rb532_gpio_direction_input() are not needed since the alternate function is automatically being disabled when changing the GPIO pin direction. The later two calls to rb532_gpio_set_{ilevel,istat}() are implicitly being done by the IRQ initialisation of pata-rb532-cf. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 33763d571da995913299cd0509425decfa9e4be0 Author: Phil Sutter Date: Fri Nov 28 20:46:09 2008 +0100 MIPS: RB532: Auto disable GPIO alternate function When a driver calls gpio_set_direction_{input,output}(), it obviously doesn't want the alternate function for that pin to be active (as the direction would not matter in that case). This patch ensures alternate function is disabled when the direction is being changed. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit 4aa0f4d7264bc4f54603de5db1ffcaf8912ddd23 Author: Phil Sutter Date: Fri Nov 28 20:45:10 2008 +0100 MIPS: RB532: Add set_type() function to IRQ struct. Interrupt Group 4 mapps the GPIO pins enabled as interrupt sources; add defines to make this clear when addressing them later in code. The mapped GPIOs support triggering on either level high or low. To achieve this, the set_type() function calls rb532_gpio_set_ilevel() for interrupts of the above mentioned group. As there is no way to alter the triggering characteristics of the other interrupts, accept level triggering on status high only. (This is just a guess; but as the system boots fine and interrupt-driven devices (e.g. serial console) work with no implications, it seems to be right.) To clear a GPIO mapped IRQ, the source has to be cleared (i.e., the interrupt status bit of the corresponding GPIO pin). This is done inside rb532_disable_irq(). After applying these changes I could undo most of my former "fixes" to pata-rb532-cf. Particularly all interrupt handling can be done generically via set_irq_type() as it was before. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit fb91e2cb7d3d44356bb92411d6d6b7cb51ce156c Author: Phil Sutter Date: Wed Nov 12 00:16:04 2008 +0100 MIPS: RC32434: Define io_map_base for PCI controller The code is rather based on trial-and-error than knowledge. Verified Via Rhine functionality in PIO as well as MMIO mode. [Looks sane -- Ralf] Signed-off-by: Phil Sutter Tested-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 5379a5fdf3cb2b23d00da2a1298167f9a1fb002a Author: Phil Sutter Date: Wed Nov 12 00:09:30 2008 +0100 MIPS: RB532: Fix bit swapping in rb532_set_bit() The algorithm works unconditionally. If bitval is one, the first line is a no op and the second line sets the bit at offset position. Vice versa, if bitval is zero, the first line clears the bit at offset position and the second line is a no op. Signed-off-by: Phil Sutter Signed-off-by: Ralf Baechle commit f839490ab42a471f0b0a4b795df77a1af924fe05 Author: David Daney Date: Mon Jan 5 15:29:14 2009 -0800 MIPS: Use hardware watchpoints on all R1 and R2 CPUs. The previous definition inadvertently omits Octeon which currently is treated as an architecture variant separate from MIPS32 and MIPS64. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 8bc6d05b481aa7dc79c81b8ffac0da755e149643 Author: David Daney Date: Mon Jan 5 15:29:58 2009 -0800 MIPS: Read watch registers with interrupts disabled. If a context switch occurred between the watch exception and reading the watch registers, it would be possible for the new process to corrupt their state. Enabling interrupts only after the watch registers are read avoids this race. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 7adbedaf4469dcdcd6a1ab9bdeb8ad854d4f9827 Author: David Daney Date: Wed Dec 24 15:44:26 2008 -0800 MIPS: Fix a typo in watchpoint register structure. This fixes the ptrace ABI for watch registers, and should allow 64bit kernels to use the watch register support. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit 65655b5a94f6fc7e6450e3e07f2687c523c71c08 Author: Atsushi Nemoto Date: Tue Jan 20 23:07:41 2009 +0900 MIPS: TXx9: Add support for TX4939 internal RTC Add platform support to use rtc-tx4939 driver. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 42fe7ee31ff904b2419f02864938966c8f0b6edc Author: Ralf Baechle Date: Wed Jan 28 18:48:23 2009 +0000 MIPS: R2: Fix broken installation of cache error handler. Signed-off-by: Ralf Baechle commit 634286f127bef8799cd04799d3e1d5471e8fd91c Author: Ralf Baechle Date: Wed Jan 28 17:48:40 2009 +0000 MIPS: IP27: Switch from DMA_IP27 to DMA_COHERENT The special IP27 DMA code selected by DMA_IP27 has been removed a while ago turning DMA_IP27 into almost a nop. Also fixup the broken logic of its last users memcpy.S and memcpy-inatomic.s. Signed-off-by: Ralf Baechle commit 732f0462d59721764843783d790a613613287b33 Author: Ralf Baechle Date: Wed Jan 28 14:13:37 2009 +0000 MIPS: Add return value checks to user_termio_to_kernel_termios() And while at it, convert all functions from macros to inline functions for sanity. Signed-off-by: Ralf Baechle commit 2d8965156b79dbfed722804c6036537c81699639 Author: Huang Weiyi Date: Thu Jan 15 06:56:46 2009 +0800 MIPS: Octeon: Remove duplicated #includes Signed-off-by: Huang Weiyi Signed-off-by: Ralf Baechle commit 915ec1e216a5b009ba621b1c5b5be49c85685e53 Author: Ralf Baechle Date: Mon Jan 12 00:52:18 2009 +0000 MIPS: atomic_*(): Change type of intermediate variables. This shaves of 1912 bytes of an IP27 defconfig kernel and avoids unexpected overflow behaviour in atomic_sub_if_positive. Apply the same changes to the atomic64_* functions for consistency. Signed-off-by: Ralf Baechle commit c7c1e3846bac1e4b8a8941f6a194812e28b0a519 Author: Ralf Baechle Date: Mon Jan 12 00:09:13 2009 +0000 MIPS: Port "mm: invoke oom-killer from page fault" from UML / x86 Original commit 1c0fe6e3bda0464728c23c8d84aa47567e8b716c. Signed-off-by: Ralf Baechle commit a8ca8b64e3fdfec17679cba0ca5ce6e3ffed092d Author: Ralf Baechle Date: Sun Jan 11 18:44:49 2009 +0000 MIPS: Avoid destructive invalidation on partial cachelines. See discussion e9c3a7c20901051031y528d0d31r18d44c5096c59e0@mail.gmail.com. Signed-off-by: Ralf Baechle commit 012703e0fc9fb1d6cdf778c49f45b796a85ef5bc Author: Ralf Baechle Date: Sun Jan 11 18:27:10 2009 +0000 MIPS: SMTC: Fix build after recent creditial changes. Signed-off-by: Ralf Baechle commit 33bfad54b58cf05cfe6678c3ec9235d4bc8db4c2 Author: Linus Torvalds Date: Fri Jan 30 11:37:22 2009 -0800 Allow opportunistic merging of VM_CAN_NONLINEAR areas Commit de33c8db5910cda599899dd431cc30d7c1018cbf ("Fix OOPS in mmap_region() when merging adjacent VM_LOCKED file segments") unified the vma merging of anonymous and file maps to just one place, which simplified the code and fixed a use-after-free bug that could cause an oops. But by doing the merge opportunistically before even having called ->mmap() on the file method, it now compares two different 'vm_flags' values: the pre-mmap() value of the new not-yet-formed vma, and previous mappings of the same file around it. And in doing so, it refused to merge the common file case, which adds a marker to say "I can be made non-linear". This fixes it by just adding a set of flags that don't have to match, because we know they are ok to merge. Currently it's only that single VM_CAN_NONLINEAR flag, but at least conceptually there could be others in the future. Reported-and-acked-by: Hugh Dickins Cc: Lee Schermerhorn Cc: Nick Piggin Cc: Andrew Morton Cc: Greg KH Signed-off-by: Linus Torvalds commit 7cff3608d2553a045b676fa81b0cf54e4f2cc5ce Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:57:38 2009 +0530 headers_check fix: x86, swab.h fix the following 'make headers_check' warnings: usr/include/asm/swab.h:4: include of is preferred over usr/include/asm/swab.h:7: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 2de548faa78c650bb20c4680ee3a225cca33a45d Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:55:20 2009 +0530 headers_check fix: x86, sigcontext32.h fix the following 'make headers_check' warning: usr/include/asm/sigcontext32.h:20: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit e59afe6a21dce7bb3c63ba4f894a3195ae3d5529 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:53:49 2009 +0530 headers_check fix: x86, sigcontext.h fix the following 'make headers_check' warnings: usr/include/asm/sigcontext.h:5: include of is preferred over usr/include/asm/sigcontext.h:24: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 420ab35eef206d147973d26db14b5618868726be Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:52:16 2009 +0530 headers_check fix: x86, ptrace-abi.h fix the following 'make headers_check' warnings: usr/include/asm/ptrace-abi.h:86: include of is preferred over usr/include/asm/ptrace-abi.h:93: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit d122072cc079d299e5191c9cbb6162ba8791624c Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:48:17 2009 +0530 headers_check fix: x86, mtrr.h fix the following 'make headers_check' warning: usr/include/asm/mtrr.h:61: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 999b697b9d8b15756e65da72c816ef4363a945a5 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:47:27 2009 +0530 headers_check fix: x86, mce.h fix the following 'make headers_check' warnings: usr/include/asm/mce.h:7: include of is preferred over usr/include/asm/mce.h:29: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit cef3767852a9b1a7ff4a8dfe0969e2d32eb728df Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:46:08 2009 +0530 headers_check fix: x86, kvm.h fix the following 'make headers_check' warnings: usr/include/asm/kvm.h:9: include of is preferred over usr/include/asm/kvm.h:16: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 999721ca6d0c2540341acb73ac9048cbd6b05d3a Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:44:58 2009 +0530 headers_check fix: x86, e820.h fix the following 'make headers_check' warning: usr/include/asm/e820.h:44: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 541c94f1d5ac2665fd15f1b827416f8c0b2f55cb Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:40:32 2009 +0530 headers_check fix: linux/rtnetlink.h fix the following 'make headers_check' warning: usr/include/linux/rtnetlink.h:328: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit d5c72d7842c71403bc3d57ca05a8a1f96d81e262 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:39:17 2009 +0530 headers_check fix: linux/nubus.h fix the following 'make headers_check' warning: usr/include/linux/nubus.h:232: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit de4d3795527b06c67e1333c5662f146b59c97e21 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:35:17 2009 +0530 headers_check fix: video/uvesafb.h fix the following 'make headers_check' warning: usr/include/video/uvesafb.h:5: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit dab9c5e15e9faaf00e22b5e708dd19c44800c824 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:34:29 2009 +0530 headers_check fix: video/sisfb.h fix the following 'make headers_check' warnings: usr/include/video/sisfb.h:25: include of is preferred over usr/include/video/sisfb.h:78: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit bb9f113f5ca7d182256dee69bcaebd4c79062305 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:33:29 2009 +0530 headers_check fix: sound/hdsp.h fix the following 'make headers_check' warning: usr/include/sound/hdsp.h:33: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 70c2ed65fe4090c9b92512ee1e35dc6625539f90 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:32:35 2009 +0530 headers_check fix: mtd/inftl-user.h fix the following 'make headers_check' warning: usr/include/mtd/inftl-user.h:61: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 9a0e0ac21ca2af4715808b97bd600f0aecd87240 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:31:05 2009 +0530 headers_check fix: linux/virtio_net.h fix the following 'make headers_check' warning: usr/include/linux/virtio_net.h:28: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 8697325408d9be18fa24346c346b23fa56c3b190 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:29:33 2009 +0530 headers_check fix: linux/virtio_console.h fix the following 'make headers_check' warning: usr/include/linux/virtio_console.h:15: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 982f8184f9a9251ba4e5c6d79ec32d25c0ad3cc8 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:27:58 2009 +0530 headers_check fix: linux/virtio_blk.h fix the following 'make headers_check' warning: usr/include/linux/virtio_blk.h:21: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 98be96b85398499212bc77ae3076a69e20368428 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:26:01 2009 +0530 headers_check fix: linux/videodev.h fix the following 'make headers_check' warning: usr/include/linux/videodev.h:53: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit a4c1d7c8c61969667a853d08b039507669463807 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:24:09 2009 +0530 headers_check fix: linux/video_encoder.h fix the following 'make headers_check' warning: usr/include/linux/video_encoder.h:5: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 8b1e3a2f7f84484a8c208671adac39eb148c7d61 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:22:51 2009 +0530 headers_check fix: linux/video_decoder.h fix the following 'make headers_check' warning: usr/include/linux/video_decoder.h:7: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 448314fc968252b0b95f74bbe63fdcaf41e6413d Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:21:19 2009 +0530 headers_check fix: linux/taskstats.h fix the following 'make headers_check' warning: usr/include/linux/taskstats.h:44: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 6b6bcd0ed953ae0ed73af4759788fb8384bbaeed Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:20:04 2009 +0530 headers_check fix: linux/synclink.h fix the following 'make headers_check' warning: usr/include/linux/synclink.h:209: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit e6faa002be269233bf1e8961e7e0a79ca3f2db8b Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:17:53 2009 +0530 headers_check fix: linux/sound.h fix the following 'make headers_check' warnings: usr/include/linux/sound.h:33: extern's make no sense in userspace usr/include/linux/sound.h:34: extern's make no sense in userspace usr/include/linux/sound.h:35: extern's make no sense in userspace usr/include/linux/sound.h:36: extern's make no sense in userspace usr/include/linux/sound.h:37: extern's make no sense in userspace usr/include/linux/sound.h:39: extern's make no sense in userspace usr/include/linux/sound.h:40: extern's make no sense in userspace usr/include/linux/sound.h:41: extern's make no sense in userspace usr/include/linux/sound.h:42: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit a788fd53aec9a439f6b8bf57888c30aea1176e1b Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:14:02 2009 +0530 headers_check fix: linux/signalfd.h fix the following 'make headers_check' warning: usr/include/linux/signalfd.h:19: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 68622c61dc7971382f5d69cd5d881e618ea30414 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:11:32 2009 +0530 headers_check fix: linux/random.h fix the following 'make headers_check' warning: usr/include/linux/random.h:39: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 7260a91666a3149181e7b78bbf73beebbb04f8fa Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:09:17 2009 +0530 headers_check fix: linux/ppp_defs.h fix the following 'make headers_check' warning: usr/include/linux/ppp_defs.h:50: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit b8adfd3c753b47c47f626e032da7999530c316f0 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:07:05 2009 +0530 headers_check fix: linux/pkt_sched.h fix the following 'make headers_check' warning: usr/include/linux/pkt_sched.h:32: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit ed307444d8f276d7052400c47d9f4c5393997c42 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:05:32 2009 +0530 headers_check fix: linux/pkt_cls.h fix the following 'make headers_check' warning: linux/pkt_cls.h:122: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 06f43adba62f99de101616ffc5d0564aab237111 Author: Jaswinder Singh Rajput Date: Fri Jan 30 22:03:25 2009 +0530 headers_check fix: linux/phonet.h fix the following 'make headers_check' warning: usr/include/linux/phonet.h:50: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit a81184c1f8cf8589a00894c20422982defc3f056 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:59:48 2009 +0530 headers_check fix: linux/nfs_idmap.h fix the following 'make headers_check' warning: usr/include/linux/nfs_idmap.h:55: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit ee79a6415f911801eb7804704ac130088281b2d8 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:58:19 2009 +0530 headers_check fix: linux/neighbour.h fix the following 'make headers_check' warning: usr/include/linux/neighbour.h:8: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 8ef342021a55e4237e593c7f6304d0caa7bf1232 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:56:32 2009 +0530 headers_check fix: linux/msdos_fs.h fix the following 'make headers_check' warning: usr/include/linux/msdos_fs.h:100: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 4b7ae34277608a30346d076beb44cbc466aa73e5 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:54:23 2009 +0530 headers_check fix: linux/minix_fs.h fix the following 'make headers_check' warning: usr/include/linux/minix_fs.h:34: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit df9c04ed3ff455aa5cb7c4bcddf4544fe54cfa33 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:50:39 2009 +0530 headers_check fix: linux/irda.h fix the following 'make headers_check' warning: usr/include/linux/irda.h:127: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit d6d20f54847e27ed886e8285c208368ef3d42abb Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:49:07 2009 +0530 headers_check fix: linux/ipx.h fix the following 'make headers_check' warning: usr/include/linux/ipx.h:13: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit e5144de521417b0f0eea74ece89acd437ecd32c9 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:47:52 2009 +0530 headers_check fix: linux/ipv6_route.h fix the following 'make headers_check' warning: usr/include/linux/ipv6_route.h:42: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 5c6aa2badf1b97ead5ffec8094f0c6236e0c07c5 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:46:43 2009 +0530 headers_check fix: linux/ipv6.h fix the following 'make headers_check' warning: usr/include/linux/ipv6.h:26: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 217a2291570b1e4c28cb6e4cd099707e456a09b8 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:44:19 2009 +0530 headers_check fix: linux/ip6_tunnel.h fix the following 'make headers_check' warning: include/linux/ip6_tunnel.h:21: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 2df005b75ab910f789f099f81bb70b3aa37203a7 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:42:47 2009 +0530 headers_check fix: linux/inet_diag.h fix the following 'make headers_check' warning: usr/include/linux/inet_diag.h:16: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit de8b0bcafabfb4400aa028282293ce7d52307433 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:36:04 2009 +0530 headers_check fix: linux/igmp.h fix the following 'make headers_check' warning: usr/include/linux/igmp.h:31: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 65863dbc0833e06b905679f61450f05a68bae4c2 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:34:36 2009 +0530 headers_check fix: linux/if_tr.h fix the following 'make headers_check' warning: usr/include/linux/if_tr.h:37: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 84ad40ebbaeb22fc665b1f307d32128c46e8d42d Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:32:52 2009 +0530 headers_check fix: linux/if_strip.h fix the following 'make headers_check' warning: usr/include/linux/if_strip.h:22: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 0fe5a8fe0c145a6ff8f3daacd32f1824d0c021a9 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:31:29 2009 +0530 headers_check fix: linux/if_ppp.h fix the following 'make headers_check' warning: usr/include/linux/if_ppp.h:96: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 85db53102dbf0816e9c5426c9322a64759e7166b Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:29:20 2009 +0530 headers_check fix: linux/if_link.h fix the following 'make headers_check' warning: usr/include/linux/if_link.h:9: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit b06e936939931c5acb1ca5dfe1d02b4d2f7cb11f Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:27:59 2009 +0530 headers_check fix: linux/if_hippi.h fix the following 'make headers_check' warning: usr/include/linux/if_hippi.h:82: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit ba7161387e82fbbdc4b49533aa1345bb7befda13 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:26:35 2009 +0530 headers_check fix: linux/if_fc.h fix the following 'make headers_check' warning: usr/include/linux/if_fc.h:37: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 1759cb994c3ff51e69268379da1cdd96048a8268 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:25:00 2009 +0530 headers_check fix: linux/if_addrlabel.h fix the following 'make headers_check' warning: usr/include/linux/if_addrlabel.h:15: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 680ee0bd2a9625965812c1209476168fd0704a00 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:21:01 2009 +0530 headers_check fix: linux/if_addr.h fix the following 'make headers_check' warning: usr/include/linux/if_addr.h:8: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 1cc49ae2e6d241e5cfc2c52e3329f5ef8dd42f18 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:18:37 2009 +0530 headers_check fix: linux/icmpv6.h fix the following 'make headers_check' warning: usr/include/linux/icmpv6.h:8: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit c244ae5b16dc31b5bea67e6d6e9d6ff654aee781 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:17:06 2009 +0530 headers_check fix: linux/hiddev.h fix the following 'make headers_check' warning: usr/include/linux/hiddev.h:40: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit b08ead0527bcfdcab39a347b531701289485b484 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:15:34 2009 +0530 headers_check fix: linux/hid.h fix the following 'make headers_check' warnings: usr/include/linux/hid.h:69: extern's make no sense in userspace usr/include/linux/hid.h:76: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit 237416fe05067237f0bcc6370d84c09b52fb776a Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:12:38 2009 +0530 headers_check fix: linux/gfs2_ondisk.h fix the following 'make headers_check' warning: usr/include/linux/gfs2_ondisk.h:109: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 985f302cb42e18912c88a3d2f9d9008844045ee3 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:10:52 2009 +0530 headers_check fix: linux/genetlink.h fix the following 'make headers_check' warning: usr/include/linux/genetlink.h:12: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 93c1c0e310b56acbd366a43b15260a1775481f24 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:09:18 2009 +0530 headers_check fix: linux/errqueue.h fix the following 'make headers_check' warning: usr/include/linux/errqueue.h:6: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit f4aa1c30255278b7b50a1cd273c7b4a46f099a90 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:05:50 2009 +0530 headers_check fix: linux/elf.h fix the following 'make headers_check' warnings: usr/include/linux/elf.h:379: extern's make no sense in userspace usr/include/linux/elf.h:387: extern's make no sense in userspace usr/include/linux/elf.h:401: extern's make no sense in userspace usr/include/linux/elf.h:402: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit 177a858ff8d71a8e7f8b0ef53ff49441e29c8fb1 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:04:44 2009 +0530 headers_check fix: linux/elf-fdpic.h fix the following 'make headers_check' warning: usr/include/linux/elf-fdpic.h:62: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit bd71b5f734c66ad0134e308036b13d122907b8c6 Author: Jaswinder Singh Rajput Date: Fri Jan 30 21:01:11 2009 +0530 headers_check fix: linux/efs_fs_sb.h fix the following 'make headers_check' warning: usr/include/linux/efs_fs_sb.h:49: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 4144147081b9d08e69055a780888fcbb7cfcbb8e Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:54:27 2009 +0530 headers_check fix: linux/edd.h fix the following 'make headers_check' warning: usr/include/linux/edd.h:70: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 57d1780fab89d3736de0d24189129c17178448f0 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:52:54 2009 +0530 headers_check fix: linux/dn.h fix the following 'make headers_check' warning: usr/include/linux/dn.h:75: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 37eb1f4c3320ed505fbe59a916635b2342c740e4 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:51:30 2009 +0530 headers_check fix: linux/dlm_plock.h fix the following 'make headers_check' warning: usr/include/linux/dlm_plock.h:25: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 59e4cf19ede2d2725c1b336707c1077afdd3cf85 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:43:31 2009 +0530 headers_check fix: linux/cgroupstats.h fix the following 'make headers_check' warning: usr/include/linux/cgroupstats.h:31: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 960066a919f1db57817df6d02e72b01542f1deed Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:41:51 2009 +0530 headers_check fix: linux/cdrom.h fix the following 'make headers_check' warning: usr/include/linux/cdrom.h:155: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 9fa91d99bfdd9582e43b6b9ab97678c51373c4ae Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:39:30 2009 +0530 headers_check fix: linux/capability.h fix the following 'make headers_check' warning: usr/include/linux/capability.h:73: extern's make no sense in userspace Signed-off-by: Jaswinder Singh Rajput commit 4502b80e44f1fc9af33f66053c6c99ae9dba32a6 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:36:52 2009 +0530 headers_check fix: linux/blktrace_api.h fix the following 'make headers_check' warning: usr/include/linux/blktrace_api.h:96: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 1da9ebd5abb2e960c4ca4d49f7587e6c76b16ac0 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:34:15 2009 +0530 headers_check fix: linux/bfs_fs.h fix the following 'make headers_check' warning: usr/include/linux/bfs_fs.h:24: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 5d461bfebe4be9ae8d25d4570d4eaa415ca76f0f Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:31:19 2009 +0530 headers_check fix: linux/auto_fs4.h fix the following 'make headers_check' warning: usr/include/linux/auto_fs4.h:132: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit f757f603f7d52254120cbfcd967f67f663264c64 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:29:11 2009 +0530 headers_check fix: linux/atmbr2684.h fix the following 'make headers_check' warning: usr/include/linux/atmbr2684.h:88: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 85c09569e563cbb9376f10da20ada42107dfef98 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:26:25 2009 +0530 headers_check fix: linux/atalk.h fix the following 'make headers_check' warning: usr/include/linux/atalk.h:15: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit bd247b348aaa9f28a53a64df06c69d6f40ff2280 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:20:10 2009 +0530 headers_check fix: linux/aio_abi.h fix the following 'make headers_check' warning: usr/include/linux/aio_abi.h:58: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 4c866d444078d931579c50c9ce3133709390287b Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:16:33 2009 +0530 headers_check fix: usb/gadgetfs.h fix the following 'make headers_check' warning: usr/include/linux/usb/gadgetfs.h:21: include of is preferred over Signed-off-by: Jaswinder Singh Rajput commit d8151585690d824ac5b60a94ef86f8bfd61478fa Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:15:47 2009 +0530 headers_check fix: usb/cdc.h fix the following 'make headers_check' warning: usr/include/linux/usb/cdc.h:50: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 30f410a6d372f067df3d02e3db328720bf421c81 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:14:36 2009 +0530 headers_check fix: tc_ematch/tc_em_text.h fix the following 'make headers_check' warning: usr/include/linux/tc_ematch/tc_em_text.h:11: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit ac836c6f1b17f674e35a7e2784541bb8ab0bce38 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:13:41 2009 +0530 headers_check fix: tc_ematch/tc_em_nbyte.h fix the following 'make headers_check' warning: usr/include/linux/tc_ematch/tc_em_nbyte.h:8: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 9976007a13e67b973f94c8d472ed615ac4cf8078 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:12:59 2009 +0530 headers_check fix: tc_ematch/tc_em_meta.h fix the following 'make headers_check' warning: usr/include/linux/tc_ematch/tc_em_meta.h:18: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit ba3a51e3b899c1bd34c18f84a1c6f7e5f99be850 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:12:01 2009 +0530 headers_check fix: tc_ematch/tc_em_cmp.h fix the following 'make headers_check' warning: usr/include/linux/tc_ematch/tc_em_cmp.h:8: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 5dbbf3bcae2f6b5dee1c33b3eeced00bcb6c4f71 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:11:22 2009 +0530 headers_check fix: tc_act/tc_pedit.h fix the following 'make headers_check' warning: usr/include/linux/tc_act/tc_pedit.h:19: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 9c536d275823b8a6281894f4f8c2687f60578253 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:10:44 2009 +0530 headers_check fix: tc_act/tc_mirred.h fix the following 'make headers_check' warning: usr/include/linux/tc_act/tc_mirred.h:16: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 2d594c0c8aa46beb21be1c5c2b7141f89d206313 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:10:05 2009 +0530 headers_check fix: tc_act/tc_gact.h fix the following 'make headers_check' warning: usr/include/linux/tc_act/tc_gact.h:19: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 550e978aa52e2ac3c493e8a0b36b368ade6dd2b4 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:07:35 2009 +0530 headers_check fix: spi/spidev.h fix the following 'make headers_check' warning: usr/include/linux/spi/spidev.h:83: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit bcf74582af3feca80ec96cc21d0a26c938d1863e Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:06:44 2009 +0530 headers_check fix: raid/md_p.h fix the following 'make headers_check' warning: usr/include/linux/raid/md_p.h:85: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 03cf1e0c3b4ee4ef51dc7eb197a4d098ad4873af Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:05:27 2009 +0530 headers_check fix: nfsd/syscall.h fix the following 'make headers_check' warnings: usr/include/linux/nfsd/syscall.h:12: include of is preferred over usr/include/linux/nfsd/syscall.h:104: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit d7240b988017521ebf89edfadd42c0942f166850 Author: Steven Rostedt Date: Thu Jan 29 10:08:01 2009 -0500 generic-ipi: use per cpu data for single cpu ipi calls The smp_call_function can be passed a wait parameter telling it to wait for all the functions running on other CPUs to complete before returning, or to return without waiting. Unfortunately, this is currently just a suggestion and not manditory. That is, the smp_call_function can decide not to return and wait instead. The reason for this is because it uses kmalloc to allocate storage to send to the called CPU and that CPU will free it when it is done. But if we fail to allocate the storage, the stack is used instead. This means we must wait for the called CPU to finish before continuing. Unfortunatly, some callers do no abide by this hint and act as if the non-wait option is mandatory. The MTRR code for instance will deadlock if the smp_call_function is set to wait. This is because the smp_call_function will wait for the other CPUs to finish their called functions, but those functions are waiting on the caller to continue. This patch changes the generic smp_call_function code to use per cpu variables if the allocation of the data fails for a single CPU call. The smp_call_function_many will fall back to the smp_call_function_single if it fails its alloc. The smp_call_function_single is modified to not force the wait state. Since we now are using a single data per cpu we must synchronize the callers to prevent a second caller modifying the data before the first called IPI functions complete. To do so, I added a flag to the call_single_data called CSD_FLAG_LOCK. When the single CPU is called (which can be called when a many call fails an alloc), we set the LOCK bit on this per cpu data. When the caller finishes it clears the LOCK bit. The caller must wait till the LOCK bit is cleared before setting it. When it is cleared, there is no IPI function using it. Signed-off-by: Steven Rostedt Signed-off-by: Peter Zijlstra Acked-by: Jens Axboe Acked-by: Linus Torvalds Signed-off-by: Ingo Molnar commit c01a25e7cf6dcb0fa69c155706d5dd1e76e53796 Merge: ae704e9... b9ec63f... Author: Linus Torvalds Date: Fri Jan 30 08:54:29 2009 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: Remove bogus BUG() check in ext4_bmap() ext4: Fix building with EXT4FS_DEBUG ext4: Initialize the new group descriptor when resizing the filesystem ext4: Fix ext4_free_blocks() w/o a journal when files have indirect blocks jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs" ext3: Add sanity check to make_indexed_dir ext4: Add sanity check to make_indexed_dir ext4: only use i_size_high for regular files ext4: fix wrong use of do_div commit ae704e9f92f87b12c5938b07245792857c7c9c14 Merge: dbeb170... 3a9a3f6... Author: Linus Torvalds Date: Fri Jan 30 08:46:42 2009 -0800 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: cfq-iosched: Allow RT requests to pre-empt ongoing BE timeslice block: add sysfs file for controlling io stats accounting Mark mandatory elevator functions in the biodoc.txt include/linux: Add bsg.h to the Kernel exported headers block: silently error an unsupported barrier bio block: Fix documentation for blkdev_issue_flush() block: add bio_rw_flagged() for testing bio->bi_rw block: seperate bio/request unplug and sync bits block: export SSD/non-rotational queue flag through sysfs Fix small typo in bio.h's documentation block: get rid of the manual directory counting in blktrace block: Allow empty integrity profile block: Remove obsolete BUG_ON block: Don't verify integrity metadata on read error commit dbeb17016e4d0affccfa07f4e8f61feac75c5a18 Merge: 0461ec5... f99ec06... Author: Linus Torvalds Date: Fri Jan 30 08:41:36 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (29 commits) tulip: fix 21142 with 10Mbps without negotiation drivers/net/skfp: if !capable(CAP_NET_ADMIN): inverted logic gianfar: Fix Wake-on-LAN support smsc911x: timeout reaches -1 smsc9420: fix interrupt signalling test failures ucc_geth: Change uec phy id to the same format as gianfar's wimax: fix build issue when debugfs is disabled netxen: fix memory leak in drivers/net/netxen_nic_init.c tun: Add some missing TUN compat ioctl translations. ipv4: fix infinite retry loop in IP-Config net: update documentation ip aliases net: Fix OOPS in skb_seq_read(). net: Fix frag_list handling in skb_seq_read netxen: revert jumbo ringsize ath5k: fix locking in ath5k_config cfg80211: print correct intersected regulatory domain cfg80211: Fix sanity check on 5 GHz when processing country IE iwlwifi: fix kernel oops when ucode DMA memory allocation failure rtl8187: Fix error in setting OFDM power settings for RTL8187L mac80211: remove Michael Wu as maintainer ... commit 0461ec5bc7745b89a8ab67ba0ea497abd58a6301 Author: Paul Larson Date: Fri Jan 30 10:21:49 2009 -0600 Add enable_ms to jsm driver This fixes a crash observed when non-existant enable_ms function is called for jsm driver. Signed-off-by: Scott Kilau Signed-off-by: Paul Larson Signed-off-by: Linus Torvalds commit 34df9f69a4e298e2e8b939d8a7cc0d55846ba544 Author: Grant Likely Date: Fri Jan 30 08:23:33 2009 -0700 powerpc/5200: update device tree binding documentation This patch updates the mpc5200 binding documentation to match actual usage conventions, to remove incorrect information, and to remove topics which are more thoroughly described elsewhere. Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang commit 42de55cb3b332e1430509a343b082731d7972b50 Author: Takashi Iwai Date: Fri Jan 30 15:49:58 2009 +0100 ALSA: hda - Add quirk for another HP dv5 model Added model=hp-dv5 for another HP dv5 model with AMD chip (103c:3600) Reference: kernel bug#12440 http://bugzilla.kernel.org/show_bug.cgi?id=12440 Signed-off-by: Takashi Iwai commit 4ab0a9409af5fad74ad1fc9e46d5a8b460f353e9 Author: Rusty Russell Date: Sat Jan 10 21:58:09 2009 -0800 cpumask: convert lib/smp_processor_id to new cpumask ops Impact: fix debug_smp_processor_id() for CONFIG_CPUMASK_OFFSTACK=y The scheduler now uses the new cpumask API, which deals up to nr_cpumask_bits, whereas the API used NR_CPUS bits. If CONFIG_CPUMASK_OFFSTACK=y these two are not equal, so the top bits are undefined. Leading to bug 12518 "BUG: using smp_processor_id() in preemptible [00000000] code: dellWirelessCtl/..." The fix is simple: use the modern API in the check. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis Signed-off-by: Ingo Molnar commit 9e87b1e53f3c72c1196dc22cb359b5d6188a3729 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:04:03 2009 +0530 headers_check fix: nfsd/nfsfh.h fix the following 'make headers_check' warnings: usr/include/linux/nfsd/nfsfh.h:17: include of is preferred over usr/include/linux/nfsd/nfsfh.h:28: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 3187cedf158687432cdf152eeee205f7b149f4ef Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:03:06 2009 +0530 headers_check fix: nfsd/export.h fix the following 'make headers_check' warning: usr/include/linux/nfsd/export.h:13: include of is preferred over Signed-off-by: Jaswinder Singh Rajput commit 9df27bab62e60d1f786abd0599af4a5e3192a784 Author: Jaswinder Singh Rajput Date: Fri Jan 30 20:00:47 2009 +0530 headers_check fix: netfilter/xt_conntrack.h fix the following 'make headers_check' warning: usr/include/linux/netfilter/xt_conntrack.h:40: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit b852d36b86902abb272b0f2dd7a56dd2d17ea88c Author: Jaswinder Singh Rajput Date: Fri Jan 30 19:59:53 2009 +0530 headers_check fix: dvb/video.h fix the following 'make headers_check' warnings: usr/include/linux/dvb/video.h:29: include of is preferred over usr/include/linux/dvb/video.h:102: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 8996be9de98a9362a3192b866dd8ab9930e28ad9 Author: Jaswinder Singh Rajput Date: Fri Jan 30 19:58:00 2009 +0530 headers_check fix: dvb/net.h fix the following 'make headers_check' warnings: usr/include/linux/dvb/net.h:27: include of is preferred over usr/include/linux/dvb/net.h:31: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit de189f078ee4ae74944e6827dff184a3ef1fc89b Author: Jaswinder Singh Rajput Date: Fri Jan 30 19:56:41 2009 +0530 headers_check fix: dvb/frontend.h fix the following 'make headers_check' warnings: usr/include/linux/dvb/frontend.h:29: include of is preferred over usr/include/linux/dvb/frontend.h:76: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit c86629c855800071314810881d1d2fb226ca9ec9 Author: Jaswinder Singh Rajput Date: Fri Jan 30 19:55:32 2009 +0530 headers_check fix: dvb/dmx.h fix the following 'make headers_check' warnings: usr/include/linux/dvb/dmx.h:27: include of is preferred over usr/include/linux/dvb/dmx.h:90: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 15cf98ad2965aaefaa2f85332535ff39e48f9f4e Author: Jaswinder Singh Rajput Date: Fri Jan 30 19:53:38 2009 +0530 headers_check fix: dvb/audio.h fix the following 'make headers_check' warning: usr/include/linux/dvb/audio.h:133: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 9d6aa4c7ece26652fcbfe37bd45679eac5f69347 Author: Jaswinder Singh Rajput Date: Fri Jan 30 19:50:25 2009 +0530 headers_check fix: can/bcm.h fix the following 'make headers_check' warning: usr/include/linux/can/bcm.h:29: found __[us]{8,16,32,64} type without #include Signed-off-by: Jaswinder Singh Rajput commit 3a9a3f6cc55418dd1525e636dccbbe13c394f652 Author: Divyesh Shah Date: Fri Jan 30 12:46:41 2009 +0100 cfq-iosched: Allow RT requests to pre-empt ongoing BE timeslice This patch adds the ability to pre-empt an ongoing BE timeslice when a RT request is waiting for the current timeslice to complete. This reduces the wait time to disk for RT requests from an upper bound of 4 (current value of cfq_quantum) to 1 disk request. Applied Jens' suggeested changes to avoid the rb lookup and use !cfq_class_rt() and retested. Latency(secs) for the RT task when doing sequential reads from 10G file. | only RT | RT + BE | RT + BE + this patch small (512 byte) reads | 143 | 163 | 145 large (1Mb) reads | 142 | 158 | 146 Signed-off-by: Divyesh Shah Signed-off-by: Jens Axboe commit bc58ba9468d94d62c56ab9b47173583ec140b165 Author: Jens Axboe Date: Fri Jan 23 10:54:44 2009 +0100 block: add sysfs file for controlling io stats accounting This allows us to turn off disk stat accounting completely, for the cases where the 0.5-1% reduction in system time is important. Signed-off-by: Jens Axboe commit 7598909e3ee2a08726276d6415b69dadb52d0d76 Author: Nikanth Karthikesan Date: Tue Jan 27 09:29:24 2009 +0100 Mark mandatory elevator functions in the biodoc.txt biodoc.txt mentions that elevator functions marked with * are mandatory, but no function is marked with *. Mark the 3 functions which should be implemented by any io scheduler. Signed-off-by: Nikanth Karthikesan Signed-off-by: Jens Axboe commit a229fc61ef0ee3c30fd193beee0eeb87410227f1 Author: Boaz Harrosh Date: Mon Jan 19 10:37:38 2009 +0100 include/linux: Add bsg.h to the Kernel exported headers bsg.h in current form is perfectly suitable for user-mode consumption. It is needed together with scsi/sg.h for applications that want to interface with the bsg driver. Currently the few projects that use it would copy it over into the projects. But that is not acceptable for projects that need to provide source and devel packages for distros. This should also be submitted to stable 2.6.28 and 2.6.27 since bsg had a stable API since these Kernels and distro users will need the header for these kernels a swell Signed-off-by: Boaz Harrosh Acked-by: FUJITA Tomonori CC: stable@kernel.org Signed-off-by: Jens Axboe commit cec0707e40ae25794b5a2de7b7f03c51961f80d9 Author: Jens Axboe Date: Tue Jan 13 15:28:32 2009 +0100 block: silently error an unsupported barrier bio This fixes a "regression" from 2.6.28, where the barrier probes that file systems may do would trigger additional end request warnings in dmesg. Signed-off-by: Jens Axboe commit dbdac9b71dff5d27885f82eb2cfca310861fdf9e Author: Theodore Ts'o Date: Tue Jan 13 15:27:32 2009 +0100 block: Fix documentation for blkdev_issue_flush() Signed-off-by: "Theodore Ts'o" Signed-off-by: Jens Axboe commit 1dfa17f4ab8543d82caf4d36636b93916a18f456 Author: Jens Axboe Date: Tue Jan 6 09:21:49 2009 +0100 block: add bio_rw_flagged() for testing bio->bi_rw The existing functions for checking bio->bi_rw are badly named. So lets mirror what we do for bio->bi_flags testing, use a properly named function so that it's immediately obvious what is being tested. Maintain compatability names for the old macros, eventually we'll get rid of these. Signed-off-by: Jens Axboe commit 213d9417fec62ef4c3675621b9364a667954d4dd Author: Jens Axboe Date: Tue Jan 6 09:16:05 2009 +0100 block: seperate bio/request unplug and sync bits Signed-off-by: Jens Axboe commit 1308835ffffe6d61ad1f48c5c381c9cc47f683ec Author: Bartlomiej Zolnierkiewicz Date: Wed Jan 7 12:22:39 2009 +0100 block: export SSD/non-rotational queue flag through sysfs For some devices (i.e. CFA ATA) we can't reliably detect whether the device is of rotational or non-rotational type so we need to leave the final decision about this setting to the user-space. As a bonus do a minor CodingStyle fixup in queue_nomerges_store(). Suggested-by: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jens Axboe commit 16642eb68216d8e0e136a99e514e9166e7125838 Author: Alberto Bertogli Date: Mon Jan 5 10:18:53 2009 +0100 Fix small typo in bio.h's documentation Signed-off-by: Alberto Bertogli Signed-off-by: Jens Axboe commit f48fc4d32e24c0b6a18aad30305d819bcc68c049 Author: Jens Axboe Date: Mon Jan 5 10:17:25 2009 +0100 block: get rid of the manual directory counting in blktrace It can result in a stuck blktrace system, if --kill is used. Signed-off-by: Jens Axboe commit 322316385dde5cd879e682bcb598c56d0659fb60 Author: Martin K. Petersen Date: Sun Jan 4 02:43:40 2009 -0500 block: Allow empty integrity profile Allow a block device to allocate and register an integrity profile without providing a template. This allows DM to preallocate a profile to avoid deadlocks during table reconfiguration. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit 8ae372e3bb4acaca37ffa2ce54f4cf8dd60a94fa Author: Martin K. Petersen Date: Sun Jan 4 02:43:39 2009 -0500 block: Remove obsolete BUG_ON Now that bio_vecs are no longer cleared in bvec_alloc_bs() the following BUG_ON must go. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit 7b24fc4d7eb611da367dea3aad45473050aacd6c Author: Martin K. Petersen Date: Sun Jan 4 02:43:38 2009 -0500 block: Don't verify integrity metadata on read error If we get an I/O error on a read request there is no point in doing a verify pass on the integrity buffer. Adjust the completion path accordingly. Signed-off-by: Martin K. Petersen Signed-off-by: Jens Axboe commit e5553a6d04421eec326a629571d696e8e745a0e4 Author: David S. Miller Date: Thu Jan 29 21:22:47 2009 -0800 sparc64: Implement NMI watchdog on capable cpus. Signed-off-by: David S. Miller commit b9ec63f78b425c0e16cc95605b5d4ff2dc228b97 Author: Theodore Ts'o Date: Fri Jan 30 00:00:24 2009 -0500 ext4: Remove bogus BUG() check in ext4_bmap() The code to support journal-less ext4 operation added a BUG to ext4_bmap() which fired if there was no journal and the EXT4_STATE_JDATA bit was set in the i_state field. This caused running the filefrag program (which uses the FIMBAP ioctl) to trigger a BUG(). The EXT4_STATE_JDATA bit is only used for ext4_bmap(), and it's harmless for the bit to be set. We could add a check in __ext4_journalled_writepage() and ext4_journalled_write_end() to only set the EXT4_STATE_JDATA bit if the journal is present, but that adds an extra test and jump instruction. It's easier to simply remove the BUG check. http://bugzilla.kernel.org/show_bug.cgi?id=12568 Signed-off-by: "Theodore Ts'o" Cc: stable@kernel.org commit f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 Merge: 1737ef7... a9ac49d... Author: Linus Torvalds Date: Thu Jan 29 18:21:14 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: make sure we allocate enough storage for socket address [CIFS] Make socket retry timeouts consistent between blocking and nonblocking cases [CIFS] some cleanup to dir.c prior to addition of posix_open [CIFS] revalidate parent inode when rmdir done within that directory [CIFS] Rename md5 functions to avoid collision with new rt modules cifs: turn smb_send into a wrapper around smb_sendv commit 1737ef7598d3515fdc11cb9ba7e054f334404e04 Author: Alexander Beregalov Date: Thu Jan 29 02:30:56 2009 +0300 sata_sil: Fix build breakage Commit e57db7b (SATA Sil: Blacklist system that spins off disks during ACPI power off) breaks build like the following, in both cases when CONFIG_DMI set or not. drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff': drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match' drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast sata_sil.c should include dmi.h Signed-off-by: Alexander Beregalov Signed-off-by: Linus Torvalds commit 242f45da5b7bf63c50f1f18301750712e7885dd6 Author: Bill Nottingham Date: Thu Jan 29 16:28:40 2009 -0800 Documentation/Changes: add required versions for new filesystems btrfs requires version 0.18 of its tools, and squashfs requires 4.0. ext3 should use and ext4 requires v1.41.4 of e2fsprogs. Signed-off-by: Bill Nottingham Signed-off-by: Randy Dunlap cc: Ted Tso Signed-off-by: Linus Torvalds commit 70221395ba980392ba98c1d78f6c9f77be03df9e Author: Dan Carpenter Date: Thu Jan 29 16:28:28 2009 -0800 fix emacs indenting howto filename expansion I don't think emacs understands tilde expansion, so use "expand-file-name" to do that. Signed-off-by: Dan Carpenter Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 0acbc6c651911dc9ffb4f59b34306bc1ccb751e5 Author: Teemu Likonen Date: Thu Jan 29 16:28:16 2009 -0800 Documentation: update CodingStyle tips for Emacs users With the previous Emacs tips example the kernel style was made available for files in the kernel-tree only. This patch updates the tip to add a separate cc-mode indent style ("linux-tabs-only"). This makes it easy to switch between different indent styles and also makes the kernel style easily available for any filetype mode (c++, awk, ...) that is managed by the Emacs cc-mode. Signed-off-by: Teemu Likonen Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 5872fb94f85d2e4fdef94657bd14e1a492df9825 Author: Randy Dunlap Date: Thu Jan 29 16:28:02 2009 -0800 Documentation: move DMA-mapping.txt to Doc/PCI/ Move DMA-mapping.txt to Documentation/PCI/. DMA-mapping.txt was supposed to be moved from Documentation/ to Documentation/PCI/. The 00-INDEX files in those two directories were updated, along with a few other text files, but the file itself somehow escaped being moved, so move it and update more text files and source files with its new location. Signed-off-by: Randy Dunlap Acked-by: Greg Kroah-Hartman cc: Jesse Barnes Signed-off-by: Linus Torvalds commit ca493d171b66e96f542501b7eb572bc8380f690d Merge: 5488ace... dcbbcef... Author: Linus Torvalds Date: Thu Jan 29 18:14:20 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: poch: fix verification of memory area Staging: usbip: usbip_start_threads(): handle kernel_thread failure staging: agnx: drivers/staging/agnx/agnx.h needs Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal Staging: android: Add lowmemorykiller documentation. Staging: android: fix build error on 64bit boxes Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25. Staging: android: binder: fix arm build errors Staging: meilhaus: fix Kbuild Staging: comedi: fix Kbuild commit 5488ace40be22d3f23f58190ae48b2c8d4691f2b Merge: 05986e2... 7cbcf22... Author: Linus Torvalds Date: Thu Jan 29 18:14:05 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: driver-core: fix kernel-doc parameter name UIO: Add missing documentation of features added recently Sync patch for jp_JP/stable_kernel_rules.txt commit 05986e264ee638b6b6151aea89c9f191278c30f1 Merge: 0d28088... de2cf59... Author: Linus Torvalds Date: Thu Jan 29 18:13:22 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ASoC: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver ASoC: Fix null string usage with WM8753 DAIs ALSA: hda - add another MacBook Pro 4, 1 subsystem ID ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n ALSA: hda - Add quirk for HP DV6700 laptop ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs commit 0d280884961de51afd87465f72ade9e8876d1e26 Merge: 9b4d142... 766fb95... Author: Linus Torvalds Date: Thu Jan 29 18:12:58 2009 -0800 Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 * 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: allow direct user-space I/O UBI: fix resource de-allocation UBI: remove unused variable UBI: use nicer 64-bit math UBI: add ioctl compatibility UBI: constify file operations UBI: allow all ioctls UBI: remove unnecessry header inclusion UBI: improve ioctl commentaries UBI: add ioctl for is_mapped operation UBI: add ioctl for unmap operation UBI: add ioctl for map operation commit 9b4d142d521963ee1c53cefcd1f9790ca32b5db7 Merge: 6e3eed9... bae7eb3... Author: Linus Torvalds Date: Thu Jan 29 18:11:02 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: document difference between hid_blacklist and hid_ignore_list HID: add antec-branded soundgraph imon devices to blacklist HID: fix reversed logic in disconnect testing of hiddev HID: adjust report descriptor fixup for MS 1028 receiver commit 6e3eed9850064e38a98851ff91534bb32438b292 Merge: ceb5eb0... 05dfdbb... Author: Linus Torvalds Date: Thu Jan 29 18:10:36 2009 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: lguest: Fix a memory leak with the lg object during launcher close lguest: disable the FORTIFY for lguest. lguest: typos fix commit ceb5eb0cb3fe61d488aa76aba748409775a56daa Merge: 726a669... 1448d7c... Author: Linus Torvalds Date: Thu Jan 29 18:09:41 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: sbp2: add workarounds for 2nd and 3rd generation iPods firewire: sbp2: add workarounds for 2nd and 3rd generation iPods firewire: sbp2: fix DMA mapping leak on the failure path firewire: sbp2: define some magic numbers as macros firewire: sbp2: fix payload limit at S1600 and S3200 ieee1394: sbp2: don't assume zero model_id or firmware_revision if there is none ieee1394: sbp2: fix payload limit at S1600 and S3200 ieee1394: sbp2: update a help string ieee1394: support for speeds greater than S800 firewire: core: optimize card shutdown ieee1394: ohci1394: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others firewire: ohci: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others firewire: ohci: change "context_stop: still active" log message firewire: keep highlevel drivers attached during brief connection loss firewire: unnecessary BM delay after generation rollover firewire: insist on successive self ID complete events commit 726a6699267e36c66043a55b13dfeec3d9925452 Author: Andrew Morton Date: Thu Jan 29 14:25:27 2009 -0800 drivers/gpu/drm/i915/intel_lvds.c: fix locking snafu s/unlock/lock/ Addresses http://bugzilla.kernel.org/show_bug.cgi?id=12575 Reported-by: Daniel Vetter Cc: Dave Airlie Acked-by: Jesse Barnes Cc: Eric Anholt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9df04e1f25effde823a600e755b51475d438f56b Author: Davide Libenzi Date: Thu Jan 29 14:25:26 2009 -0800 epoll: drop max_user_instances and rely only on max_user_watches Linus suggested to put limits where the money is, and max_user_watches already does that w/out the need of max_user_instances. That has the advantage to mitigate the potential DoS while allowing pretty generous default behavior. Allowing top 4% of low memory (per user) to be allocated in epoll watches, we have: LOMEM MAX_WATCHES (per user) 512MB ~178000 1GB ~356000 2GB ~712000 A box with 512MB of lomem, will meet some challenge in hitting 180K watches, socket buffers math teaches us. No more max_user_instances limits then. Signed-off-by: Davide Libenzi Cc: Willy Tarreau Cc: Michael Kerrisk Cc: Bron Gondwana Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3095eb87bb36ae880608fe3fc46cfd59ced1f319 Author: Frans Pop Date: Thu Jan 29 14:25:25 2009 -0800 hp-wmi: set initial docking state If the initial state is not set when the input device is set up, the first docking event after the module is loaded will be lost. Signed-off-by: Frans Pop Acked-by: Matthew Garrett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb9f88e1dc76f9feb39d39c40a5d61aad6df4388 Author: Bharath Ramesh Date: Thu Jan 29 14:25:24 2009 -0800 hwmon: applesmc: add support for MacPro 3 temperature sensors MacPro 3 have more temperature sensors than the previous MacPro's also the sensor THTG has been removed. This patch add supports for the newer temperature sensors in the MacPro3. Signed-off-by: Bharath Ramesh Signed-off-by: Henrik Rydberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c189f4ec955e1fe4a2a2742d028aeecc52a5848a Author: David Altobelli Date: Thu Jan 29 14:25:23 2009 -0800 hpilo: increment version Bump hpilo module version to indicate that the open/close bug is fixed. Signed-off-by: David Altobelli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 839ec5452ebfd5905b9c69b20ceb640903a8ea1a Author: Paul Menage Date: Thu Jan 29 14:25:22 2009 -0800 cgroup: fix root_count when mount fails due to busy subsystem root_count was being incremented in cgroup_get_sb() after all error checking was complete, but decremented in cgroup_kill_sb(), which can be called on a superblock that we gave up on due to an error. This patch changes cgroup_kill_sb() to only decrement root_count if the root was previously linked into the list of roots. Signed-off-by: Paul Menage Tested-by: Serge Hallyn Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 804b3c28a4e4fa1c224571bf76edb534b9c4b1ed Author: Paul Menage Date: Thu Jan 29 14:25:21 2009 -0800 cgroups: add cpu_relax() calls in css_tryget() and cgroup_clear_css_refs() css_tryget() and cgroup_clear_css_refs() contain polling loops; these loops should have cpu_relax calls in them to reduce cross-cache traffic. Signed-off-by: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1404f06565ee89e0ce04d4a5859c00b0e3a0dc8d Author: Li Zefan Date: Thu Jan 29 14:25:21 2009 -0800 cgroups: fix lock inconsistency in cgroup_clone() I fixed a bug in cgroup_clone() in Linus' tree in commit 7b574b7 ("cgroups: fix a race between cgroup_clone and umount") without noticing there was a cleanup patch in -mm tree that should be rebased (now commit 104cbd5, "cgroups: use task_lock() for access tsk->cgroups safe in cgroup_clone()"), thus resulted in lock inconsistency. Signed-off-by: Li Zefan Acked-by: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 945048ca36173315afa2f0c53bed21ba01a588c1 Author: Ivan Kokshaysky Date: Thu Jan 29 14:25:20 2009 -0800 alpha: fix the BUG() macro The commit "alpha: teach the compiler that BUG doesn't return" (ed6b9b97f42c091630335bfb71a2931e6f86388b) moved the asm code into inline function which takes __FILE__ and __LINE__ as arguments. This violates asm constrains there ("i" - an immediate operand with constant value), so that compile may result in warning or error, depending on compiler version. Just adding an infinite loop to the BUG() is sufficient. Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee0c468bb151aad23281660152d2894f1e214238 Author: Ivan Kokshaysky Date: Thu Jan 29 14:25:19 2009 -0800 alpha: compile fixes - jensen build: fix conflicting declarations for pci_alloc_consistent() and undefined virt_to_phys(); - SMP: arch/alpha/kernel/smp.c:124: warning: passing argument 2 of '__cpu_test_and_set' discards qualifiers from pointer target type Interestingly, this only happens with gcc-4.2; gcc <= 4.1 and gcc-4.3 are OK. Fixed with extra assignment. Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Cc: FUJITA Tomonori Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5d9a90c36e05dd080704ea58328c00f64facdc1 Author: Ivan Kokshaysky Date: Thu Jan 29 14:25:18 2009 -0800 alpha: use syscall wrappers Convert OSF syscalls and add alpha specific SYSCALL_ALIAS() macro. Signed-off-by: Ivan Kokshaysky Cc: Richard Henderson Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 299b4eaa302138426d5a9ecd954de1f565d76c94 Author: KAMEZAWA Hiroyuki Date: Thu Jan 29 14:25:17 2009 -0800 memcg: NULL pointer dereference at rmdir on some NUMA systems N_POSSIBLE doesn't means there is memory...and force_empty can visit invalid node which have no pgdat. To visit all valid nodes, N_HIGH_MEMORY should be used. Reported-by: Li Zefan Signed-off-by: KAMEZAWA Hiroyuki Tested-by: Li Zefan Cc: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 248ae0d43fe7f951352eedfff36572d4b75ce963 Author: Alex Buell Date: Thu Jan 29 14:25:16 2009 -0800 fbdev: incorrect URL given in drivers/video/Kconfig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6989d5651a16b49908069b514329d5114217ea0e Author: Frans Pop Date: Thu Jan 29 14:25:14 2009 -0800 hp-wmi: fix regressions caused by missing if statement Error was introduced in commit fe8e4e039dc3 ("hp-wmi: handle rfkill_register() failure"). Signed-off-by: Frans Pop Acked-by: Larry Finger Acked-by: Matthew Garrett Cc: Matthew Garrett Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d50d369d1b3ccc4d96ce01f62146173ee7064ca Author: KAMEZAWA Hiroyuki Date: Thu Jan 29 14:25:14 2009 -0800 memcg: update document to mention that swapoff should be tested Considering the recently found problem "memcg: fix refcnt handling at swapoff", it's better to mention swapoff behavior in the memcg_test document. Signed-off-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Cc: Li Zefan Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85d9fc89fb0f0703df6444f260187c088a8d59ff Author: KAMEZAWA Hiroyuki Date: Thu Jan 29 14:25:13 2009 -0800 memcg: fix refcnt handling at swapoff Now, at swapoff, even while try_charge() fails, commit is executed. This is a bug which turns the refcnt of cgroup_subsys_state negative. Reported-by: Li Zefan Tested-by: Li Zefan Tested-by: Daisuke Nishimura Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Daisuke Nishimura Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7460db567bbca76bf087d1694d792a1a96bdaa26 Author: Magnus Damm Date: Thu Jan 29 14:25:12 2009 -0800 gpiolib: fix request related issue Fix request-already-requested handling in gpio_request(). Signed-off-by: Magnus Damm Acked-by: David Brownell Cc: [2.6.28.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bcc1bb1232de6efc0b85e0c7fe38e90b2436318 Author: Daisuke Nishimura Date: Thu Jan 29 14:25:11 2009 -0800 memcg: get/put parents at create/free The lifetime of struct cgroup and struct mem_cgroup is different and mem_cgroup has its own reference count for handling references from swap_cgroup. This causes strange problem that the parent mem_cgroup dies while child mem_cgroup alive, and this problem causes a bug in case of use_hierarchy==1 because res_counter_uncharge climbs up the tree. This patch is for avoiding it by getting the parent at create, and putting it at freeing. Signed-off-by: Daisuke Nishimura Reviewed-by; KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Li Zefan Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit baef99a08a2e23d9386b47e53fa5f0d44fc98f66 Author: KAMEZAWA Hiroyuki Date: Thu Jan 29 14:25:10 2009 -0800 cgroups: use hierarchy mutex in creation failure path Now, cgrp->sibling is handled under hierarchy mutex. error route should do so, too. Signed-off-by: KAMEZAWA Hiroyuki Cc: Li Zefan Acked-by Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e9e3cbc62da43c66e894d5a61fa08b427e25202 Author: Evgeniy Polyakov Date: Thu Jan 29 14:25:09 2009 -0800 mm: OOM documentation update Signed-off-by: Evgeniy Polyakov Acked-by: David Rientjes Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc19835df6c47ff676ad6c98722d5e529db5d74c Author: Masami Hiramatsu Date: Thu Jan 29 14:25:08 2009 -0800 kprobes: fix module compilation error with CONFIG_KPROBES=n Define kprobes related data structures even if CONFIG_KPROBES is not set. This fixes compilation errors which occur if CONFIG_KPROBES is not set, in kprobe using modules. [akpm@linux-foundation.org: fix build for non-kprobes-supporting architectures] Reviewed-by: Ananth N Mavinakayanahalli Signed-off-by: Masami Hiramatsu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 252523ef2421b803de4810876223e4d695f23ec6 Author: Robin Holt Date: Thu Jan 29 14:25:07 2009 -0800 sgi-xpc: fix up stale DBUG_ON statements Clean up the stale DBUG_ON checks and add a couple new ones. Signed-off-by: Robin Holt Signed-off-by: Dean Nelson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17e2161654da4e6bdfd8d53d4f52e820ee93f423 Author: Robin Holt Date: Thu Jan 29 14:25:07 2009 -0800 sgi-xpc: Remove NULL pointer dereference. If the bte copy fails, the attempt to retrieve payloads merely returns a null pointer deref and not NULL as was expected. Signed-off-by: Robin Holt Signed-off-by: Dean Nelson Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69b3bb65fa97a1e8563518dbbc35cd57beefb2d4 Author: Robin Holt Date: Thu Jan 29 14:25:06 2009 -0800 sgi-xpc: ensure flags are updated before bte_copy The clearing of the msg->flags needs a barrier between it and the notify of the channel threads that the messages are cleaned and ready for use. Signed-off-by: Robin Holt Signed-off-by: Dean Nelson Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de33c8db5910cda599899dd431cc30d7c1018cbf Author: Linus Torvalds Date: Thu Jan 29 17:46:42 2009 -0800 Fix OOPS in mmap_region() when merging adjacent VM_LOCKED file segments As of commit ba470de43188cdbff795b5da43a1474523c6c2fb ("map: handle mlocked pages during map, remap, unmap") we now use the 'vma' variable at the end of mmap_region() to handle the page-in of newly mapped mlocked pages. However, if we merged adjacent vma's together, the vma we're using may be stale. We historically consciously avoided using it after the merge operation, but that got overlooked when redoing the locked page handling. This commit simplifies mmap_region() by doing any vma merges early, avoiding the issue entirely, and 'vma' will always be valid. As pointed out by Hugh Dickins, this depends on any drivers that change the page offset of flags to have set one of the VM_SPECIAL bits (so that they cannot trigger the early merge logic), but that's true in general. Reported-and-tested-by: Maksim Yevmenkin Cc: Lee Schermerhorn Cc: Nick Piggin Cc: Andrew Morton Cc: Hugh Dickins Signed-off-by: Linus Torvalds commit f99ec0649accb581cf3e8fcfeea796e82d05f4ea Author: Philippe De Muyter Date: Thu Jan 29 17:35:04 2009 -0800 tulip: fix 21142 with 10Mbps without negotiation with current kernels, tulip 21142 ethernet controllers fail to connect to a 10Mbps only (i.e. without negotiation-partner) network. It used to work in 2.4 kernels. Fix that. Tested on a 21142 Rev 0x11. Signed-off-by: Philippe De Muyter Signed-off-by: David S. Miller commit c25b9abbc2c2c0da88e180c3933d6e773245815a Author: Roel Kluin Date: Thu Jan 29 17:32:20 2009 -0800 drivers/net/skfp: if !capable(CAP_NET_ADMIN): inverted logic Fix inverted logic Signed-off-by: Roel Kluin Signed-off-by: David S. Miller commit e5664bb2a7fd8ae1bee1281c2e44653c471af9ca Author: Anton Vorontsov Date: Thu Jan 29 17:31:13 2009 -0800 gianfar: Fix Wake-on-LAN support commit 0f0ca340e57bd7446855fefd07a64249acf81223 ("phy: power management support") caused a regression in the gianfar driver. Now phylib turns off PHY power during suspend, and thus WOL doesn't work anymore. This patch workarounds the issue by enabling wakeup in the MDIO device, i.e. just restores the old behaviour for the gianfar driver. Note that this way all PHYs on a given MDIO bus won't be turned off during suspend, which isn't good from the power saving point of view. A proper, per netdevice wakeup management support will need a bit reworked phylib suspend/resume logic. Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit f307dbd88d82c4ccab7aec49613c366023b89cde Author: Roel Kluin Date: Thu Jan 29 17:30:00 2009 -0800 smsc911x: timeout reaches -1 With a postfix decrement the timeout will reach -1 rather than 0, so the warning will not be issued. Signed-off-by: Roel Kluin Acked-by: Steve Glendinning Signed-off-by: David S. Miller commit 1609559547ae0ddc2e4829c7f78ac2c4869875b9 Author: Steve Glendinning Date: Thu Jan 29 17:29:15 2009 -0800 smsc9420: fix interrupt signalling test failures smsc9420 performs an interrupt signalling test when the interface is brought up. The current code mistakenly sets its test flag to false AFTER enabling the software interrupt source, making failure quite likely. This patch changes the code to set the test flag BEFORE enabling interrupts. I've also removed an smp_wmb because the following spinlock provides an implicit memory barrier. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit b1c4a9dddf09fe99b8f88252718ac5b357363dc4 Author: Haiying Wang Date: Thu Jan 29 17:28:04 2009 -0800 ucc_geth: Change uec phy id to the same format as gianfar's The commit b31a1d8b41513b96e9c7ec2f68c5734cef0b26a4 ("gianfar: Convert gianfar to an of_platform_driver") changes the gianfar's phy id to the format like "mdio@xxxx:xx", but uec still uses the old format like "xxxxxxxx:xx". For the board whose UEC uses gianfar-mdio like MPC8568MDS, the phy can not be attached because of the incompatible phy id format. This patch changes uec's phy id to the same format as gianfar's. Signed-off-by: Haiying Wang Signed-off-by: David S. Miller commit 1af7ad51049d6a310a19d497960597198290ddfa Author: Inaky Perez-Gonzalez Date: Thu Jan 29 17:18:31 2009 -0800 wimax: fix build issue when debugfs is disabled As reported by Toralf Förster and Randy Dunlap. - http://linuxwimax.org/pipermail/wimax/2009-January/000460.html - http://lkml.org/lkml/2009/1/29/279 The definitions needed for the wimax stack and i2400m driver debug infrastructure was, by mistake, compiled depending on CONFIG_DEBUG_FS (by them being placed in the debugfs.c files); thus the build broke in 2.6.29-rc3 when debugging was enabled (CONFIG_WIMAX_DEBUG) and DEBUG_FS was disabled. These definitions are always needed if debug is enabled at compile time (independently of DEBUG_FS being or not enabled), so moving them to a file that is always compiled fixes the issue. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: David S. Miller commit 05dfdbbd678ea2b642db73f48b75667a23d15484 Author: Mark Wallis Date: Mon Jan 26 17:32:35 2009 +1100 lguest: Fix a memory leak with the lg object during launcher close Fix a memory leak identified by Rusty Russell during LCA09 by kfree'ing the lg object instead of just clearing it when the launcher closes. Signed-off-by: Mark Wallis Signed-off-by: Rusty Russell commit b44d49ab0954accefba4c71274ab58abe1c25c52 Author: Tim 'mithro' Ansell Date: Thu Jan 22 15:06:41 2009 +1100 lguest: disable the FORTIFY for lguest. Makes all the warnings go away when compiling lguest on Ubuntu on Intrepid or greater. Signed-off-by: Timothy R Ansell Signed-off-by: Rusty Russell commit 72410af921cbc9018da388ca1ddf75880a033ac1 Author: Atsushi SAKAI Date: Fri Jan 16 20:39:14 2009 +0900 lguest: typos fix 3 points lguest_asm.S => i386_head.S LHCALL_BREAK => LHREQ_BREAK perferred => preferred Signed-off-by: Atsushi SAKAI Signed-off-by: Rusty Russell commit 584dbe9475313e117abf9d2af88164edfd429c9a Author: Daniel Marjamäki Date: Thu Jan 29 08:55:56 2009 +0000 netxen: fix memory leak in drivers/net/netxen_nic_init.c For kernel bugzilla #12537: http://bugzilla.kernel.org/show_bug.cgi?id=12537 Free memory. Signed-off-by: Daniel Marjamäki Signed-off-by: David S. Miller commit df1c46b2b6876d0a1b1b4740f009fa69d95ebbc9 Author: David S. Miller Date: Thu Jan 29 16:53:35 2009 -0800 tun: Add some missing TUN compat ioctl translations. Based upon a report from Michael Tokarev : Just saw in dmesg: ioctl32(kvm:4408): Unknown cmd fd(9) cmd(800454cf){t:'T';sz:4} arg(ffc668e4) on /dev/net/tun Signed-off-by: David S. Miller commit 9d8dba6c979fa99c96938c869611b9a23b73efa9 Author: Benjamin Zores Date: Thu Jan 29 16:19:13 2009 -0800 ipv4: fix infinite retry loop in IP-Config Signed-off-by: Benjamin Zores Signed-off-by: David S. Miller commit 58092d1e0a896eb1d9163d58f93df7ed704fa8e1 Author: Stephen Hemminger Date: Thu Jan 29 16:16:31 2009 -0800 net: update documentation ip aliases This documentation is old. Add a short note to describe why aliases are no long necessary, and remove the old contact/edit info. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 71b3346d182355f19509fadb8fe45114a35cc499 Author: Shyam Iyer Date: Thu Jan 29 16:12:42 2009 -0800 net: Fix OOPS in skb_seq_read(). It oopsd for me in skb_seq_read. addr2line said it was linux-2.6/net/core/skbuff.c:2228, which is this line: while (st->frag_idx < skb_shinfo(st->cur_skb)->nr_frags) { I added some printks in there and it looks like we hit this: } else if (st->root_skb == st->cur_skb && skb_shinfo(st->root_skb)->frag_list) { st->cur_skb = skb_shinfo(st->root_skb)->frag_list; st->frag_idx = 0; goto next_skb; } Actually I did some testing and added a few printks and found that the st->cur_skb->data was 0 and hence the ptr used by iscsi_tcp was null. This caused the kernel panic. if (abs_offset < block_limit) { - *data = st->cur_skb->data + abs_offset; + *data = st->cur_skb->data + (abs_offset - st->stepped_offset); I enabled the debug_tcp and with a few printks found that the code did not go to the next_skb label and could find that the sequence being followed was this - It hit this if condition - if (st->cur_skb->next) { st->cur_skb = st->cur_skb->next; st->frag_idx = 0; goto next_skb; And so, now the st pointer is shifted to the next skb whereas actually it should have hit the second else if first since the data is in the frag_list. else if (st->root_skb == st->cur_skb && skb_shinfo(st->root_skb)->frag_list) { st->cur_skb = skb_shinfo(st->root_skb)->frag_list; goto next_skb; } Reversing the two conditions the attached patch fixes the issue for me on top of Herbert's patches. Signed-off-by: Shyam Iyer Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e489a44e2473981474fe17f17418828ba341661a Author: Grant Likely Date: Thu Jan 29 17:08:41 2009 -0700 powerpc/5200: Bugfix for PCI mapping of memory and IMMR This patch ensures that memory gets properly mapped into the PCI address space. Without this patch, the memory window BAR is left at whatever value happened to be loaded into the BAR when Linux was booted. Without this patch, memory could end up getting mapped at any of the 1G address boundaries instead of at '0' where Linux expects it. Similarly, this patch also ensures that the internally memory mapped registers (IMMR) are mapped to the correct PCI address range. Without this patch, PCI appears to work correctly until a PCI device is inserted which DMAs into memory. Signed-off-by: Grant Likely Tested-by: Wolfram Sang commit d35ec494a68218d646f31d8b4f03ddd39b262a3e Author: Grant Likely Date: Thu Jan 29 17:08:38 2009 -0700 powerpc/5200: update defconfigs Signed-off-by: Grant Likely commit 95e3b24cfb4ec0479d2c42f7a1780d68063a542a Author: Herbert Xu Date: Thu Jan 29 16:07:52 2009 -0800 net: Fix frag_list handling in skb_seq_read The frag_list handling was broken in skb_seq_read: 1) We didn't add the stepped offset when looking at the head are of fragments other than the first. 2) We didn't take the stepped offset away when setting the data pointer in the head area. 3) The frag index wasn't reset. This patch fixes both issues. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e125646ab56b490d0390b158e0afa9cccfc1f897 Author: Dhananjay Phadke Date: Thu Jan 29 16:05:19 2009 -0800 netxen: revert jumbo ringsize Reducing jumbo ring size below 1024 reduces throughput for old firmwares (3.4.216 and older) running on older (NX2031) chip, so restore it back to 1024. This was reduced in commit 32ec803348b4d5f1353e1d7feae30880b8b3e342 ("netxen: reduce memory footprint"). Raising jumbo ring size from 512 to 1024, adds ~4MB per port, but there's still big saving because of original patch (~20MB per port). Signed-off-by: Dhananjay Phadke Signed-off-by: David S. Miller commit ae9e47e9e864bc5f0a7a7e71dc3f287196b3626b Merge: a4e6db0... be00937... Author: David S. Miller Date: Thu Jan 29 15:27:47 2009 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit be0093705c3ce98d73cac0ca8f93ea105cdf4e9c Author: Bob Copeland Date: Thu Jan 22 08:44:16 2009 -0500 ath5k: fix locking in ath5k_config ath5k_config updates the software context without taking sc->lock. Changes-licensed-under: 3-Clause-BSD Signed-off-by: Bob Copeland Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 667ecd010d870f861a9e276aaaca8cb443ded8b3 Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:43 2009 -0800 cfg80211: print correct intersected regulatory domain When CONFIG_CFG80211_REG_DEBUG is enabled and an intersection occurs we are printing the regulatory domain passed by CRDA and indicating its the intersected regulatory domain. Lets fix this and print the intersection as originally intended. Signed-off-by: Luis R. Rodriguez Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 615aab4b75dfa77b00c372330d6f70edd2458bf9 Author: Luis R. Rodriguez Date: Thu Jan 22 15:05:46 2009 -0800 cfg80211: Fix sanity check on 5 GHz when processing country IE This fixes two issues with the sanity check loop when processing the country IE: 1. Do not use frequency for the current subband channel check, this was a big fat typo. 2. Apply the 5 GHz 4-channel steps when considering max channel on each subband as was done with a recent patch. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 1f304e4e3bb161163d9f5bc3c6467a2a6fa9b3ae Author: Zhu, Yi Date: Fri Jan 23 13:45:22 2009 -0800 iwlwifi: fix kernel oops when ucode DMA memory allocation failure The patch fixes memcpy to NULL address when the ucode DMA allocation failure. This is a fix to bug http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1861 Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit eb83bbf57429ab80f49b413e3e44d3b19c3fdc5a Author: Larry Finger Date: Tue Jan 27 12:31:23 2009 -0600 rtl8187: Fix error in setting OFDM power settings for RTL8187L After reports of poor performance, a review of the latest vendor driver (rtl8187_linux_26.1025.0328.2007) for RTL8187L devices was undertaken. A difference was found in the code used to index the OFDM power tables. When the Linux driver was changed, my unit works at a much greater range than before. I think this fixes Bugzilla #12380 and has been tested by at least two other users. Signed-off-by: Larry Finger Tested-by: Martín Ernesto Barreyro Cc: Stable Signed-off-by: John W. Linville commit e6a271651e9e7810c1802bb8375967f6efa4baea Author: Johannes Berg Date: Mon Jan 26 19:35:28 2009 +0100 mac80211: remove Michael Wu as maintainer His email address keeps bouncing, and he's not interested in mac80211 patches etc. anyway. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 1448d7c6a2ff96d3b52ecae49e2d0f046a097fe0 Author: Stefan Richter Date: Thu Jan 29 00:13:20 2009 +0100 ieee1394: sbp2: add workarounds for 2nd and 3rd generation iPods as per https://bugs.launchpad.net/bugs/294391. These got one sample of each iPod generation going. However there still occurred I/O stalls with the 3rd generation iPod which remain undiagnosed at the time of this writing. Acked-by: Jarod Wilson Signed-off-by: Stefan Richter commit c8c4707cf7ca8ff7dcc1653447e48cb3de0bf114 Author: Stefan Richter Date: Thu Jan 29 00:11:59 2009 +0100 firewire: sbp2: add workarounds for 2nd and 3rd generation iPods According to https://bugs.launchpad.net/bugs/294391 - 3rd generation iPods need the "fix capacity" workaround after all (apparently they crash after the last sector was accessed), - 2nd generation iPods need the "128 kB maximum request size" workaround. Alas both iPod generations feature the same model ID in the config ROM, hence we can only define a shared quirks list entry for them. Luckily the fix capacity workaround did not show a negative effect in Jarod's tests with 2nd gen. iPod. A side note: Apple computers in target mode (or at least an x86 Mac mini) don't have firmware_version and model_id, hence none of the iPod quirks list entries is active for them. Tested-by: Jarod Wilson Acked-by: Jarod Wilson Signed-off-by: Stefan Richter commit 0dc23d704874e892c3fb5f2c0e4dfbef3c9c6edf Author: Kevin Hilman Date: Thu Jan 29 08:57:18 2009 -0800 ARM: OMAP: fix fault in enter_full_retention() In omap24xx_cpu_suspend assembly routine, the r2 register which holds the address of the SDRC_POWER reg is set to zero before the value is written back triggering a fault due to writing to address zero. It's hard to tell where this change was introduced since this file has been moved and merged. While this fix prevents a crash, suspend on my n810 is broken with current kernels. I never come out of suspend. Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 5461af5af5c6a7fee78978aafe720541bf3a2f55 Author: 김규원 Date: Thu Jan 29 08:57:17 2009 -0800 ARM: OMAP: Mask interrupts when disabling interrupts, v2 By Ingo Molnar, interrupts are not masked by default. (refer to 76d2160147f43f982dfe881404cfde9fd0a9da21) But if interrupts are not masked, the processor can wake up while in Suspend-to-RAM state by an external interrupt. For example, if an OMAP3 board is connected to Host PC by USB and entered to Suspend-to-RAM state, it wake up automatically by M_IRQ_92. The disable_irq() function can't disable the interrupt in H/W level, So I modified arch/arm/mach-omap2/irq.c Signed-off-by: Kim Kyuwon Signed-off-by: Tony Lindgren commit df88acbbdc48d0bfe2a46bf2561d984b6d87a9ac Author: Aaro Koskinen Date: Thu Jan 29 08:57:17 2009 -0800 ARM: OMAP: gptimer min_delta_ns corrected When 32 kHz timer is used the min_delta_ns should be initialized so that it reflects the timer programming cost. A write to the timer device will be usually posted, but it takes roughly 3 cycles before it is effective. If the timer is reprogrammed before that, the CPU will stall until the previous write completes. This was pointed out by Richard Woodruff. Since the lower bound for min_delta_ns is 1000, the change is visible only with tick rates less than 3 MHz. Also note that the old value is incorrect for 32 kHz also due to a rounding error, and it can cause the timer queue to hang (due to clockevent code trying to program the timer with zero ticks). Signed-off-by: Aaro Koskinen Reviewed-by: Richard Woodruff Signed-off-by: Tony Lindgren commit 0dffb5c57a1d76532e2f2c7398579bfce81c3e5c Author: Tony Lindgren Date: Thu Jan 29 08:57:16 2009 -0800 ARM: OMAP: Fix hsmmc init, v2 The naming accidentally broke while changing the name for the driver to not to conflict with the other mmc driver. Signed-off-by: Tony Lindgren commit 187e688d237a6df11a2d32e8ac480b6d1fbd40b9 Author: Tony Lindgren Date: Thu Jan 29 08:57:16 2009 -0800 ARM: OMAP: Fix omap34xx revision detection for ES3.1 Fix omap34xx revision detection for ES3.1 Signed-off-by: Tony Lindgren commit a92fda194d31d26c1fecd191a03d2dbc5b6ac230 Author: Jarkko Nikula Date: Thu Jan 29 08:57:12 2009 -0800 ARM: OMAP: DMA: Fix uninitialized channel flags This has similar symptoms than 66c23551b1b774e2be3c7bdf91c0ebf2c7a3519e where just omap_request_dma, omap_dma_link_lch and omap_dma_unlink_lch can cause incorrect dump_stack(). Here it can happen if channel has been used before and the channel flags variable holds old status. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit 320ce6f6fb3d95e02a183709e51d8a16a8b00e0a Author: Juha Yrjola Date: Thu Jan 29 08:57:12 2009 -0800 ARM: OMAP: Fix race in OMAP2/3 DMA IRQ handling CSR must be cleared before invoking the callback. If the callback function starts a new, fast DMA transfer on the same channel, the completion status might lost if CSR is cleared after the callback invocation. Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 06151158f2da4764479b4ec01688dc4bade6ce9d Author: Stanley.Miao Date: Thu Jan 29 08:57:12 2009 -0800 ARM: OMAP: Fix McBSP spin_lock deadlock A spin_lock deadlock will occur when omap_mcbsp_request() is invoked. omap_mcbsp_request() \- clk_enable(mcbsp->clk) [takes and holds clockfw_lock] \- omap2_clk_enable() \- _omap2_clk_enable() \- omap_mcbsp_clk_enable() \- clk_enable(child clock) [tries for clockfw_lock again] mcbsp_clk is a virtual clock and it comprises several child clocks. when enable mcbsp_clk in omap_mcbsp_request(), the enable function of mcbsp_clk will enable its child clocks, then the deadlock occurs. The solution is to remove the virtual clock and enable these child clocks in omap_mcbsp_request() directly. Signed-off-by: Stanley.Miao Signed-off-by: Tony Lindgren commit 27ad27993313312a4ad0047d0a944c425cd511a5 Author: Artem Bityutskiy Date: Thu Jan 29 16:34:30 2009 +0200 UBIFS: remove fast unmounting This UBIFS feature has never worked properly, and it was a mistake to add it because we simply have no use-cases. So, lets still accept the fast_unmount mount option, but ignore it. This does not change much, because UBIFS commit in sync_fs anyway, and sync_fs is called while unmounting. Signed-off-by: Artem Bityutskiy commit a2b9df3ff691db8e5e521dccd231a8098bbf7416 Author: Artem Bityutskiy Date: Thu Jan 29 16:22:54 2009 +0200 UBIFS: return sensible error codes When mounting/re-mounting, UBIFS returns EINVAL even if the ENOSPC or EROFS codes are are much better, just because we have not found references to ENOSPC/EROFS in mount (2) man pages. This patch changes this behaviour and makes UBIFS return real error code, because: 1. It is just less confusing and more logical 2. mount is not described in SuSv3, so it seems to be not really well-standartized 3. we do not cover all cases, and any random undocumented in man pages error code may be returned anyway Signed-off-by: Artem Bityutskiy commit b466f17d780c5b72427f36aef22ecdec9f1d0689 Author: Adrian Hunter Date: Thu Jan 29 12:59:33 2009 +0200 UBIFS: remount ro fixes - preserve the idx_gc list - it will be needed in the same state, should UBIFS be remounted rw again - prevent remounting ro if we have switched to read only mode (due to a fatal error) Signed-off-by: Adrian Hunter Signed-off-by: Artem Bityutskiy commit 227c75c91dbfa037d109ab7ef45b7f5ba9cab6d0 Author: Adrian Hunter Date: Thu Jan 29 11:53:51 2009 +0200 UBIFS: spelling fix 'date' -> 'data' Signed-off-by: Adrian Hunter Signed-off-by: Artem Bityutskiy commit 3eb14297c4b85af0c5e6605e18d93b6031330d71 Author: Adrian Hunter Date: Thu Jan 29 11:17:24 2009 +0200 UBIFS: sync wbufs after syncing inodes and pages All writes go through wbufs so they must be sync'd after syncing inodes and pages. Signed-off-by: Adrian Hunter Signed-off-by: Artem Bityutskiy commit de2cf591bc876f7a63809d8955855ab074588c30 Merge: c9de36f... 2a88464... Author: Takashi Iwai Date: Thu Jan 29 14:47:56 2009 +0100 Merge branch 'fix/hda' into for-linus commit c9de36f2a230919bee95f05ba27ed10ce4850409 Merge: 18e352e... ef390c0... Author: Takashi Iwai Date: Thu Jan 29 14:47:53 2009 +0100 Merge branch 'fix/asoc' into for-linus commit ef390c0b6e3f4d2d2d43f53f4bd35e1884571a14 Author: Misael Lopez Cruz Date: Thu Jan 29 13:29:46 2009 +0200 ASoC: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver This patch explicitly initializes McBSP Transmit Configuration Control Register (XCCR) and Receive Configuration Control Register (RCCR) to their reset values. Reset values are 26 ns of DX delay and Transmit DMA disabled for XCCR register; receive full cycle mode enabled and Receive DMA disabled for RCCR register. This patch requires a counterpart in OMAP McBSP driver before to apply it. The required changes in McBSP were sent and approved in linux-omap mailing list and patch is going upstream (commit 3127f8f8595a064b3f1a1837fea2177902589ac3 from linux-omap-2.6 tree). Signed-off-by: Misael Lopez Cruz [ jarkko.nikula@nokia.com: Commit id for counterpart patch corrected ] Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown commit 9e70c1f099c6977d3928879e64fa6af7f903b7b0 Author: Mark Brown Date: Thu Jan 29 13:08:20 2009 +0000 ASoC: Fix null string usage with WM8753 DAIs The WM8753 driver multiplexes the DAI structures it exposes to the outside world, leaving them uninitialised until the codec probes. Since the DAI name is used during the registration and setup process provide a dummy name. Signed-off-by: Mark Brown commit 618b2c8db24522ae273d8299c6a936ea13793c4d Author: Jeremy Fitzhardinge Date: Wed Jan 28 16:50:20 2009 -0800 xen: make sysfs files behave as their names suggest 1: make "target_kb" only accept and produce a memory size in kilobytes. 2: add a second "target" file which produces output in bytes, and will accept memparse input (scaled bytes) This fixes the rather irritating problem that writing the same value read back into target_kb would end up shrinking the domain by a factor of 1024, with generally bad results. Signed-off-by: Jeremy Fitzhardinge Cc: Stable Kernel Cc: "dan.magenheimer@oracle.com" Signed-off-by: Ingo Molnar commit 2c1a3c979ce66e3073c1b87373c0c01a95f847e6 Author: Hans Verkuil Date: Mon Jan 12 18:10:43 2009 -0300 V4L/DVB (10229): ivtv: fix memory leak Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2fd9c2eac31d8b3c1b719c7dfbbfed17c5cbccc4 Author: Jean-Francois Moine Date: Sat Jan 24 07:45:14 2009 -0300 V4L/DVB (10385): gspca - main: Fix memory leak when USB disconnection while streaming. Resetting the streaming flag on disconnection prevented the URBs to be freed when streaming was active. Also, USBs cannot be killed after disconnection (oops in [usbcore] unlink1). Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 9c06210b89e604aa75314d3d173a93292b0d2777 Author: Robert Krakora Date: Sun Jan 25 13:08:07 2009 -0300 V4L/DVB (10325): em28xx: Fix for fail to submit URB with IRQs and Pre-emption Disabled Trace: (Provided by Douglas) BUG: sleeping function called from invalid context at drivers/usb/core/urb.c:558 in_atomic():0, irqs_disabled():1 Pid: 4918, comm: sox Not tainted 2.6.27.5 #1 [] __might_sleep+0xc6/0xcb [] usb_kill_urb+0x1a/0xd8 [] ? __kmalloc+0x9b/0xfc [] ? __kmalloc+0xb8/0xfc [] ? usb_alloc_urb+0xf/0x31 [] em28xx_isoc_audio_deinit+0x2f/0x6c [em28xx_alsa] [] em28xx_cmd+0x1aa/0x1c5 [em28xx_alsa] [] snd_em28xx_capture_trigger+0x53/0x68 [em28xx_alsa] [] snd_pcm_do_start+0x1c/0x23 [snd_pcm] [] snd_pcm_action_single+0x25/0x4b [snd_pcm] [] snd_pcm_action+0x6a/0x76 [snd_pcm] [] snd_pcm_start+0x14/0x16 [snd_pcm] [] snd_pcm_lib_read1+0x66/0x273 [snd_pcm] [] ? snd_pcm_kernel_ioctl+0x46/0x5f [snd_pcm] [] snd_pcm_lib_read+0xbf/0xcd [snd_pcm] [] ? snd_pcm_lib_read_transfer+0x0/0xaf [snd_pcm] [] snd_pcm_oss_read3+0x99/0xdc [snd_pcm_oss] [] snd_pcm_oss_read2+0xa3/0xbf [snd_pcm_oss] [] ? _cond_resched+0x8/0x32 [] snd_pcm_oss_read+0x106/0x150 [snd_pcm_oss] [] ? snd_pcm_oss_read+0x0/0x150 [snd_pcm_oss] [] vfs_read+0x81/0xdc [] sys_read+0x3b/0x60 [] sysenter_do_call+0x12/0x34 ======================= The culprit in the trace is snd_pcm_action() which invokes a spin lock which disables pre-emption which disables an IRQ which causes the __might_sleep() function to fail the irqs_disabled() test. Since pre-emption is enabled then it is safe to de-allocate the memory if you first unlink each URB. In this instance you are safe since pre-emption is disabled. If pre-emption and irqs are not disabled then call usb_kill_urb(), else call usb_unlink_urb(). Thanks to Douglas for tracking down this bug originally!!! [dougsland@redhat.com: Fixed codyingstyle] Signed-off-by: Robert Krakora Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 7f03a5856c1c32ddc7b6b7a31bd43a4ab8e29f90 Author: Alexey Klimov Date: Sun Jan 25 20:07:28 2009 -0300 V4L/DVB (10317): radio-mr800: fix radio->muted and radio->stereo Move radio->muted and radio->stereo in section where radio mutex is locked to avoid possible race condition problems or access to memory. Thanks to David Ellingsworth for pointing to this weak place in driver. Signed-off-by: Alexey Klimov Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 6d9f13c47a009ccbaf40c2e388ab349690dd8000 Author: Hans Verkuil Date: Tue Jan 27 06:20:34 2009 -0300 V4L/DVB (10314): cx25840: ignore TUNER_SET_CONFIG in the command callback. These days TUNER_SET_CONFIG is broadcast to the other i2c devices and that triggers a fw load on the cx25840. Ignore this command since cx25840 isn't a tuner and you really do not want to load the firmware that early. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d1a470fbd987b28e64287718917faf8caf67a055 Author: Antti Palosaari Date: Tue Jan 20 14:56:20 2009 -0300 V4L/DVB (10288): af9015: bug fix: stick does not work always when plugged First control messages to the stick timeouts very often due to probable hw bug. Repeat first message few times if it fails as workaround. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit f0830ebec9993e76b6280e3abb93ceab57b2c923 Author: Antti Palosaari Date: Tue Jan 13 13:08:29 2009 -0300 V4L/DVB (10287): af9015: fix second FE Bug causes 2nd FE MPEG TS buffer size to be zero and therefore no picture when 2nd FE was enabled. Configure correct buffer size also for 2nd FE. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit ba3ed4c57fde2df1a8a5b0c445ae5d685334e5f9 Author: Hans Verkuil Date: Sun Jan 18 15:08:33 2009 -0300 V4L/DVB (10270): saa7146: fix unbalanced mutex_lock/unlock The default case of the switch didn't unlock the mutex. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6dbe7af37def293e1116af186c94e2d47d353190 Author: Tony Broad Date: Sun Jan 18 07:55:38 2009 -0300 V4L/DVB (10265): budget.c driver: Kernel oops: "BUG: unable to handle kernel paging request at ffffffff I'm using a "Hauppauge WinTV-NOVA-T DVB card" of PCI id "13c2:1005" with kernel 2.6.27.9. I've recently experienced the following fairly consistent kernel oops on startup in grundig_29504_401_tuner_set_params from budget.c. As you might expect, following this failure, the card doesn't work. I'm not a kernel developer, nevertheless I seem to have managed to track this down to a non-existent initialisation of budget->dvb_frontend->tuner_priv. The attached patch fixes the problem for me (and I've managed to tune the card successfully as a result), but I don't know of anyone else using the driver so I can't test it on other people. Please let me know if this works for you or if I've done something terribly wrong ;-( BUG: unable to handle kernel paging request at ffffffff IP: [] :budget:grundig_29504_401_tuner_set_params+0x3b/0xf8 *pde = 007e0067 *pte = 00000000 Oops: 0000 [#1] SMP Modules linked in: bridge stp bnep rfcomm l2cap asb100 hwmon_vid hwmon fuse ipt_REJECT nf_conntrack_ipv4 iptable_filter ip_tables ip6t_REJECT xt_tcpudp nf_conntrack_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables x_tables ipv6 loop dm_multipath scsi_dh ppdev snd_cmipci gameport snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_pcm_oss snd_mixer_oss l64781 snd_pcm snd_page_alloc snd_opl3_lib snd_timer parport_pc snd_hwdep parport btusb snd_mpu401_uart budget budget_core snd_rawmidi bluetooth saa7146 snd_seq_device ttpci_eeprom snd soundcore sr_mod i2c_sis96x cdrom dvb_core sis900 i2c_core floppy pcspkr mii sata_sil sg dm_snapshot dm_zero dm_mirror dm_log dm_mod pata_sis ata_generic pata_acpi libata sd_mod scsi_mod crc_t10dif ext3 jbd mbcache uhci_hcd ohci_hcd ehci_hcd [last unloaded: microcode] Pid: 2319, comm: kdvb-fe-0 Not tainted (2.6.27.9-73.fc9.i686 #1) EIP: 0060:[] EFLAGS: 00010286 CPU: 0 EIP is at grundig_29504_401_tuner_set_params+0x3b/0xf8 [budget] EAX: f6417f00 EBX: f6f53808 ECX: 00000000 EDX: ffffffff ESI: f6f94404 EDI: f6417f00 EBP: f6417f10 ESP: f6417ef0 DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 Process kdvb-fe-0 (pid: 2319, ti=f6417000 task=f642b2c0 task.ti=f6417000) Stack: f6e39800 00000000 00000004 f6417f00 c064523c f6f53808 f6f53800 f6f94404 f6417f54 f8b2e45a f6417f24 00000286 f6417f4c f6417f38 00000000 00000286 f6417f3c c064520f f642b2c0 f6417f6c c064456f 00000001 f6f94400 00000001 Call Trace: [] ? _spin_lock_irqsave+0x29/0x30 [] ? apply_frontend_param+0x27/0x357 [l64781] [] ? _spin_lock_irq+0x1c/0x20 [] ? __down_common+0x91/0xbf [] ? dvb_frontend_swzigzag_autotune+0x17d/0x1a4 [dvb_core] [] ? dvb_frontend_swzigzag+0x1ac/0x209 [dvb_core] [] ? dvb_frontend_thread+0x2eb/0x3b3 [dvb_core] [] ? autoremove_wake_function+0x0/0x33 [] ? dvb_frontend_thread+0x0/0x3b3 [dvb_core] [] ? kthread+0x3b/0x61 [] ? kthread+0x0/0x61 [] ? kernel_thread_helper+0x7/0x10 ======================= Code: ec 14 8b 80 00 02 00 00 8b 93 08 02 00 00 8d 7d e4 8b 40 20 89 45 e0 31 c0 85 d2 f3 ab 8d 45 f0 66 c7 45 e8 04 00 89 45 ec 74 09 <0f> b6 02 66 89 45 e4 eb 06 66 c7 45 e4 61 00 8b 0e be 0a 8b 02 EIP: [] grundig_29504_401_tuner_set_params+0x3b/0xf8 [budget] SS:ESP 0068:f6417ef0 Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit bf3647c44bc76c43c4b2ebb4c37a559e899ac70e Author: Ingo Molnar Date: Thu Jan 29 11:45:35 2009 +0100 x86: tone down mtrr_trim_uncached_memory() warning kerneloops.org is reporting a lot of these warnings that come due to vmware not setting up any MTRRs for emulated CPUs: | Reported 709 times (14696 total reports) | BIOS bug (often in VMWare) where the MTRR's are set up incorrectly | or not at all | | This warning was last seen in version 2.6.29-rc2-git1, and first | seen in 2.6.24. | | More info: | http://www.kerneloops.org/searchweek.php?search=mtrr_trim_uncached_memory Keep a one-liner KERN_INFO about it - so that we have so notice if empty MTRRs are caused by native hardware/BIOS weirdness. Signed-off-by: Ingo Molnar commit 8760e5b6d1dc9527e0f96f80daaa12a8158d9839 Author: Devin Heitmueller Date: Sat Jan 17 13:41:54 2009 -0300 V4L/DVB (10261): em28xx: fix kernel panic on audio shutdown Revert a change made in change 9743 which resulted in a kernel panic in some cases on shutdown of the audio stream. First discovered when working on the Pinnacle 880e support, and later reproduced by a user on the mailing list with the HVR-900 as well. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 6e7b9ea0937eeb75fa166ef7bd22b5f3bb5676d1 Author: Robert Krakora Date: Sun Jan 18 21:59:34 2009 -0300 V4L/DVB (10257): em28xx: Fix for KWorld 330U Board Fix for KWorld 330U Board Many thanks to Devin and Mauro!!! Signed-off-by: Robert Krakora Signed-off-by: Mauro Carvalho Chehab commit 7e4b15e4201a101840c226dafe0d3df7ee652bf6 Author: Robert Krakora Date: Sun Jan 18 21:45:28 2009 -0300 V4L/DVB (10256): em28xx: Fix for KWorld 330U AC97 Fix for KWorld 330U AC97 Many thanks to Devin and Mauro again!!! Signed-off-by: Robert Krakora Signed-off-by: Mauro Carvalho Chehab commit 53d12e5a56934c31ca59f3b6f127e5a68e645fd2 Author: Robert Krakora Date: Fri Jan 16 11:23:25 2009 -0300 V4L/DVB (10254): em28xx: Fix audio URB transfer buffer race condition em28xx: Fix audio URB transfer buffer memory leak and race condition/corruption of capture pointer Leak fix kindly contributed by Pádraig Brady. Signed-off-by: Robert Krakora Signed-off-by: Mauro Carvalho Chehab commit ba390f005573bdf6ab7fd78bb05119036c2ed539 Author: Hans Verkuil Date: Thu Jan 15 05:37:14 2009 -0300 V4L/DVB (10250): cx25840: fix regression: fw not loaded on first use With the conversion to v4l2_subdev one bit of code was accidentally dropped: on receiving the first command the driver has to load the fw. A new init() command was introduced to do that explicitly for bridge drivers that are converted to use v4l2_subdev, but old drivers that are not yet converted no longer worked. This patch fixes this regression for these old drivers. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cf8e193a48879a02f55b53c0cf2ec98a784baaa5 Author: Hans Verkuil Date: Sat Jan 17 13:09:11 2009 -0300 V4L/DVB (10248): v4l-dvb: fix a bunch of compile warnings. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 32929fb4c7c4a693ed723253b21e7bf3c8cb4b1c Author: Hans Verkuil Date: Sat Jan 17 11:21:02 2009 -0300 V4L/DVB (10243): em28xx: fix compile warning Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit aeaecaf8eba9efa6a0a623122abb8f61449e42ef Author: Mike Isely Date: Wed Jan 14 04:58:36 2009 -0300 V4L/DVB (10240): Fix obvious swapped names in v4l2_subdev logic The VIDIOC_QUERYCTRL command needs to actually do a queryctrl, not a querymenu. Similarly, the VIDIOC_QUERYMENU command needs to actually do a querymenu not a queryctrl. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit db4b2d193c2d3ad495bcfbce8d4354c1663af2e5 Author: Nicolas Fournier Date: Tue Jan 13 07:15:25 2009 -0300 V4L/DVB (10233): [PATCH] Terratec Cinergy DT XS Diversity new USB ID (0ccd:0081) The following patch adds support for a new version of the Terratec Cinergy DT USB XS Diversity Dual DVB-T TV tuner stick. The USB ID of the new stick is 0ccd:0081. The hardware of the stick has changed, when compared to the first version of this stick, but it still uses quite standard components, so that only minor changes are needed to the sources. The patch has been successfully tested with hotplugging the device and then 2 x tzap and 2 x mplayer, to watch two different TV programs simultaneously. The stick works with both, the old and new firmwares: - dvb-usb-dib0700-1.10.fw and - dvb-usb-dib0700-1.20.fw Signed-off-by: Nicolas Fournier Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit f9129a2e537a4849c5194f98577bc274cda0d726 Author: Hans Verkuil Date: Mon Jan 12 18:12:13 2009 -0300 V4L/DVB (10230): v4l2-device: fix buggy macro Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6e0e12f15a503b7096303d495247fbeaa2b12582 Author: Andy Walls Date: Sun Jan 11 21:18:04 2009 -0300 V4L/DVB (10229): cx88-dvb: Fix order of frontend allocations On Fri, 2009-01-09 at 15:40 +0300, Goga777 wrote: > hI > > With today v4l-dvb I couldn't run my hvr4000 card on 2.6.27 kernel > [ 14.555162] cx88/2: cx2388x dvb driver version 0.0.6 loaded > [ 14.555231] cx88/2: registering cx8802 driver, type: dvb access: shared > [ 14.555303] cx88[0]/2: subsystem: 0070:6900, board: Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid [card=68] > [ 14.555374] cx88[0]/2: cx2388x based DVB/ATSC card > [ 14.555446] BUG: unable to handle kernel NULL pointer dereference at 00000000 > [ 14.555560] IP: [] __mutex_lock_common+0x3c/0xe4 > [ 14.555652] *pde = 00000000 > [ 14.555735] Oops: 0002 [#1] SMP > [ 14.555851] Modules linked in: cx88_dvb(+) cx88_vp3054_i2c videobuf_dvb wm8775 dvb_core tuner_simple tuner_types snd_seq_dummy tda9887 snd_seq_oss(+) snd_intel8x0(+) tda8290 snd_seq_midi snd_seq_midi_event snd_ac97_codec cx88_alsa(+) snd_seq ac97_bus snd_pcm_oss snd_mixer_oss snd_pcm snd_rawmidi snd_timer tuner snd_seq_device psmouse snd serio_raw ivtv(+) cx8800 cx8802 cx88xx soundcore cx2341x ir_common ns558 i2c_i801 v4l2_common videodev i2c_algo_bit gameport v4l1_compat snd_page_alloc tveeprom pcspkr floppy videobuf_dma_sg videobuf_core btcx_risc i2c_core parport_pc parport button intel_agp agpgart shpchp pci_hotplug rng_core iTCO_wdt sd_mod evdev usbhid hid ff_memless ext3 jbd mbcache ide_cd_mod cdrom ide_disk ata_piix libata dock 8139too usb_storage scsi_mod piix 8139cp mii ide_core uhci_hcd ehci_hcd usbcore thermal processor fan thermal_sys > [ 14.557013] > [ 14.557013] Pid: 2310, comm: modprobe Not tainted (2.6.27.1-custom-default1 #1) > [ 14.557013] EIP: 0060:[] EFLAGS: 00010246 CPU: 1 > [ 14.557013] EIP is at __mutex_lock_common+0x3c/0xe4 > [ 14.557013] EAX: de653e98 EBX: de739118 ECX: de739120 EDX: 00000000 > [ 14.557013] ESI: dd4209e0 EDI: de73911c EBP: de653eb0 ESP: de653e88 > [ 14.557013] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 > [ 14.557013] Process modprobe (pid: 2310, ti=de652000 task=dd4209e0 task.ti=de652000) > [ 14.557013] Stack: 3535352e 5d343733 00000002 de739120 de739120 00000000 c044a6c0 de739110 > [ 14.557013] de739118 00000001 de653ebc c02e6d38 c02e6b88 de653ec4 c02e6b88 de653ed8 > [ 14.557013] e1ac7115 de6a9000 00000001 00000000 de653f0c e1aeca62 de739004 de739000 > [ 14.557013] Call Trace: > [ 14.557013] [] ? __mutex_lock_slowpath+0x17/0x1a > [ 14.557013] [] ? mutex_lock+0x12/0x14 > [ 14.557013] [] ? mutex_lock+0x12/0x14 > [ 14.557013] [] ? videobuf_dvb_get_frontend+0x19/0x40 [videobuf_dvb] > [ 14.557013] [] ? cx8802_dvb_probe+0xc9/0x1945 [cx88_dvb] > [ 14.557013] [] ? cx8802_register_driver+0xbd/0x1ac [cx8802] > [ 14.557013] [] ? cx8802_register_driver+0x106/0x1ac [cx8802] > [ 14.557013] [] ? dvb_init+0x22/0x27 [cx88_dvb] > [ 14.557013] [] ? _stext+0x42/0x11a > [ 14.557013] [] ? dvb_init+0x0/0x27 [cx88_dvb] > [ 14.557013] [] ? __blocking_notifier_call_chain+0xe/0x51 > [ 14.557013] [] ? sys_init_module+0x8c/0x17d > [ 14.557013] [] ? syscall_call+0x7/0xb > [ 14.557013] [] ? round_jiffies_relative+0x14/0x16 > [ 14.557013] ======================= > [ 14.557013] Code: 78 04 89 f8 89 55 e0 64 8b 35 00 30 3f c0 e8 2e 0c 00 00 8d 43 08 89 45 e4 8b 53 0c 8d 45 e8 8b 4d e4 89 43 0c 89 4d e8 89 55 ec <89> 02 89 75 f0 83 c8 ff 87 03 48 74 55 8a 45 e0 8b 4d e0 83 e0 > [ 14.557013] EIP: [] __mutex_lock_common+0x3c/0xe4 SS:ESP 0068:de653e88 > [ 14.565211] ---[ end trace 94d8b014e067ac7b ]--- Tested and confirmed to work by several users at linux-media@vger.kernel.org Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 8866f9cf8d85f3614855a49b9d9056f265d0cd33 Author: Mauro Carvalho Chehab Date: Mon Jan 12 21:50:52 2009 -0300 V4L/DVB (10228): em28xx: fix audio output PCM IN selection Some em28xx devices use the PCM IN AC 97 PIN for digital audio. However, currently, the PCM IN selection is not set by the driver. This patch allows specifying the PCM IN expected output, via board description table. Signed-off-by: Mauro Carvalho Chehab commit fc96ab730268b8b652ae2494088e8bd4572f58aa Author: Trent Piepho Date: Mon Jan 12 13:09:46 2009 -0300 V4L/DVB (10226): zoran: Get rid of extra module ref count The zoran driver does a module_get/put of THIS_MODULE on device open/close. This isn't necessary as the kernel does this automatically. Clean up the failure path of zoran_open() somewhat. Make the dprintk()s on open/close a higher debug level and make the user count printed take the current open/close into account. Signed-off-by: Trent Piepho Acked-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 5e098b668977c85838af09005bd96c2e987654f0 Author: Trent Piepho Date: Mon Jan 12 13:09:46 2009 -0300 V4L/DVB (10225): zoran: Remove zr36057_adr field The driver should only use the kernel mapped io address, zr36057_mem, and not the PCI bus address, zr36057_adr. Since the latter is only printed out once, there is no need to save it in the driver data structure. There was some old code that looked like it was for the Alpha architecture which would use the PCI bus address. It probably no longer applies to modern kernels. Signed-off-by: Trent Piepho Acked-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 17faeb20912af5d2a1422fdb606e785f9b1d88ba Author: Trent Piepho Date: Mon Jan 12 13:09:46 2009 -0300 V4L/DVB (10224): zoran: Use pci device table to get card type Instead of using custom code, just let the device layer look it up for us from the pci device table. This requires extending the pci device table to list each known card, plus a catch-all entry for the cards that don't have sub-system vendor/device data. Improve some of the info and error messages too. Signed-off-by: Trent Piepho Acked-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 601139e08339b15997c6ae638dc5bf42c51ea204 Author: Trent Piepho Date: Mon Jan 12 13:09:46 2009 -0300 V4L/DVB (10223): zoran: Remove global device array The driver was keeping a global array with an entry for each zoran device probed. It was a leftover from when the driver didn't dynamically allocate the driver data for each device. There was only one use left, in the video device's ->open() method, looking up the struct zoran for the opened device from the minor number. This can be done better with video_get_drvdata(). Since zoran_num is now only used in the pci driver's ->probe() method, it doesn't need to be an atomic_t and be static. There is a race if multiple zoran cards could be probed at the same time, but currently the probe method for a given driver is single threaded. Signed-off-by: Trent Piepho Acked-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 45bdcefea25cad2d7443f5b45a5319e2bd201048 Author: Trent Piepho Date: Mon Jan 12 13:09:46 2009 -0300 V4L/DVB (10222): zoran: Better syntax for initializing array module params When initializing a module parameter that is a per-card array, use "{ [0 ... (BUZ_MAX-1)] = -1 }" instead of "{ -1, -1, -1, -1 }". This way all of the entries will be correctly set to -1 if someone changes BUZ_MAX to a value other than 4. Adjust some of the parameter help text too. Signed-off-by: Trent Piepho Acked-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 7ef5e025535ee220d7ba45dcd82f05ddce8c3e4c Author: Andy Walls Date: Sat Jan 10 18:04:45 2009 -0300 V4L/DVB (10219): saa7134: Prevent Oops due to stale IRQ status when enabling interrupts When enabling a shared IRQ line, then saa7134_irq handler could be invoked before the driver had completely set up internal structures, due to a shared interrupt line firing. Clear the saa7134 interrupt status reg, before requesting the irq line, so that stale IRQ status isn't processed before the internal structures are set up. Marcin Slusarz recently brought this Oops to the attention of the v4l-dvb lists and provided an initial analysis by investigating reports found here: http://kerneloops.org/guilty.php?guilty=mute_input_7133&version=2.6.27-release&start=1802240&end=1835007&class=oops Reported-by: Marcin Slusarz Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit cd8f894eacf13996d920fdd2aef1afc55156b191 Author: Andy Walls Date: Fri Jan 9 22:59:27 2009 -0300 V4L/DVB (10218): cx23885: Fix Oops for mixed install of analog and digital only cards Analog support for HVR-1250 has not been completed, but does exist for the HVR-1800. Since both cards use the same driver, it tries to create the analog dev for both devices, which is not possible. This causes a NULL error to show up in video_open and mpeg_open. -Mark Iterations through the cx23885_devlist must check for NULL pointers as some supported devices only have DVB support at the moment. Mark Jenks encoutered an Oops in a system with both an HVR-1250 and HVR-1800 installed. -Andy Reported-by: Mark Jenks Tested-by: Mark Jenks Signed-off-by: Mark Jenks Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 0f3559ef17362a7dd5017521a4dd4cad31263395 Author: Martin Dauskardt Date: Sat Jan 10 10:16:16 2009 -0300 V4L/DVB (10216): saa7127: fix broken S-Video with saa7129 Register 0x2d has to be set differently in the saa7129 compared to the saa7127. This was not done correctly, so S-Video was broken in certain circumstances. This fixes a regression introduced in 2.6.28. Signed-off-by: Martin Dauskardt Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 9c17e2ea1e91ed694c3869c860a04507b103f5e6 Author: Hans Verkuil Date: Sat Jan 10 08:31:15 2009 -0300 V4L/DVB (10214): Fix 'stb0899_get_srate' defined but not used warning Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 66aa66ea31371daad562bf22ff245caf707d5d40 Author: Trent Piepho Date: Sun Jan 11 12:02:54 2009 -0300 V4L/DVB (10212): Convert to be a pci driver This is a really old and crufty driver that wasn't using the long established pci driver framework. Signed-off-by: Trent Piepho Acked-by: Jean Delvare [mchehab@redhat.com: Cleaned up a few CodingStyle issues] Signed-off-by: Mauro Carvalho Chehab commit f90c3c0bdd7a3f16eecf1b077f5e031c44ddb605 Author: Simon Harrison Date: Fri Jan 9 09:07:07 2009 -0300 V4L/DVB (10210): Fix a bug on v4lgrab.c v4lgrab breaks the fputc macro on some systems, because of #defined FILE. Also, I also added comments because it was not at all clear that to get gspca cameras to work with this application you need v4l1compat. Signed-off-by: Simon Harrison Signed-off-by: Mauro Carvalho Chehab commit 3e478c06e83efc365e8351bff7b4c569f22e642d Author: Mauro Carvalho Chehab Date: Fri Jan 9 08:38:47 2009 -0300 V4L/DVB (10209): tveeprom: Properly initialize tuner type (BZ#11367) If Hauppauge eeprom is corrupted, the driver returns tuner = 0, instead of TUNER_ABSENT. This makes the drivers to initialize tuner, instead of handling the manual parameter. Since the tuner core rejects that a tuner to have their type changed, this breaks the manual tuner override. Signed-off-by: Mauro Carvalho Chehab commit dbdf03b48bd32150b4023ea0dd22f566958b6294 Author: Mauro Carvalho Chehab Date: Thu Jan 8 23:27:32 2009 -0300 V4L/DVB (10208): zoran: Re-adds udev entry removed by changeset 60b4bde4 Changeset 60b4bde48b36c0315ef41fd38c339b9c7e68c46f removed an unused struct on zoran driver, when compiled with "Y". However, as pointed by Jean Delvare , this is neeeded when the driver is compiled as a module, since udev relies on it to auto-load the module. Signed-off-by: Mauro Carvalho Chehab commit d7e43844e40e07cadc48f1733b9738659f83b38c Author: Matthias Dahl Date: Fri Sep 26 06:29:03 2008 -0300 V4L/DVB (9054): implement proper locking in the dvb ca en50221 driver Concurrent access to a single DVB CA 50221 interface slot is generally discouraged. The underlying drivers (budget-av, budget-ci) do not implement proper locking and thus two transactions could (and do) interfere with on another. This fixes the following problems seen by others and myself: - sudden i/o errors when writing to the ci device which usually would result in an undefined state of the hw and require a software restart - errors about the CAM trying to send a buffer larger than the agreed size usually also resulting in an undefined state of the hw Due the to design of the DVB CA 50221 driver, implementing the locks in the underlying drivers would not be enough and still leave some race conditions, even though they were harder to trigger. Signed-off-by: Matthias Dahl Signed-off-by: Mauro Carvalho Chehab commit 0c37dd7a9052529cd9346b04530be7878c03e429 Author: Sebastian Andrzej Siewior Date: Thu Jan 8 12:49:17 2009 -0300 V4L/DVB (10202): [PATCH] v4l/tvp514x: Don't write after line end to avoid: | tvp514x 0-005c: No platform data | !!<3>tvp514x 0-005d: No platform data Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Mauro Carvalho Chehab commit 77f56279f75b3c1decb4f8a3251b155bb791059e Author: Mauro Carvalho Chehab Date: Thu Jan 8 17:13:53 2009 -0300 V4L/DVB (10201): Fixes cx88 compilation bug Randy Dunlap wrote: > linux-next-20090108/drivers/media/video/cx88/cx88-i2c.c: In function 'cx88_call_i2c_clients': > linux-next-20090108/drivers/media/video/cx88/cx88-i2c.c:122: error: 'struct cx88_core' has no member named 'gate_ctrl' > linux-next-20090108/drivers/media/video/cx88/cx88-i2c.c:123: error: 'struct cx88_core' has no member named 'gate_ctrl' > linux-next-20090108/drivers/media/video/cx88/cx88-i2c.c:127: error: 'struct cx88_core' has no member named 'gate_ctrl' > linux-next-20090108/drivers/media/video/cx88/cx88-i2c.c:128: error: 'struct cx88_core' has no member named 'gate_ctrl' Signed-off-by: Mauro Carvalho Chehab commit 51cac8ada5caaade4eca0023042ceb01edd82840 Author: Laurent Pinchart Date: Sat Jan 3 20:08:26 2009 -0300 V4L/DVB (10199): uvcvideo: Fix GET_DEF failure detection. Commit 44f0079ec74330b457d990072c13cbe28b0f1abf erroneously considers all GET_DEF requests as unsuccessful. Fix this by checking the request return value. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit fba4578ee925110587ef9b8b6ddfabf2ce288071 Author: Laurent Pinchart Date: Sat Jan 3 19:24:38 2009 -0300 V4L/DVB (10198): uvcvideo: Print the UVC version number in binary-coded decimal. The UVC specification release number is a binary-coded decimal number, print it as such. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 2c2d264bb951c1a846b86431d3e784edfb79ab39 Author: Laurent Pinchart Date: Sat Jan 3 19:12:40 2009 -0300 V4L/DVB (10197): uvcvideo: Whitespace and comments cleanup, copyright updates. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit bb1b082ed65292fc6fc7e01bbe0dd005d5a4140e Author: Yusuf Altin Date: Thu Jan 8 07:58:45 2009 -0300 V4L/DVB (10195): [PATCH] add Terratec Cinergy T Express to dibcom driver This patch introduces support for dvb-t for the following dibcom based card: Terratec Cinergy T Express (USB-ID: 0ccd:0062) Signed-off-by: Yusuf Altin Signed-off-by: Albert Comerma Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 16e68d7cb8eb1c671867d2a0ecd4aa2e17124364 Author: Huang Weiyi Date: Tue Jan 6 22:40:56 2009 -0300 V4L/DVB (10193): removed unused #include 's Removed unused #include 's in files below, drivers/media/video/cs5345.c drivers/media/video/pwc/pwc-if.c drivers/media/video/saa717x.c drivers/media/video/upd64031a.c drivers/media/video/upd64083.c drivers/media/video/uvc/uvc_ctrl.c drivers/media/video/uvc/uvc_driver.c drivers/media/video/uvc/uvc_queue.c drivers/media/video/uvc/uvc_video.c drivers/media/video/uvc/uvc_status.c Signed-off-by: Huang Weiyi Acked-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 24c3c41584b9331be5e0d18d46943729a5bd2d4e Author: Mauro Carvalho Chehab Date: Wed Jan 7 22:49:25 2009 -0300 V4L/DVB (10192): em28xx: fix input selection em28xx were trying to access the third input entry, even for boards that don't support it. This patch reviews the input mux selection fixing this bug and a few other troubles, like not validating the input on one userspace ioctl. Signed-off-by: Mauro Carvalho Chehab commit bae7eb33b25387fdc7ccae08768bef1f9484a5b0 Author: Jiri Kosina Date: Wed Jan 28 23:06:37 2009 +0100 HID: document difference between hid_blacklist and hid_ignore_list Many people get it wrong and add device IDs into hid_blacklist instead of hid_ignore_list. Let's put a little comment in place. Signed-off-by: Jiri Kosina commit 656f1fb90aa2261daa316c0dd8f75e3420f81e9e Author: Jarod Wilson Date: Wed Jan 28 21:22:35 2009 +0100 HID: add antec-branded soundgraph imon devices to blacklist hid_ignore_list additions for the Antec-branded SoundGraph iMon VFD and LCD devices (0x15c2:0x0044 and 0x0045). These devices are driven by lirc. Signed-off-by: Jarod Wilson Signed-off-by: Jiri Kosina commit be5d0c837cf8e43458c5757be5df4837a2803d08 Author: Oliver Neukum Date: Wed Jan 28 09:36:18 2009 +0100 HID: fix reversed logic in disconnect testing of hiddev The logic for testing for disconnection is reversed in an ioctl leading to false reports of disconnection. Signed-off-by: Oliver Neukum Tested-by: Folkert van Heusden Signed-off-by: Jiri Kosina commit 0fb21de0799a985d2da3da14ae5625d724256638 Author: Jiri Kosina Date: Wed Jan 14 03:03:21 2009 +0100 HID: adjust report descriptor fixup for MS 1028 receiver Report descriptor fixup for MS 1028 receiver changes also values for Keyboard and Consumer, which incorrectly trims the range, causing correct events being thrown away before passing to userspace. We need to keep the GenDesk usage fixup though, as it reports totally bogus values about axis. Reported-by: Lucas Gadani Signed-off-by: Jiri Kosina commit a9ac49d303f967be0dabd97cb722c4a13109c6c2 Author: Jeff Layton Date: Thu Jan 22 14:43:21 2009 -0500 cifs: make sure we allocate enough storage for socket address The sockaddr declared on the stack in cifs_get_tcp_session is too small for IPv6 addresses. Change it from "struct sockaddr" to "struct sockaddr_storage" to prevent stack corruption when IPv6 is used. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit da505c386c9f993e43861791dae339b2219cf8dd Author: Steve French Date: Mon Jan 19 03:49:35 2009 +0000 [CIFS] Make socket retry timeouts consistent between blocking and nonblocking cases We have used approximately 15 second timeouts on nonblocking sends in the past, and also 15 second SMB timeout (waiting for server responses, for most request types). Now that we can do blocking tcp sends, make blocking send timeout approximately the same (15 seconds). Signed-off-by: Steve French commit f818dd55c4a8b3519e203900bde0bb780d36e799 Author: Steve French Date: Mon Jan 19 02:38:35 2009 +0000 [CIFS] some cleanup to dir.c prior to addition of posix_open Signed-off-by: Steve French commit 42c245447c8c3f998dfe880aba18b6e5129d2976 Author: Steve French Date: Tue Jan 13 22:03:55 2009 +0000 [CIFS] revalidate parent inode when rmdir done within that directory When a search is pending of a parent directory, and a child directory within it is removed, we need to reset the parent directory's time so that we don't reuse the (now stale) search results. Thanks to Gunter Kukkukk for reporting this: > got the following failure notification on irc #samba: > > A user was updating from subversion 1.4 to 1.5, where the > repository is located on a samba share (independent of > unix extensions = Yes or No). > svn 1.4 did work, 1.5 does not. > > The user did a lot of stracing of subversion - and wrote a > testapplet to simulate the failing behaviour. > I've converted the C++ source to C and added some error cases. > > When using "./testdir" on a local file system, "result2" > is always (nil) as expected - cifs vfs behaves different here! > > ./testdir /mnt/cifs/mounted/share > > returns a (failing) valid pointer. Acked-by: Dave Kleikamp Acked-by: Jeff Layton Signed-off-by: Steve French commit 6a7f8d36c00ab7adef5fb633f7805c91e8c1e139 Author: Steve French Date: Mon Jan 12 21:03:25 2009 +0000 [CIFS] Rename md5 functions to avoid collision with new rt modules When rt modules were added they (each) included their own md5 with names which collided with the existing names of cifs's md5 functions. Renaming cifs's md5 modules so we don't collide with them. > Stephen Rothwell wrote: > When CIFS is built-in (=y) and staging/rt28[67]0 =y, there are multiple > definitions of: > > build-r8250.out:(.text+0x1d8ad0): multiple definition of `MD5Init' > build-r8250.out:(.text+0x1dbb30): multiple definition of `MD5Update' > build-r8250.out:(.text+0x1db9b0): multiple definition of `MD5Final' > > all of which need to have more unique identifiers for their global > symbols (e.g., rt28_md5_init, cifs_md5_init, foo, blah, bar). > CC: Greg K-H Signed-off-by: Steve French commit 0496e02d8791e7f06673a19a181be30dad6eff70 Author: Jeff Layton Date: Tue Dec 30 12:39:16 2008 -0500 cifs: turn smb_send into a wrapper around smb_sendv cifs: turn smb_send into a wrapper around smb_sendv Rename smb_send2 to smb_sendv to make it consistent with kernel naming conventions for functions that take a vector. There's no need to have 2 functions to handle sending SMB calls. Turn smb_send into a wrapper around smb_sendv. This also allows us to properly mark the socket as needing to be reconnected when there's a partial send from smb_send. Also, in practice we always use the address and noblocksnd flag that's attached to the TCP_Server_Info. There's no need to pass them in as separate args to smb_sendv. Signed-off-by: Jeff Layton Acked-by: Dave Kleikamp Signed-off-by: Steve French commit c20f326a62c046ee958c3aa584f183201adb229f Author: Takashi Yoshii Date: Wed Jan 28 09:29:13 2009 +0000 sh: Fix up T-bit error handling in SH-4A mutex fastpath. This corrects a deadlock encountered on ap325 in the cases where the mutex is contended and the slow-path needs to be fallen back upon. Signed-off-by: Takashi YOSHII Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 03f07876df2565321871a2dbf33c5c737df185df Author: Paul Mundt Date: Thu Jan 29 11:21:38 2009 +0900 sh: Fix up spurious syscall restarting. The T-bit manipulation for syscall error checking had the side effect of spuriously returning ERESTART* errno values over EINTR. So, we simplify the error checking a bit and leave the T-bit alone. Reported-by: Kaz Kojima Signed-off-by: Paul Mundt commit 0f6dee232f84c11ec195721571763ccae1b82639 Author: Carmelo AMOROSO Date: Wed Oct 15 16:48:16 2008 +0100 sh: fcnvds fix with denormalized numbers on SH-4 FPU. This fixes a bug in the FPU exception handler for the FCNVDS instruction. To get the register number the instruction is shifted right by 9, though it should be shifted right by 8. More information at ST Linux bugzilla: https://bugzilla.stlinux.com/show_bug.cgi?id=4892 Signed-off-by: Giuseppe Di Giore Signed-off-by: Carmelo Amoroso Signed-off-by: Stuart Menefy Signed-off-by: Paul Mundt commit 48865163109690ed988e2d98d6f258ec743c94c7 Author: Christopher SMITH Date: Mon Oct 6 12:46:18 2008 +0100 sh: Only reserve memory under CONFIG_ZERO_PAGE_OFFSET when it != 0. Signed-off-by: Chris Smith Signed-off-by: Stuart Menefy Signed-off-by: Paul Mundt commit cadc4e1a2b4d20d0cc0e81f2c6ba0588775e54e5 Author: Stuart Menefy Date: Fri Dec 12 18:34:38 2008 +0000 sh: Handle calling csum_partial with misaligned data In rare circumstances csum_partial() can be called with data which is not 16 or 32 bit aligned. This is been observed with RPC calls for NFS file systems for example. Add support for handling this without resorting to the misaligned fixup code (which is why this hasn't been seen as a problem). This mimics the i386 version, which has had this support for some time. Signed-off-by: Stuart Menefy Signed-off-by: Paul Mundt commit 3d22fca7ab720818cca19a1ee6820e9dc4485195 Author: Kuninori Morimoto Date: Tue Jan 27 02:46:12 2009 +0000 sh: ap325rxa: Enable ov772x in defconfig. This patch updates the ap325 defconfig to include ov772x camera driver. Old camera is still supported. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 7a65d245fa32d937409e2fc30bb24a85488090de Author: Kuninori Morimoto Date: Thu Jan 22 00:38:31 2009 +0000 sh: ap325rxa: Add ov772x support. This patch add ov772x camera settings to ap325, Old camera is still supported. And it will be 2nd camera if you select ov772x and soc_camera_platform in same time. Signed-off-by: Kuninori Morimoto Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 86746284e20411c66e25bddac391ba821560522b Author: Kuninori Morimoto Date: Thu Jan 22 00:33:21 2009 +0000 sh: ap325rxa: control camera power toggling. Signed-off-by: Kuninori Morimoto Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 334d99072d2b740fa3e0d14e1ac1126805dda2ef Author: Kuninori Morimoto Date: Thu Jan 22 00:18:05 2009 +0000 sh: mach-migor: Enable ov772x and tw9910 in defconfig. This patch updates the Migo-R defconfig to include ov772x camera and tw9910 video driver Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit c3cf5e8cc56d272f828a66610bb78bbb727b2ce1 Author: David S. Miller Date: Wed Jan 21 23:16:40 2009 -0800 sparc: Probe PMU type and record in sparc_pmu_type. Signed-off-by: David S. Miller commit 3eb8057bbafc64dbf09d5c18513aa80c1b7f2fcb Author: David S. Miller Date: Wed Jan 21 21:30:23 2009 -0800 sparc64: Move generic PCR support code to seperate file. It all lives in the oprofile support code currently and we will need to share this stuff with NMI watchdog and perf_counter support. Signed-off-by: David S. Miller commit 7cbcf22548df1f1df7c6b0d0bda579b92efca63c Author: Randy Dunlap Date: Tue Jan 20 16:29:13 2009 -0800 driver-core: fix kernel-doc parameter name Fix function parameter name in kernel-doc: Warning(linux-next-20090120//drivers/base/core.c:1289): No description found for parameter 'dev' Warning(linux-next-20090120//drivers/base/core.c:1289): Excess function parameter 'root' description in 'root_device_unregister' Signed-off-by: Randy Dunlap Acked-by: Mark McLoughlin Signed-off-by: Greg Kroah-Hartman commit 6a1b699678c8c0d45f88a37b32358a9e82bef6bb Author: Hans J. Koch Date: Wed Jan 7 00:12:37 2009 +0100 UIO: Add missing documentation of features added recently The following features were added to the UIO framework in the near past: * Generic drivers for platform devices (uio_pdrv, uio_pdrv_genirq) * an "offset" sysfs attribute for memory mappings Unfortunately, all this went in without documentation (won't happen again...) This patch updates UIO documentation. Signed-off-by: Hans J. Koch Acked-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 720893fd5fb6de1f752f816a89e630f08ae8b20a Author: Tsugikazu Shibata Date: Fri Jan 23 09:59:50 2009 +0900 Sync patch for jp_JP/stable_kernel_rules.txt Updated jp_JP/stable_kernel_rules.txt due to changes in the main version of the file. Also, this patch is already reviewed by Japanese translation community called JF. Signed-off-by: Tsugikazu Shibata Signed-off-by: Greg Kroah-Hartman commit dcbbcefb6a6d540b605421e85fbaa4cea3fef5a2 Author: Roel Kluin Date: Wed Jan 28 22:14:17 2009 +0100 Staging: poch: fix verification of memory area fix verification of memory area Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 05d6d677ab4b975697c6a987f1dffdc55d61a160 Author: Roel Kluin Date: Fri Dec 19 23:37:30 2008 +0100 Staging: usbip: usbip_start_threads(): handle kernel_thread failure kernel_thread may fail, notice this. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit e48d94dac7eef16b4a4f246bf7b8df0f00cc0aec Author: Geert Uytterhoeven Date: Mon Jan 12 09:19:42 2009 +0100 staging: agnx: drivers/staging/agnx/agnx.h needs On m68k: drivers/staging/agnx/agnx.h: In function 'agnx_read32': drivers/staging/agnx/agnx.h:10: error: implicit declaration of function 'ioread32' drivers/staging/agnx/agnx.h: In function 'agnx_write32': drivers/staging/agnx/agnx.h:15: error: implicit declaration of function 'iowrite32' drivers/staging/agnx/sta.c: In function 'get_sta_power': drivers/staging/agnx/sta.c:94: error: implicit declaration of function 'memcpy_fromio' drivers/staging/agnx/sta.c: In function 'set_sta_power': drivers/staging/agnx/sta.c:103: error: implicit declaration of function 'memcpy_toio' Signed-off-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman commit 1176e83aff6f15b6ae4d1b53c16124884ad29363 Author: Oleg Nesterov Date: Sun Jan 18 18:17:20 2009 +0100 Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal Compile tested. task_struct->signal is not protected by RCU, the code is bogus. Change the code to take ->siglock to pin ->signal. Signed-off-by: Oleg Nesterov Cc: Arve Hjønnevåg Cc: Brian Swetland Signed-off-by: Greg Kroah-Hartman commit 191805ac41a63929003faa33365027d3fb924d71 Author: Arve Hjønnevåg Date: Wed Jan 14 16:54:16 2009 -0800 Staging: android: Add lowmemorykiller documentation. Signed-off-by: Arve Hjønnevåg Signed-off-by: Greg Kroah-Hartman commit 07960058f0ce77ddc3027d3e45a5de1fb977334f Author: Greg Kroah-Hartman Date: Wed Jan 28 15:42:43 2009 -0800 Staging: android: fix build error on 64bit boxes ktime_t isn't ment to directly access on all arches, so use the proper conversion functions instead to figure out what time is remaining. Reported-by: Randy Dunlap Cc: Arve Hjønnevåg Cc: Mike Lockwood Signed-off-by: Greg Kroah-Hartman commit 2d0db6bf5010c26beb1ccbd4ee50991fd2c05d90 Author: Arve Hjønnevåg Date: Thu Jan 8 16:48:46 2009 -0800 Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25. Reported-by: Randy Dunlap Cc: Mike Lockwood Signed-off-by: Greg Kroah-Hartman commit c171ac36b74f6c90bc7a03c309136ba175314b6d Author: Arve Hjønnevåg Date: Thu Jan 8 15:28:50 2009 -0800 Staging: android: binder: fix arm build errors Reported-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 7c5151fbf134e082bc7f2c0ed02684ed12578b3b Author: Greg Kroah-Hartman Date: Fri Jan 16 18:01:57 2009 -0800 Staging: meilhaus: fix Kbuild The Meilhaus drivers do not like being built into the kernel right now, so force them to be a module. Reported-by: Kamalesh Babulal Reported-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit c69a1f09430c7a62b87af89383998256fcf07685 Author: Greg Kroah-Hartman Date: Fri Jan 16 17:59:15 2009 -0800 Staging: comedi: fix Kbuild comedi doesn't like being built into the kernel right now, so force it to be a module. Reported-by: Kamalesh Babulal Reported-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 5e2125677fd72d36396cc537466e07ffcbbd4b2b Author: Stefan Richter Date: Wed Jan 28 01:03:34 2009 +0100 firewire: sbp2: fix DMA mapping leak on the failure path Reported-by: FUJITA Tomonori who also provided a first version of the fix. Signed-off-by: Stefan Richter commit f746072abc12d0e10ecd7847f1846157fde15987 Author: Stefan Richter Date: Sat Jan 24 19:41:46 2009 +0100 firewire: sbp2: define some magic numbers as macros Signed-off-by: Stefan Richter commit a08e100aece16e33a45b82924ad85f4066c4ed1c Author: Stefan Richter Date: Sat Jan 24 19:41:46 2009 +0100 firewire: sbp2: fix payload limit at S1600 and S3200 1394-2008 clause 16.3.4.1 (1394b-2002 clause 16.3.1.1) defines tighter limits than 1394-2008 clause 6.2.2.3 (1394a-2000 clause 6.2.2.3). Our previously too large limit doesn't matter though if the controller reports its max_receive correctly. Signed-off-by: Stefan Richter commit c1fbdd78517a9323ea5f5767c8ceb10aabc40fc2 Author: Stefan Richter Date: Sat Jan 24 19:41:46 2009 +0100 ieee1394: sbp2: don't assume zero model_id or firmware_revision if there is none This makes sbp2 behave more like firewire-sbp2 which reports 0xff000000 as immediate value if there are no unit directory entries for model_id or firmware_revision. It does not reduce matches with the currently existing quirks table; the only zero entry there is for a device which actually does have a zero model_id. It only changes how model_id and firmware_revision are logged if they are missing. Other functionally unrelated changes: The model_id member of quirks list entries is renamed to model; the value (but not the effect) of SBP2_ROM_VALUE_WILDCARD is changed. Now this part of the source is identical with firewire-sbp2 for easier maintenance. Signed-off-by: Stefan Richter commit d3e3e970e3722c51e3fd3b042b6065d4bfaf6f81 Author: Stefan Richter Date: Sat Jan 24 19:41:46 2009 +0100 ieee1394: sbp2: fix payload limit at S1600 and S3200 1394-2008 clause 16.3.4.1 (1394b-2002 clause 16.3.1.1) defines tighter limits than 1394-2008 clause 6.2.2.3 (1394a-2000 clause 6.2.2.3). Our previously too large limit doesn't matter though if the controller reports its max_receive correctly. Signed-off-by: Stefan Richter commit 4106ceff15495a7df1617e78bbf3e852fe6601c9 Author: Stefan Richter Date: Mon Jan 19 19:20:31 2009 +0100 ieee1394: sbp2: update a help string Signed-off-by: Stefan Richter commit 82d4b90debaa7ab3590335c1b641eb3d2ebb164e Author: Stefan Richter Date: Mon Jan 19 19:19:55 2009 +0100 ieee1394: support for speeds greater than S800 The hard-wired configuration of the top speed (until now S800) was unnecessary, remove it. If the local link layer controller supports S1600 or S3200, we now assume this speed for all present 1394b PHYs (except if they are behind 1394a repeaters) until nodemgr figured out the actual speed while fetching the config ROM. Signed-off-by: Stefan Richter commit 08e445bd6a98fa09befe0cf6d67705324f913fc6 Author: Nicolas Pitre Date: Fri Jan 16 23:02:54 2009 +0100 [ARM] 5366/1: fix shared memory coherency with VIVT L1 + L2 caches When there are multiple L1-aliasing userland mappings of the same physical page, we currently remap each of them uncached, to prevent VIVT cache aliasing issues. (E.g. writes to one of the mappings not being immediately visible via another mapping.) However, when we do this remapping, there could still be stale data in the L2 cache, and an uncached mapping might bypass L2 and go straight to RAM. This would cause reads from such mappings to see old data (until the dirty L2 line is eventually evicted.) This issue is solved by forcing a L2 cache flush whenever the shared page is made L1 uncacheable. Ideally, we would make L1 uncacheable and L2 cacheable as L2 is PIPT. But Feroceon does not support that combination, and the TEX=5 C=0 B=0 encoding for XSc3 doesn't appear to work in practice. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 4a29d2005b0f28d018d36d209c47f3973a725df5 Author: Adrian Hunter Date: Tue Jan 27 15:22:54 2009 +0200 UBIFS: fix LPT out-of-space bug (again) The function to traverse and dirty the LPT was still not dirtying all nodes, with the result that the LPT could run out of space. Signed-off-by: Adrian Hunter Signed-off-by: Artem Bityutskiy commit ecbab71c521819716e204659dfe72fc39d00630a Author: Russell King Date: Tue Jan 27 23:20:00 2009 +0000 [ARM] call undefined instruction exception handler with irqs enabled Aaro says: > With spinlock debugs enabled I get might_sleep() warnings when using > ptrace. tracked down to a missing enable_irq before calling do_undefinstr(). Reported-by: Aaro Koskinen Tested-by: Aaro Koskinen Signed-off-by: Russell King commit 9ce8bb55e32d11bb82e19e76bdd2cf1c2ed32fd1 Author: Russell King Date: Tue Jan 27 22:44:12 2009 +0000 [ARM] msm: fix build errors arch/arm/mach-msm/board-halibut.c:45: error: implicit declaration of function 'MSM_GPIO_TO_INT' arch/arm/mach-msm/board-halibut.c:45: error: initializer element is not constant arch/arm/mach-msm/board-halibut.c:45: error: (near initialization for 'smc91x_resources[1].start') arch/arm/mach-msm/board-halibut.c:46: error: initializer element is not constant arch/arm/mach-msm/board-halibut.c:46: error: (near initialization for 'smc91x_resources[1].end') Signed-off-by: Russell King commit a71558d0eca1bbb23737f832297926666f9b36db Author: Russell King Date: Tue Jan 27 22:32:29 2009 +0000 [ARM] etherh: continue fixing build failure Further to 483a2b3a3182abcb7fcea986d7ea13e793bb00b1, also fix: drivers/net/arm/etherh.c:649: error: 'eth_set_mac_addr' undeclared here (not in a function) Signed-off-by: Russell King commit 3718909448116bf4411445468c58acc946379f92 Author: David Rientjes Date: Tue Jan 27 18:59:46 2009 -0800 slub: fix per cpu kmem_cache_cpu array memory leak The per cpu array of kmem_cache_cpu structures accomodates NR_KMEM_CACHE_CPU such structs. When this array overflows and a struct is allocated by kmalloc(), it may have an address at the upper bound of this array. If this happens, it does not get freed and the per cpu kmem_cache_cpu_free pointer will be out of bounds after kmem_cache_destroy() or cpu offlining. Cc: Christoph Lameter Signed-off-by: David Rientjes Signed-off-by: Pekka Enberg commit 2a88464ceb1bda2571f88902fd8068a6168e3f7b Author: Luke Yelavich Date: Wed Jan 28 15:58:38 2009 +1100 ALSA: hda - add another MacBook Pro 4, 1 subsystem ID Add another MacBook Pro 4,1 SSID (106b:3800). It seems that latter revisions, (at least mine), have different IDs to earlier revisions. Signed-off-by: Luke Yelavich Signed-off-by: Takashi Iwai commit a4e6db07984529847c6ad8bc616485e721dcb809 Author: David S. Miller Date: Tue Jan 27 22:41:03 2009 -0800 ipv6: Make mc_forwarding sysctl read-only. The kernel manages this value internally, as necessary, as VIFs are added/removed and as multicast routers are registered and deregistered. Signed-off-by: David S. Miller commit 1d6e55f195128813f96458203a9fa14204f9251e Author: Thomas Goff Date: Tue Jan 27 22:39:59 2009 -0800 IPv6: Fix multicast routing bugs. This patch addresses the IPv6 multicast routing issues described below. It was tested with XORP 1.4/1.5 as the IPv6 PIM-SM routing daemon against FreeBSD peers. net/ipv6/ip6_input.c: - Don't try to forward link-local multicast packets. - Don't reset skb2->dev before calling ip6_mr_input() so packets can be identified as coming from the PIM register vif properly. net/ipv6/ip6mr.c: - Fix incoming PIM register messages processing: * The IPv6 pseudo-header should be included when checksumming PIM messages (RFC 4601 section 4.9; RFC 3973 section 4.7.1). * Packets decapsulated from PIM register messages should have skb->protocol ETH_P_IPV6. - Enable/disable IPv6 multicast forwarding on the corresponding interface when a routing daemon adds/removes a multicast virtual interface. - Remove incorrect skb_pull() to fix userspace signaling. - Enable/disable global IPv6 multicast forwarding when an IPv6 multicast routing socket is opened/closed. net/ipv6/route.c: - Don't use strict routing logic for packets decapsulated from PIM register messages (similar to disabling rp_filter for the IPv4 case). Signed-off-by: Thomas Goff Reviewed-by: Fred Templin Signed-off-by: David S. Miller commit 6c06a478c9e59d1584a5dc1b2b3519bae5d6546a Author: Jiri Pirko Date: Tue Jan 27 22:30:19 2009 -0800 net: fix xfrm reverse flow lookup for icmp6 This patch fixes the xfrm reverse flow lookup for icmp6 so that icmp6 packets don't get lost over ipsec tunnels. Similar patch is in RHEL5 kernel for a quite long time and I do not see why it isn't in mainline. Signed-off-by: Jiri Pirko Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 94cd3e6cbebf85903b4d53ed2147bdb4c6e08625 Author: Eric Dumazet Date: Tue Jan 27 17:45:10 2009 -0800 net: wrong test in inet_ehash_locks_alloc() In commit 9db66bdcc83749affe61c61eb8ff3cf08f42afec (net: convert TCP/DCCP ehash rwlocks to spinlocks), I forgot to change one occurrence of rwlock_t to spinlock_t I believe sizeof(raw_spinlock_t) might be > 0 on !CONFIG_SMP if CONFIG_DEBUG_SPINLOCK while sizeof(raw_rwlock_t) should be 0 in this case. Fortunatly, CONFIG_DEBUG_SPINLOCK adds fields to both spinlock_t and rwlock_t, but at this might change in the future (being able to debug spinlocks but not rwlocks for example), better to be safe. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 15b2bee22a0390d951301b53e83df88d0350c499 Author: Jesse Brandeburg Date: Tue Jan 27 16:41:58 2009 -0800 e1000: fix bug with shared interrupt during reset A nasty bug was found where an MTU change (or anything else that caused a reset) could race with the interrupt code. The interrupt code was entered by a shared interrupt during the MTU change. This change prevents the interrupt code from running while the driver is in the middle of its reset path. Signed-off-by: Jesse Brandeburg Signed-off-by: David S. Miller commit 71a082efc9fdc12068a3cee6cebb1330b00ebeee Author: Matthew Garrett Date: Tue Jan 27 01:03:35 2009 +0000 PCI hotplug: Change link order of pciehp & acpiphp Some hardware exposes PCIE slots in such a way that they can be claimed by either the acpiphp or pciehp driver. pciehp is the preferred driver if the firmware allows the OS to claim control via the _OSC method so should be loaded first - if it fails to bind (either due to a missing _OSC method or the firmware refusing to hand off control) then we can fall back to acpiphp or a vendor-specific driver. This patch simply changes the link order to ensure that pciehp will be initialised before acpiphp if both are statically built into the kernel. Signed-off-by: Matthew Garrett Acked-by: Randy Dunlap Signed-off-by: Jesse Barnes commit 1cf3eb2ff6b0844c678f2f48d0053b9d12b7da67 Author: Jeff Mahoney Date: Tue Jan 27 23:48:59 2009 +0200 kmalloc: return NULL instead of link failure The SLAB kmalloc with a constant value isn't consistent with the other implementations because it bails out with __you_cannot_kmalloc_that_much rather than returning NULL and properly allowing the caller to fall back to vmalloc or take other action. This doesn't happen with a non-constant value or with SLOB or SLUB. Starting with 2.6.28, I've been seeing build failures on s390x. This is due to init_section_page_cgroup trying to allocate 2.5MB when the max size for a kmalloc on s390x is 2MB. It's failing because the value is constant. The workarounds at the call size are ugly and the caller shouldn't have to change behavior depending on what the backend of the API is. So, this patch eliminates the link failure and returns NULL like the other implementations. Signed-off-by: Jeff Mahoney Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Christoph Lameter Cc: Pekka Enberg Cc: Matt Mackall Cc: Nick Piggin Cc: [2.6.28.x] Signed-off-by: Andrew Morton Signed-off-by: Pekka Enberg commit f0e0059b9c18426cffdcc04161062251a8f9741e Author: Eric Sandeen Date: Sun Jan 25 20:53:00 2009 -0600 don't reallocate sxp variable passed into xfs_swapext fixes kernel.org bugzilla 12538, xfs_fsr fails on 2.6.29-rc kernels Regression caused by 743bb4650da9e2595d6cedd01c680b5b9398c74a This was an embarrasing mistake, reallocating the sxp pointer passed in from the main ioctl switch. Signed-off-by: Eric Sandeen Tested-by: Paul Martin Reviewed-by: Felix Blyakher Signed-off-by: Felix Blyakher commit bf4162bcf82ebc3258d6bc0ddd6453132abde72d Author: Darrick J. Wong Date: Tue Nov 25 13:51:44 2008 -0800 PCI hotplug: fakephp: Allocate PCI resources before adding the device For PCI devices, pci_bus_assign_resources() must be called to set up the pci_device->resource array before pci_bus_add_devices() can be called, else attempts to load drivers results in BAR collision errors where there are none. This is not done in fakephp, so devices can be "unplugged" but scanning the parent bus won't bring the devices back due to resource unallocation. Move the pci_bus_add_device-calling logic into pci_rescan_bus and preface it with a call to pci_bus_assign_resources so that we only have to (re)allocate resources once per bus where a new device is found. Signed-off-by: Darrick J. Wong Acked-by: Alex Chiang Signed-off-by: Jesse Barnes commit bffac3c593eba1f9da3efd0199e49ea6558a40ce Author: Matthew Wilcox Date: Wed Jan 21 19:19:19 2009 -0500 PCI MSI: Fix undefined shift by 32 Add an msi_mask() function which returns the correct bitmask for the number of MSI interrupts you have. This fixes an undefined bug in msi_capability_init(). Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 476e7faefc43f106a90b5c96166c59b75de19d30 Author: Rafael J. Wysocki Date: Thu Jan 22 23:39:57 2009 +0100 PCI PM: Do not wait for buses in B2 or B3 during resume pci_restore_standard_config() adds extra delay for PCI buses in low power states (B2 or B3), but this is only correct for buses in B2, because the buses in B3 are reset when they are put back into B0. Thus we should wait for such buses to settle after the reset, but it's not a good idea to wait that long (1.1 s) with interrupts off. On the other hand, we have never waited for buses in B2 and B3 during resume and it seems reasonable to go back to this well tested behaviour. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 48f67f54a53bb68619a63c3f38cf7f502ed74b1d Author: Rafael J. Wysocki Date: Thu Jan 22 23:38:31 2009 +0100 PCI PM: Power up devices before restoring their state Devices that have MSI-X enabled before suspend to RAM or hibernation and that are in a low power state during resume will not be handled correctly by pci_restore_standard_config(). Namely, it first calls pci_restore_state() which calls pci_restore_msi_state(), which in turn executes __pci_restore_msix_state() that accesses the device's memory space to restore the contents of the MSI-X table. However, if the device is in a low power state at this point, it's memory space is not accessible. The easiest way to fix this potential problem is to make pci_restore_standard_config() call pci_restore_state() after it has put the device into the full power state, D0. Fortunately, all of this is done with interrupts off, so the change of ordering should not cause any trouble. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 545ffd58adc86b8d33449dab44fe81b503a6f81b Author: Rafael J. Wysocki Date: Thu Jan 22 23:36:56 2009 +0100 PCI PM: Fix hibernation breakage on EeePC 701 Hibernation breaks on EeePC 701 as a result of attempting to put one of its (driverless) devices into a low power state. Avoid that by not attepmting to power manage driverless devices during hibernation. Signed-off-by: Rafael J. Wysocki Reported-and-tested-by: Alan Jenkins Signed-off-by: Jesse Barnes commit 57064d213d2e44654d4f13c66df135b5e7389a26 Author: Seth Heasley Date: Fri Jan 23 12:43:38 2009 -0800 PCI: irq and pci_ids patch for Intel Tigerpoint DeviceIDs This patch adds the Intel Tigerpoint LPC Controller DeviceIDs. Signed-off-by: Seth Heasley Signed-off-by: Jesse Barnes commit 418e4da33f45fd7bdcce48778b149b780ff730bc Author: Rafael J. Wysocki Date: Mon Jan 26 21:43:08 2009 +0100 PCI PM: Fix suspend error paths and testing facility breakage If one of device drivers refuses to suspend by returning error code from its ->suspend() callback, the devices that have already been suspended are resumed by executing their drivers' ->resume() callbacks. Some of these callbacks expect the device's configuration space to be restored if the device has been put into D3 before they are called. Unfortunately, this mechanism has been broken by recent changes moving the restoration of config spaces of some devices (most importantly, USB controllers and HDA Intel) into the resume callbacks executed with interrupts off. Obviously, these callbacks are not invoked in the suspend error path and, as a result, the system cannot be successfully brought back into the working state in case of a suspend error. The same thing happens in the hibernation error path right before putting the system into S4. Similarly, the suspend testing facility associated with the /sys/power/pm_test file is broken, because it uses the very same mechanism that is used in the suspend and hibernation error paths. Fix the breakage by making the PCI core restore the configuration spaces of PCI devices that haven't been restored already before pci_pm_resume() is called for those devices by the PM core. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 766fb95ba06e1bbf531d30dc05e21b2d4a0e8dd2 Author: Sidney Amani Date: Tue Jan 27 10:11:46 2009 +0100 UBI: allow direct user-space I/O Introduce a new ioctl UBI_IOCSETPROP to set properties on a volume. Also add the first property: UBI_PROP_DIRECT_WRITE, this property is used to set the ability to use direct writes in userspace Signed-off-by: Sidney Amani Signed-off-by: Corentin Chary Signed-off-by: Artem Bityutskiy commit 6f7ab6d458bbfc2f55d295fa3e6b9e69cdb1d517 Author: Artem Bityutskiy Date: Tue Jan 27 16:12:31 2009 +0200 UBIFS: fix no_chk_data_crc When data CRC checking is disabled, UBIFS returns incorrect return code from the 'try_read_node()' function (0 instead of 1, which means CRC error), which make the caller re-read the data node again, but using a different code patch, so the second read is fine. Thus, we read the same node twice. And the result of this is that UBIFS is slower with no_chk_data_crc option than it is with chk_data_crc option. This patches fixes the problem. Reported-by: Reuben Dowle Signed-off-by: Artem Bityutskiy commit 5801f992276366cd6a4f1f9939a4c9da33d499ee Author: Takashi Iwai Date: Tue Jan 27 12:53:22 2009 +0100 ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n sound/pci/hda/patch_conexant.c:352: warning: 'conexant_add_jack' defined but not used Signed-off-by: Takashi Iwai commit aa9d823bb347fb66cb07f98c686be8bb85cb6a74 Author: Joerg Schirottke Date: Tue Jan 27 11:01:34 2009 +0100 ALSA: hda - Add quirk for HP DV6700 laptop Added the matching model=laptop for HP DV6700 laptop. Signed-off-by: Joerg Schirottke Signed-off-by: Takashi Iwai commit 9fa5fdf291c9b58b1cb8b4bb2a0ee57efa21d635 Author: Dimitris Michailidis Date: Mon Jan 26 22:15:31 2009 -0800 tcp: Fix length tcp_splice_data_recv passes to skb_splice_bits. tcp_splice_data_recv has two lengths to consider: the len parameter it gets from tcp_read_sock, which specifies the amount of data in the skb, and rd_desc->count, which is the amount of data the splice caller still wants. Currently it passes just the latter to skb_splice_bits, which then splices min(rd_desc->count, skb->len - offset) bytes. Most of the time this is fine, except when the skb contains urgent data. In that case len goes only up to the urgent byte and is less than skb->len - offset. By ignoring len tcp_splice_data_recv may a) splice data tcp_read_sock told it not to, b) return to tcp_read_sock a value > len. Now, tcp_read_sock doesn't handle used > len and leaves the socket in a bad state (both sk_receive_queue and copied_seq are bad at that point) resulting in duplicated data and corruption. Fix by passing min(rd_desc->count, len) to skb_splice_bits. Signed-off-by: Dimitris Michailidis Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit a7a41acf99d9150b424839b0d7b4f5ad9d211e2d Author: Manish Katiyar Date: Mon Jan 26 21:54:21 2009 -0800 r6040: Remove unused variable pdev from drivers/net/r6040.c drivers/net/r6040.c:441: warning: unused variable 'pdev' Signed-off-by: Manish Katiyar Signed-off-by: David S. Miller commit 98322f22eca889478045cf896b572250d03dc45f Author: Eric Dumazet Date: Mon Jan 26 21:35:35 2009 -0800 udp: optimize bind(0) if many ports are in use commit 9088c5609584684149f3fb5b065aa7f18dcb03ff (udp: Improve port randomization) introduced a regression for UDP bind() syscall to null port (getting a random port) in case lot of ports are already in use. This is because we do about 28000 scans of very long chains (220 sockets per chain), with many spin_lock_bh()/spin_unlock_bh() calls. Fix this using a bitmap (64 bytes for current value of UDP_HTABLE_SIZE) so that we scan chains at most once. Instead of 250 ms per bind() call, we get after patch a time of 2.9 ms Based on a report from Vitaly Mayatskikh Reported-by: Vitaly Mayatskikh Signed-off-by: Eric Dumazet Tested-by: Vitaly Mayatskikh Signed-off-by: David S. Miller commit 8527bec548e01a29c6d1928d20d6d3be71861482 Author: Ira W. Snyder Date: Mon Jan 26 21:00:33 2009 -0800 virtio_net: use correct accessors for scatterlists Without this fix, virtio_net makes incorrect usage of scatterlists. It sets the end of the scatterlist chain after the first element, despite the fact that more entries come after it. If you try to run dma_map_sg() on one of the scatterlists given to you by add_buf(), you will get a null pointer oops. Signed-off-by: Ira W. Snyder Signed-off-by: Rusty Russell Signed-off-by: David S. Miller commit 9fd9784c91db79e953ea3fe3741f885bdc390a72 Author: Thadeu Lima de Souza Cascardo Date: Mon Jan 26 19:26:26 2009 -0500 ext4: Fix building with EXT4FS_DEBUG When bg_free_blocks_count was renamed to bg_free_blocks_count_lo in 560671a0, its uses under EXT4FS_DEBUG were not changed to the helper ext4_free_blks_count. Another commit, 498e5f24, also did not change everything needed under EXT4FS_DEBUG, thus making it spill some warnings related to printing format. This commit fixes both issues and makes ext4 build again when EXT4FS_DEBUG is enabled. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: "Theodore Ts'o" commit fdff73f094e7220602cc3f8959c7230517976412 Author: Theodore Ts'o Date: Mon Jan 26 19:06:41 2009 -0500 ext4: Initialize the new group descriptor when resizing the filesystem Make sure all of the fields of the group descriptor are properly initialized. Previously, we allowed bg_flags field to be contain random garbage, which could trigger non-deterministic behavior, including a kernel OOPS. http://bugzilla.kernel.org/show_bug.cgi?id=12433 Signed-off-by: "Theodore Ts'o" Cc: stable@kernel.org commit 3a9f84d354ce1e19956083c8e691727dea33bd5a Author: Ed Swierk Date: Mon Jan 26 15:33:31 2009 -0800 signals, debug: fix BUG: using smp_processor_id() in preemptible code in print_fatal_signal() With print-fatal-signals=1 on a kernel with CONFIG_PREEMPT=y, sending an unexpected signal to a process causes a BUG: using smp_processor_id() in preemptible code. get_signal_to_deliver() releases the siglock before calling print_fatal_signal(), which calls show_regs(), which calls smp_processor_id(), which is not supposed to be called from a preemptible thread. Make sure show_regs() runs with preemption disabled. Signed-off-by: Ed Swierk Signed-off-by: Ingo Molnar commit 30a0fb947a68ad3ab8a7184e3b3d79dce10e3688 Author: H. Peter Anvin Date: Mon Jan 26 09:40:58 2009 -0800 x86: correct the CPUID pattern for MSR_IA32_MISC_ENABLE availability Impact: re-enable CPUID unmasking on affected processors As far as I am capable of discerning from the documentation, MSR_IA32_MISC_ENABLE should be available for all family 0xf CPUs, as well as family 6 for model >= 0xd (newer Pentium M). The documentation on this isn't ideal, so we need to be on the lookout for errors, still. Signed-off-by: H. Peter Anvin commit 6ba87c9b920bea8c2703308d31eb7de925242c30 Author: Artem Bityutskiy Date: Mon Jan 26 16:12:20 2009 +0200 UBIFS: fix assertions I introduce wrong assertions in one of the previous commits, this patch fixes them. Also, initialize debugfs after the debugging check. This is a little nicer because we want the FS data to be accessible to external users after everything has been initialized. Signed-off-by: Artem Bityutskiy commit 49d128aa60751a010640f4763d11577e2f508853 Author: Adrian Hunter Date: Mon Jan 26 10:55:40 2009 +0200 UBIFS: ensure orphan area head is initialized When mounting read-only the orphan area head is not initialized. It must be initialized when remounting read/write, but it was not. This patch fixes that. [Artem: sorry, added comment tweaking noise] Signed-off-by: Adrian Hunter Signed-off-by: Artem Bityutskiy commit b4978e949104844224ecf786170c9263efa601f3 Author: Artem Bityutskiy Date: Fri Jan 23 18:23:03 2009 +0200 UBIFS: always clean up GC LEB space When we mount UBIFS, GC LEB may contain out-of-date information, and UBIFS should update lprops and set free space for thei LEB. Currently UBIFS does this only if mounted R/W. But for R/O mount we have to do the same, because otherwise we will have incorrect FS free space reported to user-space. Signed-off-by: Artem Bityutskiy commit 84abf972ccff5c13d10b672972949eba431a6e0e Author: Artem Bityutskiy Date: Fri Jan 23 14:54:59 2009 +0200 UBIFS: add re-mount debugging checks We observe space corrupted accounting when re-mounting. So add some debbugging checks to catch problems like this. Signed-off-by: Artem Bityutskiy commit e4d9b6cbfc98d696a28d2c24a3d49768695811ee Author: Artem Bityutskiy Date: Fri Jan 23 14:17:36 2009 +0200 UBIFS: fix LEB list freeing When freeing the c->idx_lebs list, we have to release the LEBs as well, because we might be called from mount to read-only mode code. Otherwise the LEBs stay taken forever, which may cause problems when we re-mount back ro RW mode. Signed-off-by: Artem Bityutskiy commit 82c1593cad3dfc97661764c8bc62aa1a416e9ea8 Author: Artem Bityutskiy Date: Tue Jan 20 16:46:02 2009 +0200 UBIFS: simplify locking This patch simplifies lock_[23]_inodes functions. We do not have to care about locking order, because UBIFS does this for @i_mutex and this is enough. Thanks to Al Viro for suggesting this. Signed-off-by: Artem Bityutskiy commit e747a5c0be3efe5465e45c8e326bc766b1288be6 Author: Stefan Richter Date: Sat Jan 24 20:35:38 2009 +0100 firewire: core: optimize card shutdown This fixes a regression by "firewire: keep highlevel drivers attached during brief connection loss": There were 2 seconds unnecessary waiting added to the shutdown procedure of each controller. We use card->link as status flag to signal the device handler that there is no use to wait for a come-back. Signed-off-by: Stefan Richter commit 64c634ef83991b390ec0503e61f16efb0ba3c60b Author: Stefan Richter Date: Tue Jan 20 19:09:58 2009 +0100 ieee1394: ohci1394: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others Camcorders have a tendency to fail read requests to their config ROM and write request to their FCP command register with ack_busy_X. This has become a problem with newer kernels and especially Panasonic camcorders, causing AV/C in dvgrab and kino to fail. Dvgrab for example frequently logs "send oops"; kino reports loss of AV/C control. I suspect that lower CPU scheduling latencies in newer kernels made this issue more prominent now. According to https://sourceforge.net/tracker/?func=detail&atid=114103&aid=2492640&group_id=14103 this can be fixed by configuring the FireWire controller for more hardware retries for request transmission; these retries are evidently more successful than libavc1394's own retry loop (typically 3 tries on top of hardware retries). Presumably the same issue has been reported at https://bugzilla.redhat.com/show_bug.cgi?id=449252 and https://bugzilla.redhat.com/show_bug.cgi?id=477279 . Tested-by: Mathias Beilstein Signed-off-by: Stefan Richter commit 8b7b6afaa84708d08139daa08538ca3e56c351f1 Author: Stefan Richter Date: Tue Jan 20 19:10:58 2009 +0100 firewire: ohci: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others Camcorders have a tendency to fail read requests to their config ROM and write request to their FCP command register with ack_busy_X. This has become a problem with newer kernels and especially Panasonic camcorders, causing AV/C in dvgrab and kino to fail. Dvgrab for example frequently logs "send oops"; kino reports loss of AV/C control. I suspect that lower CPU scheduling latencies in newer kernels made this issue more prominent now. According to https://sourceforge.net/tracker/?func=detail&atid=114103&aid=2492640&group_id=14103 this can be fixed by configuring the FireWire controller for more hardware retries for request transmission; these retries are evidently more successful than libavc1394's own retry loop (typically 3 tries on top of hardware retries). Presumably the same issue has been reported at https://bugzilla.redhat.com/show_bug.cgi?id=449252 and https://bugzilla.redhat.com/show_bug.cgi?id=477279 . In a quick test with a JVC camcorder (which didn't malfunction like the reported camcorders), this change decreased the number of ack_busy_X from 16 in three runs of dvgrab to 4 in three runs of the same capture duration. Signed-off-by: Stefan Richter commit b006854955254a971096c120d4ef115a7c6145fb Author: Stefan Richter Date: Mon Jan 5 20:43:23 2009 +0100 firewire: ohci: change "context_stop: still active" log message The present message is mostly just noise. We only need to be notified if the "active" flag does not go off before the retry loop terminates. Signed-off-by: Stefan Richter commit 8f5140a6a0b1a9aa79585b0008e88c5d266c5c1d Author: David Vrabel Date: Fri Jan 23 12:57:20 2009 +0000 uwb: lock rc->rsvs_lock with spin_lock_bh() rc->rsvs_lock may be taken in a timer so lock it with spin_lock_bh(). Signed-off-by: David Vrabel commit 00a602db1ce9d61319d6f769dee206ec85f19bda Author: Takashi Iwai Date: Fri Jan 23 11:55:42 2009 +0100 ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs The reference NID for the analog outputs of STAC/IDT codecs is set to a fixed number 0x02. But this isn't always correct and in many codecs it points to a non-existing NID. This patch fixes the initialization of the PCM reference NID taken from the actually probed DAC list. Signed-off-by: Takashi Iwai commit dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4 Merge: a5e6ced... f3b8436... Author: David Vrabel Date: Thu Jan 22 19:12:32 2009 +0000 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream commit ba2607fe9c1f2d4ad5a3d4c4ae9117c5bfdca826 Author: Markus Metzger Date: Mon Jan 19 10:38:35 2009 +0100 x86, ds, bts: cleanup/fix DS configuration Cleanup the cpuid check for DS configuration. This also fixes a Corei7 CPUID enumeration bug. Signed-off-by: Markus Metzger Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 91a8d07d82cac3aae3ef2ea1aaba5c9c4a934e91 Author: Steven Rostedt Date: Wed Jan 21 18:45:57 2009 -0500 ring-buffer: reset timestamps when ring buffer is reset Impact: fix bad times of recent resets The ring buffer needs to reset its timestamps when reseting of the buffer, otherwise the timestamps are stale and might be used to calculate times in the buffer causing funny timestamps to appear. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 1092307d582a7566d23779c304cf86f3075ac5f0 Author: Steven Rostedt Date: Thu Jan 15 23:40:11 2009 -0500 trace: set max latency variable to zero on default Impact: trace max latencies on start of latency tracing This patch sets the max latency to zero whenever one of the irq variant tracers or the wakeup tracer is set to current tracer. Most developers expect to see output when starting up a latency tracer. But since the max_latency is already set to max, and it takes a latency greater than max_latency to be recorded, there is no trace. This is not the expected behavior and has even confused myself. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit a442e5e0a2011af5b2d1f118fee0a8f9079f1d88 Author: Steven Rostedt Date: Wed Jan 14 14:50:19 2009 -0500 trace: stop all recording to ring buffer on ftrace_dump Impact: limit ftrace dump output Currently ftrace_dump only calls ftrace_kill that is a fast way to prevent the function tracer functions from being called (just sets a flag and clears the function to call, nothing else). It is better to also turn off any recording to the ring buffers as well. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit faf6861ebd776871e77b761c43ec045cd20b5716 Author: Steven Rostedt Date: Wed Jan 14 12:24:42 2009 -0500 trace: print ftrace_dump at KERN_EMERG log level Impact: fix to print out ftrace_dump when expected I was debugging a hard race condition to only find out that after I hit the race, my log level was not at level to show KERN_INFO. The time it took to trigger the race was wasted because I did not capture the trace. Since ftrace_dump is only called from kernel oops (and only when it is set in the kernel command line to do so), or when a developer adds it to their own local tree, the log level of the print should be at KERN_EMERG to make sure the print appears. ftrace_dump is not called by a normal user setup, and will not add extra unwanted print out to the console. There is no reason it should be at KERN_INFO. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 551b4048b3d4acf15aff9fe4aed89b892c135b02 Author: Lai Jiangshan Date: Mon Jan 12 11:06:18 2009 +0800 ring_buffer: reset write when reserve buffer fail Impact: reset struct buffer_page.write when interrupt storm if struct buffer_page.write is not reset, any succedent committing will corrupted ring_buffer: static inline void rb_set_commit_to_write(struct ring_buffer_per_cpu *cpu_buffer) { ...... cpu_buffer->commit_page->commit = cpu_buffer->commit_page->write; ...... } when "if (RB_WARN_ON(cpu_buffer, next_page == reader_page))", ring_buffer is disabled, but some reserved buffers may haven't been committed. we need reset struct buffer_page.write. when "if (unlikely(next_page == cpu_buffer->commit_page))", ring_buffer is still available, we should not corrupt it. Signed-off-by: Lai Jiangshan Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 00f57f545afa422db3003b0d0b30a30f8de7ecb2 Author: Frederic Weisbecker Date: Wed Jan 14 13:33:27 2009 -0800 tracing/function-graph-tracer: fix a regression while suspend to disk Impact: fix a crash while kernel image restore When the function graph tracer is running and while suspend to disk, some racy and dangerous things happen against this tracer. The current task will save its registers including the stack pointer which contains the return address hooked by the tracer. But the current task will continue to enter other functions after that to save the memory, and then it will store other return addresses, and finally loose the old depth which matches the return address saved in the old stack (during the registers saving). So on image restore, the code will return to wrong addresses. And there are other things: on restore, the task will have it's "current" pointer overwritten during registers restoring....switching from one task to another... That would be insane to try to trace function graphs at these stages. This patch makes the function graph tracer listening on power events, making it's tracing disabled for the current task (the one that performs the hibernation work) while suspend/resume to disk, making the tracing safe during hibernation. Signed-off-by: Frederic Weisbecker Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 3d36a0df3b473fb53531484df227f2da8bc7494b Author: Stefan Richter Date: Sat Jan 17 22:45:54 2009 +0100 firewire: keep highlevel drivers attached during brief connection loss There are situations when nodes vanish from the bus and come back quickly thereafter: - When certain bus-powered hubs are plugged in, - when certain devices are plugged into 6-port hubs, - when certain disk enclosures are switched from self-power to bus power or vice versa and break the daisy chain during the transition, - when the user plugs a cable out and quickly plugs it back in, e.g. to reorder a daisy chain (works on Mac OS X if done quickly enough), - when certain hubs temporarily malfunction during high bus traffic. Until now, firewire-core reported affected nodes as lost to the highlevel drivers (firewire-sbp2 and userspace drivers). We now delay the destruction of device representations until after at least two seconds after the last bus reset. If a "new" device is detected in this period whose bus information block and root directory header match that of a device which is pending for deletion, we resurrect that device and send update calls to highlevel drivers. Signed-off-by: Stefan Richter commit 8cd0bbbdff7471163cc6a058be8b8610ddd01d6b Author: Stefan Richter Date: Mon Mar 24 20:56:40 2008 +0100 firewire: unnecessary BM delay after generation rollover Noticed by Jarod Wilson: The bus manager work was unnecessarily delayed each time the bus generation counter rolled over. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit a5c7f4710fba334bf613d705f97b4471b36446f8 Author: Stefan Richter Date: Wed Mar 19 22:02:40 2008 +0100 firewire: insist on successive self ID complete events The whole topology code only works if the old and new topologies which are compared come from immediately successive self ID complete events. If there happened bus resets without self ID complete events in the meantime, or self ID complete events with invalid selfIDs, the topology comparison could identify nodes wrongly, or more likely just corrupt kernel memory or panic right away. We now discard all nodes of the old topology and treat all current nodes as new ones if the current self ID generation is not the previous one plus 1. Signed-off-by: Stefan Richter Signed-off-by: Jarod Wilson commit 36b477d005fbda29e7581c3cef7ee31a59d8970b Author: Artem Bityutskiy Date: Tue Jan 20 18:04:09 2009 +0200 UBI: fix resource de-allocation GregKH asked to fix UBI which has fake device release method. Indeed, we have to free UBI device description object from the release method, because otherwise we'll oops is someone opens a UBI device sysfs file, then the device is removed, and he reads the file. With this fix, he will get -ENODEV instead of an oops. Signed-off-by: Artem Bityutskiy commit 8c4c19f1367435afdc16ac122a2a95a4d6cff9f0 Author: Artem Bityutskiy Date: Tue Jan 20 17:48:02 2009 +0200 UBI: remove unused variable Signed-off-by: Artem Bityutskiy commit e7f07968c16bdd9480001c0a9de013ba56889cf9 Author: Theodore Ts'o Date: Tue Jan 20 09:50:19 2009 -0500 ext4: Fix ext4_free_blocks() w/o a journal when files have indirect blocks When trying to unlink a file with indirect blocks on a filesystem without a journal, the "circular indirect block" sanity test was getting falsely triggered. Signed-off-by: "Theodore Ts'o" commit 082605de5f82eb692cc90f7fda071cc01bb5ac34 Author: Steven Rostedt Date: Mon Jan 19 14:32:51 2009 -0500 ring-buffer: fix alignment problem Impact: fix to allow some archs to use the ring buffer Commits in the ring buffer are checked by pointer arithmetic. If the calculation is incorrect, then the commits will never take place and the buffer will simply fill up and report an error. Each page in the ring buffer has a small header: struct buffer_data_page { u64 time_stamp; local_t commit; unsigned char data[]; }; Unfortuntely, some of the calculations used sizeof(struct buffer_data_page) to know the size of the header. But this is incorrect on some archs, where sizeof(struct buffer_data_page) does not equal offsetof(struct buffer_data_page, data), and on those archs, the commits are never processed. This patch replaces the sizeof with offsetof. Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 7078202e55b565582fcbd831a8dd3069bdc72610 Author: Artem Bityutskiy Date: Mon Jan 19 19:57:27 2009 +0200 UBIFS: document dark_wm and dead_wm better Just add more commentaries. Also some commentary fixes for lprops flags. Signed-off-by: Artem Bityutskiy commit a50412e3f8ce95d7ed558370d7dde5171fd04283 Author: Artem Bityutskiy Date: Tue Jan 6 19:54:02 2009 +0200 UBIFS: do not treat all data as short term UBIFS wrongly tells UBI that all data is short term. Use proper hints instead. Thanks to Xiaochuan-Xu for noticing this. Signed-off-by: Artem Bityutskiy commit f90d4118bacef87894621a3e8aba853fa0c89abc Author: Miao Xie Date: Fri Jan 16 10:24:10 2009 +0800 cpuset: fix possible deadlock in async_rebuild_sched_domains Lockdep reported some possible circular locking info when we tested cpuset on NUMA/fake NUMA box. ======================================================= [ INFO: possible circular locking dependency detected ] 2.6.29-rc1-00224-ga652504 #111 ------------------------------------------------------- bash/2968 is trying to acquire lock: (events){--..}, at: [] flush_work+0x24/0xd8 but task is already holding lock: (cgroup_mutex){--..}, at: [] cgroup_lock_live_group+0x12/0x29 which lock already depends on the new lock. ...... ------------------------------------------------------- Steps to reproduce: # mkdir /dev/cpuset # mount -t cpuset xxx /dev/cpuset # mkdir /dev/cpuset/0 # echo 0 > /dev/cpuset/0/cpus # echo 0 > /dev/cpuset/0/mems # echo 1 > /dev/cpuset/0/memory_migrate # cat /dev/zero > /dev/null & # echo $! > /dev/cpuset/0/tasks This is because async_rebuild_sched_domains has the following lock sequence: run_workqueue(async_rebuild_sched_domains) -> do_rebuild_sched_domains -> cgroup_lock But, attaching tasks when memory_migrate is set has following: cgroup_lock_live_group(cgroup_tasks_write) -> do_migrate_pages -> flush_work This patch fixes it by using a separate workqueue thread. Signed-off-by: Miao Xie Signed-off-by: Lai Jiangshan Signed-off-by: Ingo Molnar commit 3013ee31b6c5fd9a49a81816d6c13e1cdb7a1288 Author: Artem Bityutskiy Date: Fri Jan 16 19:08:43 2009 +0200 UBI: use nicer 64-bit math Get rid of 'do_div()' and use more user-friendly primitives from 'linux/math64.h'. Signed-off-by: Artem Bityutskiy commit f429b2ea8eadb5a576542a70f7fd6f5c2a7455e1 Author: Artem Bityutskiy Date: Fri Jan 16 18:06:55 2009 +0200 UBI: add ioctl compatibility UBI ioctl's do not work when running 64-bit kernel and 32-bit user-land. Fix this by adding the compat_ioctl method. Also, UBI serializes all ioctls, so more than one ioctl at a time is not a problem. Amd UBI does not seem to depend on anything else, so use unlocked_ioctl instead of ioctl (no BKL needed). Reported-by: Geert Uytterhoeven Signed-off-by: Artem Bityutskiy Reviewed-by: Arnd Bergmann commit e8b815663b1bfd9c255af5176604ec0eafdf6ed7 Author: Artem Bityutskiy Date: Thu Jan 15 17:43:23 2009 +0200 UBIFS: constify operations Mark super, file, and inode operation structcutes with 'const'. Signed-off-by: Artem Bityutskiy commit dedb0d48a9d4d57086526b94a4b64da789a646e4 Author: Artem Bityutskiy Date: Fri Jan 9 21:02:37 2009 +0200 UBIFS: do not commit twice VFS calls '->sync_fs()' twice - first time with @wait = 0, second time with @wait = 1. As a result, we may commit and synchronize write-buffers twice. Avoid doing this by returning immediatelly if @wait = 0. Signed-off-by: Artem Bityutskiy commit 4d187a88d3ee3be6a1a0b6859eb00f70e1601b5e Author: Jan Engelhardt Date: Sun Jan 11 23:55:39 2009 +0100 UBI: constify file operations Signed-off-by: Jan Engelhardt Signed-off-by: Artem Bityutskiy commit ade44ce07c9316351ae321051221c9bad3af3a44 Author: Artem Bityutskiy Date: Fri Jan 16 18:03:22 2009 +0200 UBI: allow all ioctls Some ioctl's in UBI are enabled only when debugging is switched on. There is not particular reason for this, just noone needed them. However, some people need the now for their user-space development. Thus, allow these ioctl's even if UBI debugging is disabled. Signed-off-by: Artem Bityutskiy commit 573135b5dbc02be12940558db23158cc9ee89c66 Author: Artem Bityutskiy Date: Fri Jan 16 18:02:08 2009 +0200 UBI: remove unnecessry header inclusion Signed-off-by: Artem Bityutskiy commit f7fc6f3f33703e3365c0ef9d4bf322b88cc9dae7 Author: Artem Bityutskiy Date: Wed Jan 7 16:10:58 2009 +0200 UBI: improve ioctl commentaries Signed-off-by: Artem Bityutskiy commit a27ce8f55dd5fddf0b8ea179cce8f399c13dc94f Author: Corentin Chary Date: Mon Jan 5 14:48:59 2009 +0100 UBI: add ioctl for is_mapped operation This patch adds ioctl to check if an LEB is mapped or not (as a debugging option so far). [Re-named ioctl to make it look the same as the other one and made some minor stylistic changes. Artem Bityutskiy.] Signed-off-by: Corentin Chary Signed-off-by: Artem Bityutskiy commit c3da23be1673be4e738aea235604b4e6cb259655 Author: Corentin Chary Date: Mon Jan 5 14:46:19 2009 +0100 UBI: add ioctl for unmap operation This patch adds ioctl for the LEB unmap operation (as a debugging option so far). [Re-named ioctl to make it look the same as the other one and made some minor stylistic changes. Artem Bityutskiy.] Signed-off-by: Corentin Chary Signed-off-by: Artem Bityutskiy commit 141e6ebd1b1759bd5cebf092b7216b6f1c7b4c4f Author: Corentin Chary Date: Mon Jan 5 14:44:11 2009 +0100 UBI: add ioctl for map operation This patch adds ioctl for the LEB map operation (as a debugging option so far). [Re-named ioctl to make it look the same as the other one and made some minor stylistic changes. Artem Bityutskiy.] Signed-off-by: Corentin Chary Signed-off-by: Artem Bityutskiy commit 08ec8c3878cea0bf91f2ba3c0badf44b383752d0 Author: Theodore Ts'o Date: Fri Jan 16 11:57:00 2009 -0500 jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs" Otherwise it can be very confusing to find a "EXT3-fs: " failure in the middle of EXT4-fs failures, and it makes it harder to track the source of the failure. Signed-off-by: "Theodore Ts'o" commit a21102b55c4f8dfd3adb4a15a34cd62237b46039 Author: Theodore Ts'o Date: Fri Jan 16 11:13:47 2009 -0500 ext3: Add sanity check to make_indexed_dir Make sure the rec_len field in the '..' entry is sane, lest we overrun the directory block and cause a kernel oops on a purposefully corrupted filesystem. This fixes a bug related to a bug originally reported by Sami Liedes for ext4 at: http://bugzilla.kernel.org/show_bug.cgi?id=12430 Signed-off-by: "Theodore Ts'o" Cc: stable@kernel.org commit e6b8bc09ba2075cd91fbffefcd2778b1a00bd76f Author: Theodore Ts'o Date: Fri Jan 16 11:13:40 2009 -0500 ext4: Add sanity check to make_indexed_dir Make sure the rec_len field in the '..' entry is sane, lest we overrun the directory block and cause a kernel oops on a purposefully corrupted filesystem. Thanks to Sami Liedes for reporting this bug. http://bugzilla.kernel.org/show_bug.cgi?id=12430 Signed-off-by: "Theodore Ts'o" Cc: stable@kernel.org commit 06a279d636734da32bb62dd2f7b0ade666f65d7c Author: Theodore Ts'o Date: Sat Jan 17 18:41:37 2009 -0500 ext4: only use i_size_high for regular files Directories are not allowed to be bigger than 2GB, so don't use i_size_high for anything other than regular files. E2fsck should complain about these inodes, but the simplest thing to do for the kernel is to only use i_size_high for regular files. This prevents an intentially corrupted filesystem from causing the kernel to burn a huge amount of CPU and issuing error messages such as: EXT4-fs warning (device loop0): ext4_block_to_path: block 135090028 > max Thanks to David Maciejak from Fortinet's FortiGuard Global Security Research Team for reporting this issue. http://bugzilla.kernel.org/show_bug.cgi?id=12375 Signed-off-by: "Theodore Ts'o" Cc: stable@kernel.org commit 9e6f8ed7c3a303d37eb119847dd3029701e37e28 Author: Balaji Rao Date: Wed Jan 14 13:02:00 2009 +0100 mfd: Remove non exported references from pcf50633 Remove references to set_irq_type and handle_level_irq which are not exported to modules Signed-off-by: Balaji Rao Signed-off-by: Samuel Ortiz commit 14819ea1e0bcbdc9b084cd60a6a24d5d786324ef Author: Ingo Molnar Date: Wed Jan 14 12:34:21 2009 +0100 irq: export __set_irq_handler() and handle_level_irq() Impact: build fix ARM updates broke x86 allmodconfig builds: ERROR: "__set_irq_handler" [drivers/mfd/pcf50633-core.ko] undefined! ERROR: "handle_level_irq" [drivers/mfd/pcf50633-core.ko] undefined! Signed-off-by: Ingo Molnar commit c225aa57ff4ffe715df4692676b77c815a337236 Author: Simon Holm Thøgersen Date: Sun Jan 11 22:34:01 2009 -0500 ext4: fix wrong use of do_div the following warning: fs/jbd2/journal.c: In function ‘jbd2_seq_info_show’: fs/jbd2/journal.c:850: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 3 has type ‘uint32_t’ is caused by wrong usage of do_div that modifies the dividend in-place and returns the quotient. So not only would an incorrect value be displayed, but s->journal->j_average_commit_time would also be changed to a wrong value! Fix it by using div_u64 instead. Signed-off-by: Simon Holm Thøgersen Signed-off-by: "Theodore Ts'o" commit a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c Author: David Vrabel Date: Wed Jan 7 10:54:22 2009 +0000 wusb: timeout when waiting for ASL/PZL updates in whci-hcd Timeout if an ASL or PZL update doesn't not complete and reset the hardware. Signed-off-by: David Vrabel commit a23e66f3b8cfdedec14541e71ef29a754870a20c Merge: 04c470a... ede6f5a... Author: David Vrabel Date: Wed Jan 7 10:45:25 2009 +0000 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream commit 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab Author: Huang Weiyi Date: Sun Jan 4 11:13:50 2009 +0800 uwb: remove unused #include 's Remove unused #include 's in file(s) below, drivers/uwb/allocator.c Signed-off-by: Huang Weiyi Signed-off-by: David Vrabel commit 9a9b1d17ba59b78e4bae67f7a7cf546986a42e7d Author: David Vrabel Date: Tue Jan 6 17:58:02 2009 +0000 wusb: return -ENOTCONN when resetting a port with no connected device If reading the device descriptor fails during hub_port_init() fails, then the port is disabled, disconnecting the device. The port is then reset at the start of the next init attempt but there is no device to reset. Signed-off-by: David Vrabel commit 2226b1c219a18804bc40e32a5d53c287a6c925d9 Author: David Vrabel Date: Tue Jan 6 17:55:32 2009 +0000 uwb: safely remove all reservations When removing all reservations during shutdown, terminate them first and then wait for any pending timeout work to complete. This prevents the timeout work from running after the reservation has been freed. Signed-off-by: David Vrabel