commit 82d6897fefca6206bca7153805b4c5359ce97fc4 Author: Linus Torvalds Date: Sat Jul 15 14:53:08 2006 -0700 Linux 2.6.18-rc2 Finishing up for the kernel summit. Ottawa, here I come. Signed-off-by: Linus Torvalds commit b5032a50aea76b6230db74b1d171a7f56b204bb7 Author: Jeff Dike Date: Fri Jul 14 15:52:23 2006 -0400 [PATCH] UML - fix utsname build breakage Some -mm-only material leaked into a patch destined for mainline, and I didn't notice. This was the replacement of system_utsname with utsname() that's required by the uts namespace patch. This patch reverts those changes (which are correct in -mm) so that mainline UML builds again. Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds commit 6d76fa58b050044994fe25f8753b8023f2b36737 Author: Linus Torvalds Date: Sat Jul 15 12:26:45 2006 -0700 Don't allow chmod() on the /proc// files This just turns off chmod() on the /proc// files, since there is no good reason to allow it, and had we disallowed it originally, the nasty /proc race exploit wouldn't have been possible. The other patches already fixed the problem chmod() could cause, so this is really just some final mop-up.. This particular version is based off a patch by Eugene and Marcel which had much better naming than my original equivalent one. Signed-off-by: Eugene Teo Signed-off-by: Marcel Holtmann Signed-off-by: Linus Torvalds commit 92d032855e64834283de5acfb0463232e0ab128e Author: Linus Torvalds Date: Sat Jul 15 12:20:05 2006 -0700 Mark /proc MS_NOSUID and MS_NOEXEC Not that we really need this any more, but at the same time there's no reason not to do this. Signed-off-by: Linus Torvalds commit 2724a1a55f847e2b5007cf294e03cfa09d0d22f3 Author: Dave Jones Date: Sat Jul 15 03:41:12 2006 -0400 [PATCH] sch_htb compile fix. net/sched/sch_htb.c: In function 'htb_change_class': net/sched/sch_htb.c:1605: error: expected ';' before 'do_gettimeofday' Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 52393ccc0a53c130f31fbbdb8b40b2aadb55ee72 Author: Steven Rostedt Date: Fri Jul 14 16:05:03 2006 -0400 [PATCH] remove set_wmb - arch removal set_wmb should not be used in the kernel because it just confuses the code more and has no benefit. Since it is not currently used in the kernel this patch removes it so that new code does not include it. All archs define set_wmb(var, value) to do { var = value; wmb(); } while(0) except ia64 and sparc which use a mb() instead. But this is still moot since it is not used anyway. Hasn't been tested on any archs but x86 and x86_64 (and only compiled tested) Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit f92213bae062cf88c099fbfd3040fef512b19905 Author: Steven Rostedt Date: Fri Jul 14 16:05:01 2006 -0400 [PATCH] remove set_wmb - doc update This patch removes the reference to set_wmb from memory-barriers.txt since it shouldn't be used. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit bb129994c3bff9c5e8df91f05d7e9b6402fbd83f Author: Shailabh Nagar Date: Fri Jul 14 00:24:47 2006 -0700 [PATCH] Remove down_write() from taskstats code invoked on the exit() path In send_cpu_listeners(), which is called on the exit path, a down_write() was protecting operations like skb_clone() and genlmsg_unicast() that do GFP_KERNEL allocations. If the oom-killer decides to kill tasks to satisfy the allocations,the exit of those tasks could block on the same semphore. The down_write() was only needed to allow removal of invalid listeners from the listener list. The patch converts the down_write to a down_read and defers the removal to a separate critical region. This ensures that even if the oom-killer is called, no other task's exit is blocked as it can still acquire another down_read. Thanks to Andrew Morton & Herbert Xu for pointing out the oom related pitfalls, and to Chandra Seetharaman for suggesting this fix instead of using something more complex like RCU. Signed-off-by: Chandra Seetharaman Signed-off-by: Shailabh Nagar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9fd8914c1acca0d98b69d831b128d5b52f03c51 Author: Shailabh Nagar Date: Fri Jul 14 00:24:47 2006 -0700 [PATCH] per-task delay accounting taskstats interface: control exit data through cpumasks On systems with a large number of cpus, with even a modest rate of tasks exiting per cpu, the volume of taskstats data sent on thread exit can overflow a userspace listener's buffers. One approach to avoiding overflow is to allow listeners to get data for a limited and specific set of cpus. By scaling the number of listeners and/or the cpus they monitor, userspace can handle the statistical data overload more gracefully. In this patch, each listener registers to listen to a specific set of cpus by specifying a cpumask. The interest is recorded per-cpu. When a task exits on a cpu, its taskstats data is unicast to each listener interested in that cpu. Thanks to Andrew Morton for pointing out the various scalability and general concerns of previous attempts and for suggesting this design. [akpm@osdl.org: build fix] Signed-off-by: Shailabh Nagar Signed-off-by: Balbir Singh Signed-off-by: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8924363da07aec213e5d359f23eeae1fff91951 Author: Shailabh Nagar Date: Fri Jul 14 00:24:46 2006 -0700 [PATCH] per-task delay accounting: avoid send without listeners Don't send taskstats (per-pid or per-tgid) on thread exit when no one is listening for such data. Currently the taskstats interface allocates a structure, fills it in and calls netlink to send out per-pid and per-tgid stats regardless of whether a userspace listener for the data exists (netlink layer would check for that and avoid the multicast). As a result of this patch, the check for the no-listener case is performed early, avoiding the redundant allocation and filling up of the taskstats structures. Signed-off-by: Balbir Singh Signed-off-by: Shailabh Nagar Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e06d3f9f6b14f6e3120923ed215032726246c98 Author: Shailabh Nagar Date: Fri Jul 14 00:24:45 2006 -0700 [PATCH] per task delay accounting taskstats interface: documentation fix Change documentation and example program to reflect the flow control issues being addressed by the cpumask changes. Signed-off-by: Shailabh Nagar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad4ecbcba72855a2b5319b96e2a3a65ed1ca3bfd Author: Shailabh Nagar Date: Fri Jul 14 00:24:44 2006 -0700 [PATCH] delay accounting taskstats interface send tgid once Send per-tgid data only once during exit of a thread group instead of once with each member thread exit. Currently, when a thread exits, besides its per-tid data, the per-tgid data of its thread group is also sent out, if its thread group is non-empty. The per-tgid data sent consists of the sum of per-tid stats for all *remaining* threads of the thread group. This patch modifies this sending in two ways: - the per-tgid data is sent only when the last thread of a thread group exits. This cuts down heavily on the overhead of sending/receiving per-tgid data, especially when other exploiters of the taskstats interface aren't interested in per-tgid stats - the semantics of the per-tgid data sent are changed. Instead of being the sum of per-tid data for remaining threads, the value now sent is the true total accumalated statistics for all threads that are/were part of the thread group. The patch also addresses a minor issue where failure of one accounting subsystem to fill in the taskstats structure was causing the send of taskstats to not be sent at all. The patch has been tested for stability and run cerberus for over 4 hours on an SMP. [akpm@osdl.org: bugfixes] Signed-off-by: Shailabh Nagar Signed-off-by: Balbir Singh Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25890454667b3295f67b3372352be90705f8667c Author: Shailabh Nagar Date: Fri Jul 14 00:24:43 2006 -0700 [PATCH] per-task-delay-accounting: /proc export of aggregated block I/O delays Export I/O delays seen by a task through /proc//stats for use in top etc. Note that delays for I/O done for swapping in pages (swapin I/O) is clubbed together with all other I/O here (this is not the case in the netlink interface where the swapin I/O is kept distinct) [akpm@osdl.org: printk warning fix] Signed-off-by: Shailabh Nagar Signed-off-by: Balbir Singh Cc: Jes Sorensen Cc: Peter Chubb Cc: Erich Focht Cc: Levent Serinol Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3baf649ca9ca0a96fba538f03b0f17c043b755c Author: Shailabh Nagar Date: Fri Jul 14 00:24:42 2006 -0700 [PATCH] per-task-delay-accounting: documentation Some documentation for delay accounting. Signed-off-by: Shailabh Nagar Signed-off-by: Balbir Singh Cc: Jes Sorensen Cc: Peter Chubb Cc: Erich Focht Cc: Levent Serinol Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f44993fe1d7b2b097f6ac60cd5835c6f5ca0874 Author: Shailabh Nagar Date: Fri Jul 14 00:24:41 2006 -0700 [PATCH] per-task-delay-accounting: delay accounting usage of taskstats interface Usage of taskstats interface by delay accounting. Signed-off-by: Shailabh Nagar Signed-off-by: Balbir Singh Cc: Jes Sorensen Cc: Peter Chubb Cc: Erich Focht Cc: Levent Serinol Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c757249af152c59fd74b85e52e8c090acb33d9c0 Author: Shailabh Nagar Date: Fri Jul 14 00:24:40 2006 -0700 [PATCH] per-task-delay-accounting: taskstats interface Create a "taskstats" interface based on generic netlink (NETLINK_GENERIC family), for getting statistics of tasks and thread groups during their lifetime and when they exit. The interface is intended for use by multiple accounting packages though it is being created in the context of delay accounting. This patch creates the interface without populating the fields of the data that is sent to the user in response to a command or upon the exit of a task. Each accounting package interested in using taskstats has to provide an additional patch to add its stats to the common structure. [akpm@osdl.org: cleanups, Kconfig fix] Signed-off-by: Shailabh Nagar Signed-off-by: Balbir Singh Cc: Jes Sorensen Cc: Peter Chubb Cc: Erich Focht Cc: Levent Serinol Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb0ba6bd021248b6bdc58a7b1213a55a6776a38a Author: Balbir Singh Date: Fri Jul 14 00:24:39 2006 -0700 [PATCH] per-task-delay-accounting: utilities for genetlink usage Two utilities for simplifying usage of NETLINK_GENERIC interface. Signed-off-by: Balbir Singh Signed-off-by: Shailabh Nagar Cc: Jes Sorensen Cc: Peter Chubb Cc: Erich Focht Cc: Levent Serinol Cc: Jay Lan Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52f17b6c2bd443e7806a161e9d10a983650db01d Author: Chandra Seetharaman Date: Fri Jul 14 00:24:38 2006 -0700 [PATCH] per-task-delay-accounting: cpu delay collection via schedstats Make the task-related schedstats functions callable by delay accounting even if schedstats collection isn't turned on. This removes the dependency of delay accounting on schedstats. Signed-off-by: Chandra Seetharaman Signed-off-by: Shailabh Nagar Signed-off-by: Balbir Singh Cc: Jes Sorensen Cc: Peter Chubb Cc: Erich Focht Cc: Levent Serinol Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ff922452df86f3e9a2c6f705c4588ec62d096a7 Author: Shailabh Nagar Date: Fri Jul 14 00:24:37 2006 -0700 [PATCH] per-task-delay-accounting: sync block I/O and swapin delay collection Unlike earlier iterations of the delay accounting patches, now delays are only collected for the actual I/O waits rather than try and cover the delays seen in I/O submission paths. Account separately for block I/O delays incurred as a result of swapin page faults whose frequency can be affected by the task/process' rss limit. Hence swapin delays can act as feedback for rss limit changes independent of I/O priority changes. Signed-off-by: Shailabh Nagar Signed-off-by: Balbir Singh Cc: Jes Sorensen Cc: Peter Chubb Cc: Erich Focht Cc: Levent Serinol Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca74e92b4698276b6696f15a801759f50944f387 Author: Shailabh Nagar Date: Fri Jul 14 00:24:36 2006 -0700 [PATCH] per-task-delay-accounting: setup Initialization code related to collection of per-task "delay" statistics which measure how long it had to wait for cpu, sync block io, swapping etc. The collection of statistics and the interface are in other patches. This patch sets up the data structures and allows the statistics collection to be disabled through a kernel boot parameter. Signed-off-by: Shailabh Nagar Signed-off-by: Balbir Singh Cc: Jes Sorensen Cc: Peter Chubb Cc: Erich Focht Cc: Levent Serinol Cc: Jay Lan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8f4d97e1b58b50ad6449bb2d35e6632c0236abd Author: Shailabh Nagar Date: Fri Jul 14 00:24:35 2006 -0700 [PATCH] list_is_last utility Add another list utility function to check for last element in a list. Signed-off-by: Shailabh Nagar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22caf04297896e515c6d5cdfb8e08a79a523946c Author: Mike Rapoport Date: Fri Jul 14 00:24:34 2006 -0700 [PATCH] mbxfb: Add framebuffer driver for the Intel 2700G Add frame buffer driver for the 2700G LCD controller present on CompuLab CM-X270 computer module. [adaplas] - Add more informative help text to Kconfig - Make DEBUG a Kconfig option as FB_MBX_DEBUG - Remove #include mbxdebug.c, this is frowned upon - Remove redundant casts - Arrange #include's alphabetically - Trivial whitespace Signed-off-by: Mike Rapoport Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b04ea3cebf79d6808632808072f276dbc98aaf01 Author: Eric Paris Date: Fri Jul 14 00:24:33 2006 -0700 [PATCH] Fix security check for joint context= and fscontext= mount options After some discussion on the actual meaning of the filesystem class security check in try context mount it was determined that the checks for the context= mount options were not correct if fscontext mount option had already been used. When labeling the superblock we should be checking relabel_from and relabel_to. But if the superblock has already been labeled (with fscontext) then context= is actually labeling the inodes, and so we should be checking relabel_from and associate. This patch fixes which checks are called depending on the mount options. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Acked-by: James Morris Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 517e7aa5b022f9dc486639c7689666663daee24f Author: Adrian Bunk Date: Fri Jul 14 00:24:32 2006 -0700 [PATCH] let the the lockdep options depend on DEBUG_KERNEL The lockdep options should depend on DEBUG_KERNEL since: - they are kernel debugging options and - they do otherwise break the DEBUG_KERNEL menu structure Signed-off-by: Adrian Bunk Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3c36aa98f8e39544afb99025bb69bc1b48e9bf0 Author: Kylene Jo Hall Date: Fri Jul 14 00:24:31 2006 -0700 [PATCH] tpm_tis: use resource_size_t Fix the start and len variables that should be using the new resource_size_t. Signed_off_by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e323d3ee0ba9381af494641e1e87a8d372f916b Author: Kylene Jo Hall Date: Fri Jul 14 00:24:31 2006 -0700 [PATCH] tpm: Add force device probe option Some machine manufacturers are not sticking to the TCG specifications and including an ACPI DSDT entry for the TPM which allows PNP discovery of the device. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cab091eaa4952777d3183b6d7ce203a213cddc12 Author: Kylene Jo Hall Date: Fri Jul 14 00:24:30 2006 -0700 [PATCH] tpm: interrupt clear fix Under stress testing I found that the interrupt is not always cleared. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 737bebd137561e184f0a8b4332d9bb0238d8b639 Author: Al Viro Date: Fri Jul 14 00:24:29 2006 -0700 [PATCH] symlink nesting level change It's way past time to bump it to 8. Everyone had been warned - for months now. RH kernels have had this for more than a year. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5df5881e2a2ff2be62608de1a156ac6d2352fc2 Author: Randy Dunlap Date: Fri Jul 14 00:24:29 2006 -0700 [PATCH] actual mailing list in MAINTAINERS Add actual mailing list email addresses for the 4 that were only listing a web page. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e82636a3dd8d3cf1ba87380608da4f6a0f6ec47 Author: Randy Dunlap Date: Fri Jul 14 00:24:28 2006 -0700 [PATCH] TPM: fix failure path leak kfree(devname) on the misc_register() failure path. Otherwise it is lost forever. Signed-off-by: Randy Dunlap Cc: Kylene Jo Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a5f5e488ceee9e08df3dff3f01b12fafc9e7e68 Author: Ingo Molnar Date: Fri Jul 14 00:24:27 2006 -0700 [PATCH] lockdep: core, fix rq-lock handling on __ARCH_WANT_UNLOCKED_CTXSW On platforms that have __ARCH_WANT_UNLOCKED_CTXSW set and want to implement lock validator support there's a bug in rq->lock handling: in this case we dont 'carry over' the runqueue lock into another task - but still we did a spinlock_release() of it. Fix this by making the spinlock_release() in context_switch() dependent on !__ARCH_WANT_UNLOCKED_CTXSW. (Reported by Ralf Baechle on MIPS, which has __ARCH_WANT_UNLOCKED_CTXSW. This fixes a lockdep-internal BUG message on such platforms.) Signed-off-by: Ingo Molnar Cc: Ralf Baechle Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e8f7a3128bb8fac8351a994f1fc325717899308 Author: Jim Cromie Date: Fri Jul 14 00:24:26 2006 -0700 [PATCH] gpio: rename exported vtables to better match purpose - rename EXPORTed gpio vtables from {scx200,pc8736x}_access to _gpio_ops new name is much closer to the vtable-name struct nsc_gpio_ops, should be clearer. Also rename the _fops vtable var to _fileops to better disambiguate it from the gpio vtable. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abecb6da704a71232a3103c8485c65ceb5fcd9dc Author: Jim Cromie Date: Fri Jul 14 00:24:26 2006 -0700 [PATCH] gpio: cosmetics: remove needless newlines - pure cosmetics: lose needless newlines. - rename EXPORTed gpio vtables from {scx200,pc8736x}_access to _gpio_ops new name is much closer to the vtable-name struct nsc_gpio_ops, should be clearer. Also rename the _fops vtable var to _fileops to better disambiguate it from the gpio vtable. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91e260b80d2fec559877f399dfc36b554f207874 Author: Jim Cromie Date: Fri Jul 14 00:24:25 2006 -0700 [PATCH] gpio: drop vtable members .gpio_set_high .gpio_set_low gpio_set is enough drops gpio_set_high, gpio_set_low from the nsc_gpio_ops vtable. While we can't drop them from scx200_gpio (or can we?), we dont need them for new users of the exported vtable; gpio_set(1), gpio_set(0) work fine. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9432e4d8866606466117664472c58ac981ea4f4 Author: Rolf Eike Beer Date: Fri Jul 14 00:24:24 2006 -0700 [PATCH] Remove pci_dac_set_dma_mask() from Documentation/DMA-mapping.txt pci_dac_set_dma_mask() gives only a single match in the whole kernel tree and that's in this doc file. The best candidate for replacement is pci_dac_dma_supported(). Signed-off-by: Rolf Eike Beer Cc: Greg KH Acked-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d247e2c661f28a21e5f9a8d672e1e88a7c1c5d4a Author: Rolf Eike Beer Date: Fri Jul 14 00:24:23 2006 -0700 [PATCH] add function documentation for register_chrdev() Documentation for register_chrdev() was missing completely. [akpm@osdl.org: kerneldocification] Signed-off-by: Rolf Eike Beer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c259cc281255bdb30ceba190bfd7f37e3ae3fc85 Author: Roland Dreier Date: Fri Jul 14 00:24:23 2006 -0700 [PATCH] Convert idr's internal locking to _irqsave variant Currently, the code in lib/idr.c uses a bare spin_lock(&idp->lock) to do internal locking. This is a nasty trap for code that might call idr functions from different contexts; for example, it seems perfectly reasonable to call idr_get_new() from process context and idr_remove() from interrupt context -- but with the current locking this would lead to a potential deadlock. The simplest fix for this is to just convert the idr locking to use spin_lock_irqsave(). In particular, this fixes a very complicated locking issue detected by lockdep, involving the ib_ipoib driver's priv->lock and dev->_xmit_lock, which get involved with the ib_sa module's query_idr.lock. Cc: Arjan van de Ven Cc: Ingo Molnar Cc: Zach Brown , Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fbe82a952790c634ea6035c223a01a81377daf1 Author: Jeff Mahoney Date: Fri Jul 14 00:24:22 2006 -0700 [PATCH] reiserfs: fix handling of device names with /'s in them On systems with block devices containing a slash (virtual dasd, cciss, etc), reiserfs will fail to initialize /proc/fs/reiserfs/ due to it being interpreted as a subdirectory. The generic block device code changes the / to ! for use in the sysfs tree. This patch uses that convention. Tested by making dm devices use dm/ rather than dm- [akpm@osdl.org: name variables consistently] Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bca3bffec9f37d4cb60b80fd0067f9c7550b5d57 Author: Chris Boot Date: Fri Jul 14 00:24:21 2006 -0700 [PATCH] net48xx LED cleanups Add the DRVNAME define to remove the two separate references of the driver name by string, and move the .driver.owner into the existing .driver sub-structure. Signed-off-by: Chris Boot Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4afee02a5dd4f20c08fca26e9b610e72d0bcbf0 Author: OGAWA Hirofumi Date: Fri Jul 14 00:24:18 2006 -0700 [PATCH] Fix sighand->siglock usage in kernel/acct.c IRQs must be disabled before taking ->siglock. Noticed by lockdep. Signed-off-by: OGAWA Hirofumi Cc: Arjan van de Ven Cc: Ingo Molnar Cc: "Eric W. Biederman" Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e143475c22036847f898d7e76ba337c1d7dbf6f Author: john stultz Date: Fri Jul 14 00:24:17 2006 -0700 [PATCH] improve timekeeping resume robustness Resolve problems seen w/ APM suspend. Due to resume initialization ordering, its possible we could get a timer interrupt before the timekeeping resume() function is called. This patch ensures we don't do any timekeeping accounting before we're fully resumed. (akpm: fixes the machine-freezes-on-APM-resume bug) Signed-off-by: John Stultz Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 635adb6cd25c8f816c9017a0a0349cd389eafcd3 Author: Jim Cromie Date: Fri Jul 14 00:24:16 2006 -0700 [PATCH] scx200_gpio: use 1 cdev for N minors, not N for N Remove the scx200_gpio's cdev-array & ksalloc, replacing it with a single static struct cdev, which is sufficient for all the pins. cdev_put is commented out since kernel wont link properly with it, and its apparently not needed. With these patches, this driver continues to work with Chris Boot's leds_48xx driver. Signed-off-by Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae2d1f2f5b59d00b39283c52dc4ee675397bbacd Author: Jim Cromie Date: Fri Jul 14 00:24:16 2006 -0700 [PATCH] scx200_gpio: 1 cdev for N minors: cleanup, prep this patch is mostly cleanup of scx200_gpio : - drop #include - s/DEVNAME/DRVNAME/ apparently a convention - replace variable num_pins with #define MAX_PINS - s/dev/devid/ to clarify that its a dev_t, not a struct device dev. - move devid = MKDEV(major,0) into branch where its needed. 2 minor 'changes' : - reduced MAX_PINS from 64 to 32. Ive never tested other pins, and theyre all multiplexed with other functions, some of which may be in use on my soekris 4801, so I dont know what testing should yield. - +EXPORT_SYMBOL(scx200_access); This exposes the driver's vtable, which another driver can use along with #include , to manipulate a gpio-pin. Signed-off-by Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bc02d8412b422388f86b09ae40d762c0bc05290 Author: Adrian Bunk Date: Fri Jul 14 00:24:15 2006 -0700 [PATCH] unexport open_softirq Christoph Hellwig: open_softirq just enables a softirq. The softirq array is statically allocated so to add a new one you would have to patch the kernel. So there's no point to keep this export at all as any user would have to patch the enum in include/linux/interrupt.h anyway. Signed-off-by: Adrian Bunk Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cccedb1a4af9e96781f206acad638c05364e73ca Author: Adrian Bunk Date: Fri Jul 14 00:24:14 2006 -0700 [PATCH] drivers/block/cpqarray.c: remove an unused variable Signed-off-by: Adrian Bunk Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60198f9992db1e36d5b4cc1526ff29550f7d002c Author: Luca Tettamanti Date: Fri Jul 14 00:24:13 2006 -0700 [PATCH] Add try_to_freeze() to rt-test kthreads When CONFIG_RT_MUTEX_TESTER is enabled kernel refuses to suspend the machine because it's unable to freeze the rt-test-* threads. Add try_to_freeze() after schedule() so that the threads will be freezed correctly; I've tested the patch and it lets the notebook suspends and resumes nicely. Signed-off-by: Luca Tettamanti Cc: Ingo Molnar Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddca60c59032b2c2babc0003cf01015aff340b79 Author: Arjan van de Ven Date: Fri Jul 14 00:24:12 2006 -0700 [PATCH] lockdep: annotate the BLKPG_DEL_PARTITION ioctl The delete partition IOCTL takes the bd_mutex for both the disk and the partition; these have an obvious hierarchical relationship and this patch annotates this relationship for lockdep. Signed-off-by: Arjan van de Ven Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e56a7dcbb974d9725d80e50d70c6eed7f71110b Author: Herbert Valerio Riedel Date: Fri Jul 14 00:24:11 2006 -0700 [PATCH] RTC subsystem, Add ISL1208 support Add support for the I2C-attached Intersil ISL1208 RTC chip. [akpm@osdl.org: cleanups, fixlets] Signed-off-by: Herbert Valerio Riedel Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bef317e364f065717819fbbe7965d4401820286c Author: Nathan Scott Date: Fri Jul 14 00:24:10 2006 -0700 [PATCH] ramdisk blocksize Kconfig entry Make the ramdisk blocksize configurable at kernel compilation time rather than only at boot or module load time, like a couple of the other ramdisk options. I found this handy awhile back but thought little of it, until recently asked by a few of the testing folks here to be able to do the same thing for their automated test setups. The Kconfig comment is largely lifted from comments in rd.c, and hopefully this will increase the chances of making folks aware that the default value often isn't a great choice here (for increasing values of PAGE_SIZE, even moreso). Signed-off-by: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 086626a747300e37043a553dac639c5900c4a2c0 Author: Nathan Scott Date: Fri Jul 14 00:24:10 2006 -0700 [PATCH] Update ramdisk documentation The default ramdisk blocksize is actually 1024, not 512 bytes. Also fixes up some trailing whitespace issues. Signed-off-by: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22c4af4092fc2e037ce2e2922023fc222cf0c443 Author: Luke Yang Date: Fri Jul 14 00:24:09 2006 -0700 [PATCH] nommu: export two symbols for drivers to use nommu.c needs to export two more symbols for drivers to use: remap_pfn_range and unmap_mapping_range. Signed-off-by: Luke Yang Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52fa259b5aaf310657e5d30be48a300860741447 Author: David Woodhouse Date: Fri Jul 14 00:24:08 2006 -0700 [PATCH] hdrinstall: remove asm/io.h from user visibility There's no excuse for userspace abusing this kernel header -- the kernel's headers are not intended to provide a library of helper routines for userspace. Using from userspace is broken on most architectures anyway. Just say 'no'. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e035cc35e54230eb704ee7feccf476ed2fb2ae29 Author: David Woodhouse Date: Fri Jul 14 00:24:07 2006 -0700 [PATCH] hdrinstall: remove asm/atomic.h from user visibility This isn't suitable for userspace to see -- the kernel headers are not a random library of stuff for userspace; they're only there to define the kernel<->user ABI for system libraries and tools. Anything which _was_ abusing asm/atomic.h from userspace was probably broken anyway -- as it often didn't even give atomic operation. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 998f6fabbf439e6d518dcbaf9191cb533447b57a Author: David Woodhouse Date: Fri Jul 14 00:24:07 2006 -0700 [PATCH] hdrinstall: remove asm/irq.h from user visibility Remove asm/irq.h from the exported headers -- there was never any good reason for it to have been listed. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0009652af385a42f0e0604136f772ead406c78d Author: Andrew Morton Date: Fri Jul 14 00:24:06 2006 -0700 [PATCH] del_timer_sync(): add cpu_relax() Relax the CPU in the del_timer_sync() busywait loop. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52e92e5788139921352213fa6faf6e30ff1f2f5a Author: Adrian Bunk Date: Fri Jul 14 00:24:05 2006 -0700 [PATCH] remove kernel/kthread.c:kthread_stop_sem() Remove the now-unneeded kthread_stop_sem(). Signed-off-by: Adrian Bunk Acked-by: Alan Stern Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 098c5eea03de4707019a205140296893252b4130 Author: Andreas Gruenbacher Date: Fri Jul 14 00:24:04 2006 -0700 [PATCH] null-terminate over-long /proc/kallsyms symbols Got a customer bug report (https://bugzilla.novell.com/190296) about kernel symbols longer than 127 characters which end up in a string buffer that is not NULL terminated, leading to garbage in /proc/kallsyms. Using strlcpy prevents this from happening, even though such symbols still won't come out right. A better fix would be to not use a fixed-size buffer, but it's probably not worth the trouble. (Modversion'ed symbols even have a length limit of 60.) [bunk@stusta.de: build fix] Signed-off-by: Andreas Gruenbacher Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 329c6e4257d6a89990d72617d91437e2ce59e426 Author: Jeff Dike Date: Fri Jul 14 00:24:03 2006 -0700 [PATCH] uml: header formatting cleanups Clean up whitespace and return syntax in os.h. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b076bb02ee2c489da36c89e35c640bfe45c7d27e Author: Jeff Dike Date: Fri Jul 14 00:24:03 2006 -0700 [PATCH] uml: tidy biarch gcc support On top of the previous biarch changes for UML, this makes the preprocessor changes a bit cleaner. Specify the 64-bit build in CPPFLAGS on the x86_64 SUBARCH, rather than #undef'ing i386. Compile-tested with i386 and x86_64 SUBARCHs. Signed-off-by: Nishanth Aravamudan Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5df0d1a2c0f7dbd135d978d02daf2d99e62ff7a Author: Jeff Dike Date: Fri Jul 14 00:24:02 2006 -0700 [PATCH] uml: tidy longjmp macro The UML_SETJMP macro was requiring its users to pass in a argument which it could supply itself, since it wasn't used outside that invocation of the macro. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8477b55ba11a49515b26573a90414b718179c908 Author: Vadim Lobanov Date: Fri Jul 14 00:24:01 2006 -0700 [PATCH] i386: remove redundant might_sleep() in user accessors. On i386, the user space accessor functions copy_from/to_user() both invoke might_sleep(), do a quick sanity check, and then pass the work on to their __copy_from/to_user() counterparts, which again invoke might_sleep(). Given that no actual work happens between these two calls, it is best to eliminate one of the redundant might_sleep()s. Signed-off-by: Vadim Lobanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e78a887a5942d06c81ccf0793fbf2bd83e982122 Author: Eric W. Biederman Date: Fri Jul 14 00:24:00 2006 -0700 [PATCH] i386 kexec: allow the kexec on panic support to compile on voyager This patch removes the foolish assumption that SMP implied local apics. That assumption is not-true on the Voyager subarch. This makes that dependency explicit, and allows the code to build. What gets disabled is just an optimization to get better crash dumps so the support should work if there is a kernel that will initialization on the voyager subarch under those harsh conditions. Hopefully we can figure out how to initialize apics in init_IRQ and remove the need to disable io_apics and this dependency. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7546075e7c08821732fa04119a9005c55ab432d Author: Catalin Marinas Date: Fri Jul 14 00:23:59 2006 -0700 [PATCH] Fix a memory leak in the i386 setup code Signed-off-by: Catalin Marinas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7015331098cc156c30282588bbd30bbf7a59291 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Fri Jul 14 00:23:58 2006 -0700 [PATCH] i386: handle_BUG(): don't print garbage if debug info unavailable handle_BUG() tries to print file and line number even when they're not available (CONFIG_DEBUG_BUGVERBOSE is not set.) Change this to print a message stating info is unavailable instead of printing a misleading message. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c38c8db7225465c8d124f38b24d3024decc26bbd Author: Anil Keshavamurthy Date: Fri Jul 14 00:23:57 2006 -0700 [PATCH] ia64: race flushing icache in COW path There is a race condition that showed up in a threaded JIT environment. The situation is that a process with a JIT code page forks, so the page is marked read-only, then some threads are created in the child. One of the threads attempts to add a new code block to the JIT page, so a copy-on-write fault is taken, and the kernel allocates a new page, copies the data, installs the new pte, and then calls lazy_mmu_prot_update() to flush caches to make sure that the icache and dcache are in sync. Unfortunately, the other thread runs right after the new pte is installed, but before the caches have been flushed. It tries to execute some old JIT code that was already in this page, but it sees some garbage in the i-cache from the previous users of the new physical page. Fix: we must make the caches consistent before installing the pte. This is an ia64 only fix because lazy_mmu_prot_update() is a no-op on all other architectures. Signed-off-by: Anil Keshavamurthy Signed-off-by: Tony Luck Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8757d5fa6b75e8ea906baf0309d49b980e7f9bc9 Author: Jan Kiszka Date: Fri Jul 14 00:23:56 2006 -0700 [PATCH] mm: fix oom roll-back of __vmalloc_area_node __vunmap must not rely on area->nr_pages when picking the release methode for area->pages. It may be too small when __vmalloc_area_node failed early due to lacking memory. Instead, use a flag in vmstruct to differentiate. Signed-off-by: Jan Kiszka Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e322fedf0c59938716cdfbafbe364a170919aa1a Author: Michael S. Tsirkin Date: Fri Jul 14 00:23:56 2006 -0700 [PATCH] IB/core: use correct gfp_mask in sa_query Avoid bogus out of memory errors: fix sa_query to actually pass gfp_mask supplied by the user to idr_pre_get. Signed-off-by: Michael S. Tsirkin Acked-by: "Sean Hefty" Acked-by: "Roland Dreier" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit adfaa888a292e7f38fb43668d8994f246e371f0f Author: Michael S. Tsirkin Date: Fri Jul 14 00:23:55 2006 -0700 [PATCH] fmr pool: remove unnecessary pointer dereference ib_fmr_pool_map_phys gets the virtual address by pointer but never writes there, and users (e.g. srp) seem to assume this and ignore the value returned. This patch cleans up the API to get the VA by value, and updates all users. Signed-off-by: Michael S. Tsirkin Acked-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74f76fbac72c84ac78620698a584d403b655e62a Author: Ira Weiny Date: Fri Jul 14 00:23:54 2006 -0700 [PATCH] IB/cm: set private data length for reject messages Set private data length for reject messages to the correct size. Fix from openib svn r8483. Signed-off-by: Sean Hefty Signed-off-by: Michael S. Tsirkin Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6583eb3dcc1f03ce969594dae5573dbefce015dc Author: Vu Pham Date: Fri Jul 14 00:23:53 2006 -0700 [PATCH] srp: fix fmr error handling srp_unmap_data assumes req->fmr is NULL if the request is not mapped, so we must clean it out in case of an error. Signed-off-by: Vu Pham Signed-off-by: Michael S. Tsirkin Acked-by: Roland Dreier Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ee3404cce2c45f8b95b341dd6311cd92e5cee0 Author: Michael S. Tsirkin Date: Fri Jul 14 00:23:52 2006 -0700 [PATCH] IB/addr: gid structure alignment fix The device address contains unsigned character arrays, which contain raw GID addresses. The GIDs may not be naturally aligned, so do not cast them to structures or unions. Signed-off-by: Sean Hefty Signed-off-by: Michael S. Tsirkin Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04c335430f6d9f9088c852bc05a3a0c8baa921c4 Author: Michael S. Tsirkin Date: Fri Jul 14 00:23:52 2006 -0700 [PATCH] IB/cm: drop REQ when out of memory If a user of the IB CM returns -ENOMEM from their connection callback, simply drop the incoming REQ - do not attempt to send a reject. This should allow the sender to retry the request. Signed-off-by: Michael S. Tsirkin Signed-off-by: Sean Hefty Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0964d9161826ca5cab5a03192490ec676c8abf8c Author: Michael S. Tsirkin Date: Fri Jul 14 00:23:51 2006 -0700 [PATCH] IB/mthca: comment fix After recent changes, mthca_wq_init does not actually initialize the WQ as it used to - it simply resets all index fields to their initial values. So, let's rename it to mthca_wq_reset. Signed-off-by: Michael S. Tsirkin Cc: Roland Dreier Acked-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2290d2c9f51d7ee2f45adee79b4d9e080ca15d36 Author: Jack Morgenstein Date: Fri Jul 14 00:23:50 2006 -0700 [PATCH] IB/mthca: fix static rate returned by mthca_ah_query mthca_ah_query returs the static rate of the address handle in internal mthc format. fix it to use rate encoding from enum ib_rate, which is what users expect. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de45921535bfc3b1f63b426c2a9739635f864283 Author: Kirill Korotaev Date: Fri Jul 14 00:23:49 2006 -0700 [PATCH] struct file leakage 2.6.16 leaks like hell. While testing, I found massive leakage (reproduced in openvz) in: *filp *size-4096 And 1 object leaks in *size-32 *size-64 *size-128 It is the fix for the first one. filp leaks in the bowels of namei.c. Seems, size-4096 is file table leaking in expand_fdtables. I have no idea what are the rest and why they show only accompanying another leaks. Some debugging structs? [akpm@osdl.org, Trond: remove the IS_ERR() check] Signed-off-by: Alexey Kuznetsov Cc: Kirill Korotaev Cc: Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ee8ab9fbf21e6b87ad227cd46c0a4be41ab749b Author: Linus Torvalds Date: Fri Jul 14 21:48:03 2006 -0700 Relax /proc fix a bit Clearign all of i_mode was a bit draconian. We only really care about S_ISUID/ISGID, after all. Signed-off-by: Linus Torvalds commit cc08632f8f26d479500f8107c84e206770cb901c Author: Michal Ludvig Date: Sat Jul 15 11:08:50 2006 +1000 [CRYPTO] padlock: Fix alignment after aes_ctx rearrange Herbert's patch 82062c72cd643c99a9e1c231270acbab986fd23f in cryptodev-2.6 tree breaks alignment rules for PadLock xcrypt instruction leading to General protection Oopses. This patch fixes the problem. Signed-off-by: Michal Ludvig Signed-off-by: Herbert Xu commit ee7022dcfbf660727d6b8553cb0dbc0d4eae8f44 Author: Marc Zyngier Date: Fri Jul 14 16:53:50 2006 -0700 [SPARC64] Fix PSYCHO PCI controler init. pbm->name should be initialized before calling pbm_register_toplevel_resources. Move the call a few lines down to avoid a nice Oops. Signed-off-by: Marc Zyngier Signed-off-by: David S. Miller commit a49261585e2c89f16b5a4bb80f623d2e9c2c1566 Author: David S. Miller Date: Fri Jul 14 16:49:55 2006 -0700 [SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources() We shouldn't overwrite it, it's the device node full name already and that's what we want. Based upon a report from Marc Zyngier. Signed-off-by: David S. Miller commit 5b4bbb3d78285ab735941365c17f1c55a228c659 Author: David S. Miller Date: Thu Jul 13 16:07:25 2006 -0700 [SERIAL] sunsab: Fix significant typo in sab_probe() Instead of initializing both ports of a SAB device properly, we were setting up the first port structure twice and ending up only with the second port, oops. Signed-off-by: David S. Miller commit c964521c54304f51705764334f7b27a9518ed65a Author: David S. Miller Date: Thu Jul 13 16:05:57 2006 -0700 [SERIAL] sunsu: Report keyboard and mouse ports in kernel log. Otherwise there is no explicit mention of these devices. Signed-off-by: David S. Miller commit d8573e20d5d6974305599dde42b5dd7583310ccf Author: David S. Miller Date: Thu Jul 13 16:05:26 2006 -0700 [SPARC64]: Make sure IRQs are disabled properly during early boot. Else we trigger the new irqs_disable() assertion in start_kernel(). Signed-off-by: David S. Miller commit 18b0bbd8ca6d3cb90425aa0d77b99a762c6d6de3 Author: Linus Torvalds Date: Fri Jul 14 16:51:34 2006 -0700 Fix nasty /proc vulnerability We have a bad interaction with both the kernel and user space being able to change some of the /proc file status. This fixes the most obvious part of it, but I expect we'll also make it harder for users to modify even their "own" files in /proc. Signed-off-by: Linus Torvalds commit 0610d11b53ad15200618e38e4511373e3ed09e8a Author: Stephen Hemminger Date: Fri Jul 14 16:34:22 2006 -0700 [VLAN]: __vlan_hwaccel_rx can use the faster ether_compare_addr The inline function compare_ether_addr is faster than memcmp. Also, don't need to drag in proc_fs.h, the only reference to proc_dir_entry is a pointer so the declaration is needed here. Signed-off-by: Stephen Hemminger Acked-by: Ben Greear Signed-off-by: David S. Miller commit b3a6251915df9e3d80d4a0d32bd8d24223906688 Author: Stephen Hemminger Date: Fri Jul 14 16:32:27 2006 -0700 [PKT_SCHED] HTB: initialize upper bound properly The upper bound for HTB time diff needs to be scaled to PSCHED units rather than just assuming usecs. The field mbuffer is used in TDIFF_SAFE(), as an upper bound. Signed-off-by: Stephen Hemminger Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 53602f92dd3691616478a40738353694bcfef171 Author: Stephen Hemminger Date: Fri Jul 14 14:49:32 2006 -0700 [IPV4]: Clear skb cb on IP input when data arrives at IP through loopback (and possibly other devices). So the field needs to be cleared before it confuses the route code. This was seen when running netem over loopback, but there are probably other device cases. Maybe this should go into stable? Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 27b437c8b7d519aac70a0254c2e04c29eff565a2 Author: Herbert Xu Date: Thu Jul 13 19:26:39 2006 -0700 [NET]: Update frag_list in pskb_trim When pskb_trim has to defer to ___pksb_trim to trim the frag_list part of the packet, the frag_list is not updated to reflect the trimming. This will usually work fine until you hit something that uses the packet length or tail from the frag_list. Examples include esp_output and ip_fragment. Another problem caused by this is that you can end up with a linear packet with a frag_list attached. It is possible to get away with this if we audit everything to make sure that they always consult skb->len before going down onto frag_list. In fact we can do the samething for the paged part as well to avoid copying the data area of the skb. For now though, let's do the conservative fix and update frag_list. Many thanks to Marco Berizzi for helping me to track down this bug. This 4-year old bug took 3 months to track down. Marco was very patient indeed :) Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit fc818301a8a39fedd7f0a71f878f29130c72193d Author: Ingo Molnar Date: Thu Jul 13 09:12:21 2006 +0200 [PATCH] revert slab.c locking change Chandra Seetharaman reported SLAB crashes caused by the slab.c lock annotation patch. There is only one chunk of that patch that has a material effect on the slab logic - this patch undoes that chunk. This was confirmed to fix the slab problem by Chandra. Signed-off-by: Ingo Molnar Tested-by: Chandra Seetharaman Signed-off-by: Linus Torvalds commit f4dee85e2c6a7d7adf7ea4d6d3053a41c78175b7 Author: Atsushi Nemoto Date: Thu Jul 13 23:01:50 2006 +0900 [MIPS] sparsemem: fix crash in show_mem With sparsemem, pfn should be checked by pfn_valid() before pfn_to_page(). Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit bddc8134db00002a9fd1b33fcb45747bdd3a2777 Author: Yoichi Yuasa Date: Thu Jul 13 17:33:33 2006 +0900 [MIPS] vr41xx: Update workpad setup function Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f26811e0d89d412a2f5d8e16760e71d3b5c2702c Author: Yoichi Yuasa Date: Thu Jul 13 17:33:24 2006 +0900 [MIPS] vr41xx: Update e55 setup function Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit efcb487a8e9a86874cf63c3fbf6c85bbf87e6d87 Author: Yoichi Yuasa Date: Thu Jul 13 17:33:14 2006 +0900 [MIPS] vr41xx: Removed old v2.4 VRC4173 driver Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 66151bbd20c6c62dbe5b131484c885086e3a8d29 Author: Yoichi Yuasa Date: Thu Jul 13 17:33:03 2006 +0900 [MIPS] vr41xx: Move IRQ numbers to asm-mips/vr41xx/irq.h Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 5fd326573876e466c7693cbf06e9c88ecf86135d Author: Ralf Baechle Date: Mon Jul 10 02:37:21 2006 +0100 [MIPS] MIPSsim: Build fix, rename sim_timer_setup -> plat_timer_setup. Signed-off-by: Ralf Baechle commit 75da124ac0141e463cb2738fdc02dd24fc8b6e95 Author: Ralf Baechle Date: Mon Jul 10 02:27:21 2006 +0100 [MIPS] Remove unused code. Signed-off-by: Ralf Baechle commit d1d60ded2b6cca40e2f14ea2771cbe815c11abb5 Author: Julien BLACHE Date: Sun Jul 9 00:21:24 2006 +0200 [MIPS] IP22 Fix brown paper bag in RTC code. This patch fixes a typo in arch/mips/sgi-ip22/ip22-time.c, leading to the incorrect year being set into the RTC chip. Signed-off-by: Julien BLACHE Signed-off-by: Ralf Baechle commit ece2246ebda3d86cedb9414e7771862a6c9a054c Author: Ralf Baechle Date: Sun Jul 9 22:27:23 2006 +0100 [MIPS] Atlas, Malta, SEAD: Don't disable interrupts in mips_time_init(). By the time it's called from time_init interrupts are still disabled. Signed-off-by: Ralf Baechle commit 54d0a216f40e060ba4265bb851cc36b3ca55d1a8 Author: Ralf Baechle Date: Sun Jul 9 21:38:56 2006 +0100 [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. Signed-off-by: Ralf Baechle --- commit 2c70df5b9807293705d8123d1f36579831ac09eb Author: Ralf Baechle Date: Sun Jul 9 20:53:19 2006 +0100 [MIPS] Nuke redeclarations of board_time_init. Signed-off-by: Ralf Baechle commit 046f8f705ba684312f82e36abbd42c080f4e4e9a Author: Ralf Baechle Date: Sun Jul 9 20:49:41 2006 +0100 [MIPS] Remove redeclarations of setup_irq(). Signed-off-by: Ralf Baechle commit 50785a595cfc8ff9188f9be395ccb214ac43e190 Author: Ralf Baechle Date: Sun Jul 9 20:42:40 2006 +0100 [MIPS] Nuke redeclarations of board_timer_setup. Signed-off-by: Ralf Baechle commit 115f2a44e07b24e6fa4d636c9a95e8e05a0d9d69 Author: Thiemo Seufer Date: Sun Jul 9 01:47:06 2006 +0100 [MIPS] Print out TLB handler assembly for debugging. Small update, using pr_debug and pr_info. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 4bf42d4272d83b42e1492215a34d42dae8e6fccc Author: Ralf Baechle Date: Sat Jul 8 11:32:58 2006 +0100 [MIPS] SMTC: Reformat to Linux style. Signed-off-by: Ralf Baechle commit 783b09dc2806429560d0211564a94d6570b96ee3 Author: Ralf Baechle Date: Sat Jul 8 11:25:38 2006 +0100 [MIPS] MIPSsim: Delete redeclaration of ll_local_timer_interrupt. Signed-off-by: Ralf Baechle commit 40fa4b6a07866bbd70b22b78b349960ebaef7c8e Author: Ralf Baechle Date: Fri Jul 7 23:57:19 2006 +0100 [MIPS] IP27: Reformatting. Signed-off-by: Ralf Baechle commit bf283630d0990f2ad80bb4601ff275f9d41a579e Author: Ralf Baechle Date: Fri Jul 7 23:56:32 2006 +0100 [MIPS] IP27: Invoke setup_irq for timer interrupt so proc stats will be shown. Signed-off-by: Ralf Baechle commit cc25ab008633ffd6010f01003ad380f9c7dd5374 Author: Ralf Baechle Date: Fri Jul 7 23:53:05 2006 +0100 [MIPS] IP27: irq_chip startup method returns unsigned int. Signed-off-by: Ralf Baechle commit a365e53fe147e2ab2c902ddb35193dae4fb976e7 Author: Ralf Baechle Date: Fri Jul 7 23:49:30 2006 +0100 [MIPS] IP27: struct irq_desc member handler was renamed to chip. Signed-off-by: Ralf Baechle commit b8828d3e0d0fa33ac7f6dbd7c6820d9e0f7be40d Author: Yoichi Yuasa Date: Sat Jul 8 00:51:11 2006 +0900 [MIPS] Remove vmlinux.rm200 target from makefile. Long ago in the dark ages this was used a MIPS a.out binary to be used with Milo which is obsolete since years. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 2874fe55332e2fb4e9c8e672cf2b7361bb168d17 Author: Yoichi Yuasa Date: Sat Jul 8 00:42:12 2006 +0900 [MIPS] vr41xx: Replace magic number for P4K bit with symbol. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 1058ecda9bedaa2c3438376caa5f1925f3d15bbd Author: Yoichi Yuasa Date: Sat Jul 8 00:42:01 2006 +0900 [MIPS] vr41xx: Changed workaround to recommended method Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 30f244aed36f569c2e3ea6e8457bf66adaf98a3d Author: Thiemo Seufer Date: Fri Jul 7 10:38:51 2006 +0100 [MIPS] Oprofile: Fix build failure due to warning and -Werror. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 192ef366198ce16c0379100565cdc5b7bd68511f Author: Ralf Baechle Date: Fri Jul 7 14:07:18 2006 +0100 [MIPS] TRACE_IRQFLAGS_SUPPORT support. Signed-off-by: Ralf Baechle commit 8d197f3d17d4f43eb7d032491af7fc959cbed4fa Author: Atsushi Nemoto Date: Fri Jul 7 14:26:41 2006 +0900 [MIPS] Fix rdhwr_op definition. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 565200a14641eb7ab7b96a726441f2e4d663d15c Author: Atsushi Nemoto Date: Fri Jul 7 00:26:02 2006 +0900 [MIPS] Do not count pages in holes with sparsemem With some memory model other than FLATMEM, the single node can contains some holes so there might be many invalid pages. For example, with two 256M memory and one 256M hole, some variables (num_physpage, totalpages, nr_kernel_pages, nr_all_pages, etc.) will indicate that there are 768MB on this system. This is not desired because, for example, alloc_large_system_hash() allocates too many entries. Use free_area_init_node() with counted zholes_size[] instead of free_area_init(). For num_physpages, use number of ram pages instead of max_low_pfn. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 7de58fab9ccb63b4194ce39cf163a7491921d037 Author: Atsushi Nemoto Date: Wed Jul 5 01:22:44 2006 +0900 [MIPS] Sparsemem fixes 1. MIPS should select SPARSEMEM_STATIC since allocating bootmem in memory_present() will corrupt bootmap area. 2. pfn_valid() for SPARSEMEM is defined in linux/mmzone.h Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit cfbae5d331b8872719b5cddb0ed5292c393ad78a Author: Thiemo Seufer Date: Wed Jul 5 18:43:29 2006 +0100 [MIPS] IP32: Fix wreckage caused by recent SA_* constant replacement. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 4e8ab3618273b8c5f87a46f82902fbd4138f97f4 Author: Yoichi Yuasa Date: Tue Jul 4 22:59:41 2006 +0900 [MIPS] VR41xx: Set VR41_CONF_BP only for PrId 0x0c80. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f72af3cf06370cedbe387364d447223e5252a000 Author: Yoichi Yuasa Date: Tue Jul 4 22:16:28 2006 +0900 [MIPS] MIPS MT: Fix build error. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 5af1c7a4d4942812c5172cc0806854837264fff5 Author: Thiemo Seufer Date: Wed Jul 5 14:32:51 2006 +0100 [MIPS] BCM1480: Fix fatal typo in the rewritten interrupt handler. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 6e61e85b0980f7b88cd5c4b822386ed00dd7e295 Author: Thiemo Seufer Date: Wed Jul 5 14:26:38 2006 +0100 [MIPS] Sibyte: Improve interrupt latency again for sb1250/bcm1480 this patch restores the behaviour of the old (assembly-written) interrupt handler, the handler is left as soon as a single interrupt cause is handled. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit fc5d2d279ff820172a698706d33e733d4578bd6c Author: Ralf Baechle Date: Thu Jul 6 13:04:01 2006 +0100 [MIPS] Use the proper technical term for naming some of the cache macros. Signed-off-by: Ralf Baechle commit 879ba8c88a32f2bd3d3369837afdc148bd66bb04 Author: Ralf Baechle Date: Thu Jul 6 09:47:52 2006 +0100 [MIPS] IP22: Remove SYS_SUPPORTS_SMP test code. Signed-off-by: Ralf Baechle commit 57725f9eb689d04c9ae4334cef65633c0b95558f Author: Chris Dearman Date: Fri Jun 30 23:35:28 2006 +0100 [MIPS] Panic on fp exception in kernel mode. There should never be a FP exception in kernel mode. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit e1a4e469d77297fd006a3cf2b605fc6f782a8d26 Author: Ralf Baechle Date: Mon Jul 3 17:02:35 2006 +0100 [MIPS] Malta: Fix build of certain configs. commit 6fe725c01c0c547c4287ba3de5ebc8f884178409 Author: Domen Puncer Date: Mon Jul 3 08:17:09 2006 +0200 [MIPS] au1xxx: Support both YAMON and U-Boot Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle commit c36cd4bab5084798b401d529129a950f4a48662d Author: Thiemo Seufer Date: Mon Jul 3 13:30:01 2006 +0100 [MIPS] Save 2k text size in cpu-probe The appended patch drops the inline for decode_configs, this saves about 2k of text size. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 3a01c49ad81d301fe7265dd63bfb15ee3c3754ef Author: Thiemo Seufer Date: Mon Jul 3 13:30:01 2006 +0100 [MIPS] Uses MIPS_CONF_AR instead of magic constants. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 31473747bd441719f9f6a07385684dce547533e0 Author: Atsushi Nemoto Date: Mon Jul 3 00:09:47 2006 +0900 [MIPS] Make SPARSEMEM selectable on QEMU. This might be helpfull to debug sparsemem on mips. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b1c6cd429b5f9fde39f5950ba9f2993286954f6c Author: Atsushi Nemoto Date: Mon Jul 3 00:09:47 2006 +0900 [MIPS] Make SPARSEMEM selectable on QEMU. This might be helpfull to debug sparsemem on mips. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit a5e68986e8e75546901010fe4e3485f6cd60b4a6 Author: Yoichi Yuasa Date: Sun Jul 2 23:17:27 2006 +0900 [MIPS] Au1000: Remove au1000 code. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit a722df087dc745a213573ed860be57a255e799bb Author: Yoichi Yuasa Date: Sun Jul 2 23:13:34 2006 +0900 [MIPS] vr41xx: Removed unused definitions for NEC CMBVR4133. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 722cfd90420b660ad13f933efb135daf1d0e5400 Author: Ralf Baechle Date: Sun Jul 2 16:31:14 2006 +0100 [MIPS] Wire up vmsplice(2) and move_pages(2). Signed-off-by: Ralf Baechle commit 94dee171df34b7955cd647da4c40ba67d55a7671 Author: Ralf Baechle Date: Sun Jul 2 14:41:42 2006 +0100 [MIPS] Eleminate interrupt migration helper use. > #define hw_interrupt_type irq_chip > typedef struct irq_chip hw_irq_controller; > #define no_irq_type no_irq_chip > typedef struct irq_desc irq_desc_t; Signed-off-by: Ralf Baechle commit e1e80b4d24eddd1a76cd386e25164cf159661bd6 Author: Ralf Baechle Date: Sat Jul 1 22:07:23 2006 +0100 [MIPS] Don't include obsolete . Signed-off-by: Ralf Baechle commit 2e128dedcd66d2f17f42a45dacc223fa2dcd8acd Author: Chris Dearman Date: Fri Jun 30 12:32:37 2006 +0100 [MIPS] Default cpu_has_mipsmt to a runtime check Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 70ae6126090686b2e957f0abd2a3c882e94c7071 Author: Chris Dearman Date: Fri Jun 30 12:32:37 2006 +0100 [MIPS] Use KERN_DEBUG to log the SDBBP messages Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit e35a5e35e0f45209a45ec2fd6df90f5ac3a05992 Author: Chris Dearman Date: Fri Jun 30 14:19:45 2006 +0100 [MIPS] Less noise on multithreading exceptions. Make the MT handler silent and output the MT exception type at debug priority. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 98ab66cdd182f35008fb8993bb930ddde88db923 Author: Ralf Baechle Date: Thu Jul 13 21:25:57 2006 +0100 [MIPS] Update defconfigs to 2.6.18-rc1. commit 8717433ccae06788e58d55699027b47d042be1f4 Author: Ralf Baechle Date: Sun Jun 25 17:42:21 2006 +0200 [MIPS] IP27: Don't destroy interrupt routing information on shutdown irq. This fixes the "not syncing: Could not identify cpu/level ..." panic when a PCI irq is requested the second time. Signed-off-by: Ralf Baechle commit 25969354a385f347b55aafb1040dfc21263fa7c3 Author: Ralf Baechle Date: Thu Jun 22 22:42:32 2006 +0100 [MIPS] Avoid interprocessor function calls. On the 34K where multiple virtual processors are implemented in a single core and share a single TLB, interprocessor function calls are not needed to flush a cache, so avoid them. Signed-off-by: Ralf Baechle commit 3e705f279a942471b258b1c7a9e54aa8ff36b89f Author: Russell King Date: Thu Jul 13 20:48:35 2006 +0100 [PATCH] Fix broken kernel headers preventing ARM build As a result of 894673ee6122a3ce1958e1fe096901ba5356a96b, the ARM architecture is more or less unbuildable - only one defconfig appears to build, with all others erroring out with: CC arch/arm/kernel/setup.o In file included from /home/rmk/git/linux-2.6-rmk/arch/arm/kernel/setup.c:22: /home/rmk/git/linux-2.6-rmk/include/linux/root_dev.h:7: warning: implicit declaration of function `MKDEV' ... Essentially, root_dev.h uses MKDEV and dev_t, but does not include any headers which provide either of these definitions. The reason it worked previously is that linux/tty.h just happened to include the required headers for linux/root_dev.h. Signed-off-by: Russell King Signed-off-by: Linus Torvalds commit f1aaee53f2877a7afa55e8245c241ff60a86367d Author: Arjan van de Ven Date: Thu Jul 13 14:46:03 2006 +0200 [PATCH] lockdep: annotate mm/slab.c mm/slab.c uses nested locking when dealing with 'off-slab' caches, in that case it allocates the slab header from the (on-slab) kmalloc caches. Teach the lock validator about this by putting all on-slab caches into a separate class. this patch has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 873623dfabaa6ebbdc1ce16c1766a3c0ec5d9923 Author: Ingo Molnar Date: Thu Jul 13 14:44:38 2006 +0200 [PATCH] lockdep: undo mm/slab.c annotation undo existing mm/slab.c lock-validator annotations, in preparation of a new, less intrusive annotation patch. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 8b1b21853bab15fe5b60b8222786fe036c4dc365 Author: Pierre Ossman Date: Tue Jul 11 21:07:10 2006 +0200 [MMC] Change SDHCI version error to a warning O2 Micro's controllers have a larger specification version value and are therefore denied by the driver. When bypassing this check they seem to work fine. This patch makes the code a bit more forgiving by changing the error to a warning. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit fb61e2895170920564410baadf71c5b3561dbf42 Author: Pierre Ossman Date: Tue Jul 11 21:06:48 2006 +0200 [MMC] Fix incorrect register access There was a writel() being used on a 16-bit register. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 5cbc1b6f66313111f64e779bf1df3799bf5c2df8 Author: Adrian Bunk Date: Tue Jul 11 15:37:55 2006 +0200 [ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge Since this assignment was the only place on !alpha where isa_bridge was touched, it didn't have any effect. Signed-off-by: Adrian Bunk Signed-off-by: Russell King commit 1b0f06d0b4860a8a73dc0b48540d82d8897ead71 Author: Greg Ungerer Date: Thu Jul 13 09:32:41 2006 +1000 [PATCH] m68knommu: fix result type in get_user() macro Keep the result holder variable the same type as the quantity we are retreiving in the get_user() macro - don't go through a pointer version of the user space address type. Using the address type causes problems if the address type was const (newer versions of gcc quite rightly error out for that condition). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit b43c7cec6bf9558336fb033d1217fc765d259c47 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Wed Jul 12 16:41:15 2006 -0400 [PATCH] i386: system.h: remove extra semicolons and fix order include/asm-i386/system.h has trailing semicolons in some of the macros that cause legitimate code to fail compilation, so remove them. Also remove extra blank lines within one group of macros. And put stts() and clts() back together; they got separated somehow. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Linus Torvalds commit a9da396a37fb3da5d0f212c41c6e96bcbf8fe590 Author: Koen Kooi Date: Thu Jul 13 13:04:24 2006 +0100 [ARM] 3729/3: EABI padding rules necessitate the packed attribute of floatx80 Patch from Koen Kooi EABI padding rules necessitate the packed attribute of floatx80, otherwise nwfpe complains about invalid structure sizes. Signed-off-by: Koen Kooi Signed-off-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit a83f982313bc60dd3d87e50f8c88d6a169e8a5a0 Author: David S. Miller Date: Wed Jul 12 23:19:31 2006 -0700 [SPARC]: Fix OF register translations under sub-PCI busses. There is an implicit assumption in the code that ranges will translate to something that can fit in 2 32-bit cells, or a 64-bit value. For certain kinds of things below PCI this isn't necessarily true. Here is what the relevant OF device hierarchy looks like for one of the serial controllers on an Ultra5: Node 0xf005f1e0 ranges: 00000000.00000000.00000000.000001fe.01000000.00000000.01000000 01000000.00000000.00000000.000001fe.02000000.00000000.01000000 02000000.00000000.00000000.000001ff.00000000.00000001.00000000 03000000.00000000.00000000.000001ff.00000000.00000001.00000000 device_type: 'pci' model: 'SUNW,sabre' Node 0xf005f9d4 device_type: 'pci' model: 'SUNW,simba' Node 0xf0060d24 ranges: 00000010.00000000 82010810.00000000.f0000000 01000000 00000014.00000000 82010814.00000000.f1000000 00800000 name: 'ebus' Node 0xf0062dac reg: 00000014.003083f8.00000008 --> 0x1ff.f13083f8 device_type: 'serial' name: 'su' So the correct translation here is: 1) Match "su" register to second ranges entry of 'ebus', which translates into a PCI triplet "82010814.00000000.f1000000" of size 00800000, which gives us "82010814.00000000.f13083f8". 2) Pass-through "SUNW,simba" since it lacks ranges property 3) Match "82010814.00000000.f13083f8" to third ranges property of PCI controller node 'SUNW,sabre', and we arrive at the final physical MMIO address of "0x1fff13083f8". Due to the 2-cell assumption, we couldn't translate to a PCI 3-cell value, and we couldn't perform a pass-thru on it either. It was easiest to just stop splitting the ranges application operation between two methods, ->map and ->translate, and just let ->map do all the work. That way it would work purely on 32-bit cell arrays instead of having to "return" some value like a u64. It's still not %100 correct because the out-of-range check is still done using the 64 least significant bits of the range and address. But it does work for all the cases I've thrown at it so far. Signed-off-by: David S. Miller commit 9bbd952e7f965757b5c913b6f98ad37a191137bd Author: David S. Miller Date: Wed Jul 12 21:16:07 2006 -0700 [SPARC64]: Refine Sabre wsync logic. It is only needed when there is a PCI-PCI bridge sitting between the device and the PCI host controller which is not a Simba APB bridge. Add logic to handle two special cases: 1) device behind EBUS, which sits on PCI 2) PCI controller interrupts Signed-off-by: David S. Miller commit 91d1ed1a6d225e3cf4bd8ede6235b1be65f7651a Author: David S. Miller Date: Wed Jul 12 21:04:21 2006 -0700 [SERIAL] sunsu: Handle keyboard and mouse ports directly. The sunsu_ports[] array exists merely to be able to easily use an integer index to get at the proper serial console port struct. We size this only for real ports, not for the keyboard and mouse, and thus keyboard and mouse port registration would fail. Fix this by dynamically allocating the port struct for the keyboard and mouse, instead of using the sunsu_ports[] array. Signed-off-by: David S. Miller commit a23c3a86e9952a8badb49a6bb1de455c1f5bad6d Author: David S. Miller Date: Wed Jul 12 15:59:53 2006 -0700 [SPARC64]: Fix 2 bugs in sabre_irq_build() When installing the IRQ pre-handler, we were not setting up the second argument correctly. It should be a pointer to the sabre_irq_data, not the config space PIO address. Furthermore, we only need this pre-handler installed if the device sits behind a PCI bridge that is not Sabre or Simba/APB. Signed-off-by: David S. Miller commit 17556fe861d8f76ed13e975ceb6eae450671aba1 Author: David S. Miller Date: Wed Jul 12 14:01:26 2006 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 50f73fe026b2bda49e53cef2dd57a79f84879733 Author: David Woodhouse Date: Wed Jul 12 13:56:53 2006 -0700 [SPARC64]: Fix make headers_install A minor typo in the include/asm-sparc64/Kbuild file prevents the make headers_install from building a useful tree of kernel headers for sparc64. Signed-off-by: David Woodhouse Signed-off-by: Tom "spot" Callaway Signed-off-by: David S. Miller commit 6cc8b6f51eb1af72882c279f691c5de7d5a43bf2 Author: Andrew Morton Date: Mon Jul 10 15:28:54 2006 -0700 [SPARC64]: of_device_register() error checking fix device_create_file() can fail. This causes the sparc64 compile to fail when my fanatical __must_check patch is applied, due to -Werror. [ Added necessary identical fix for sparc32. -DaveM] Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2f1b9250516aa8744496abbbbb8a6066cb2b56db Author: Linus Torvalds Date: Wed Jul 12 21:04:16 2006 -0700 Revert "[PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available" This reverts commit 5040cb8b7e61b7a03e8837920b9eb2c839bb1947. It breaks previously working ide-cs PIO configurations, causing problems like ide2: I/O resource 0xF883200E-0xF883200E not free. ide2: ports already in use, skipping probe rather than a working kernel. Cc: Thomas Kleffel Cc: Dominik Brodowski Signed-off-by: Linus Torvalds commit 72945b2b90a5554975b8f72673ab7139d232a121 Author: Len Brown Date: Wed Jul 12 22:46:42 2006 -0400 [PATCH] Revert "ACPI: execute Notify() handlers on new thread" This effectively reverts commit b8d35192c55fb055792ff0641408eaaec7c88988 by reverts acpi_os_queue_for_execution() to what it was before that, except it changes the name to acpi_os_execute() to match ACPICA 20060512. Signed-off-by: Len Brown [ The thread execution doesn't actually solve the bug it set out to solve (see http://bugzilla.kernel.org/show_bug.cgi?id=5534 for more details) because the new events can get caught behind the AML semaphore or other serialization. And when that happens, the notify threads keep on piling up until the system dies. ] Signed-off-by: Linus Torvalds commit a6f157a88d1398d7ccb743c5a56138edf6f6ef0b Author: Ian McDonald Date: Wed Jul 12 17:58:53 2006 -0700 [NET]: fix __sk_stream_mem_reclaim __sk_stream_mem_reclaim is only called by sk_stream_mem_reclaim. As such the check on sk->sk_forward_alloc is not needed and can be removed. Signed-off-by: Ian McDonald Acked-by: Herbert Xu Signed-off-by: David S. Miller commit cd6ef2ada54aa4788d5a3dee3cffaad41383a52a Author: Adrian Bunk Date: Fri Jun 30 02:15:42 2006 -0700 [PATCH] The scheduled unexport of insert_resource Implement the scheduled unexport of insert_resource. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 26865e9c26d2d336f385b821b531ce2b31008e20 Author: Adrian Bunk Date: Fri Jun 30 02:15:43 2006 -0700 [PATCH] remove kernel/power/pm.c:pm_unregister_all() Remove the deprecated and no longer used pm_unregister_all(). Signed-off-by: Adrian Bunk Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7e4ef085ea4b00cfc34e854edf448c729de8a0a5 Author: Adrian Bunk Date: Mon Jun 26 22:26:56 2006 +0200 [PATCH] Driver core: bus.c cleanups This patch contains the following cleanups: - make the needlessly global bus_subsys static - #if 0 the unused find_bus() Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 42734dafa43e453a8b6769a5ebd3a01ffc1fd116 Author: Henrik Kretzschmar Date: Wed Jul 5 00:53:19 2006 +0200 [PATCH] Driver core: kernel-doc in drivers/base/core.c corrections Corrects the kerneldocs for device_create() and device_destroy() with an eye on coding style, grammar and readability. Signed-off-by: Henrik Kretzschmar Signed-off-by: Greg Kroah-Hartman commit 7d12e9de5d73a836f040157b27166e68990ea9b4 Author: Randy Dunlap Date: Thu Jun 22 15:14:07 2006 -0700 [PATCH] Driver core: fix driver-core kernel-doc Warning(/var/linsrc/linux-2617-g4//drivers/base/core.c:574): No description found for parameter 'class' Warning(/var/linsrc/linux-2617-g4//drivers/base/core.c:574): No description found for parameter 'devt' Warning(/var/linsrc/linux-2617-g4//drivers/base/core.c:626): No description found for parameter 'devt' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit ffadcc2ff42ecedf71ea67d9051ff028927aed08 Author: Kristen Carlson Accardi Date: Wed Jul 12 08:59:00 2006 -0700 [PATCH] PCI: PCIE power management quirk When changing power states from D0->DX and then from DX->D0, some Intel PCIE chipsets will cause a device reset to occur. This will cause problems for any D State other than D3, since any state information that the driver will expect to be present coming from a D1 or D2 state will have been cleared. This patch addes a flag to the pci_dev structure to indicate that devices should not use states D1 or D2, and will set that flag for the affected chipsets. This patch also modifies pci_set_power_state() so that when a device driver tries to set the power state on a device that is downstream from an affected chipset, or on one of the affected devices it only allows state changes to or from D0 & D3. In addition, this patch allows the delay time between D3->D0 to be changed via a quirk. These chipsets also need additional time to change states beyond the normal 10ms. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 6f0312fd7e0e6f96fd847b0b2e1e0d2d2e8ef89d Author: Zhang, Yanmin Date: Wed Jul 12 09:41:47 2006 +0800 [PATCH] PCI: add PCI Express AER register definitions to pci_regs.h Add new defines of PCI-Express AER registers and their bits into file include/linux/pci_regs.h. Signed-off-by: Zhang Yanmin Signed-off-by: Greg Kroah-Hartman commit 709cf5ea7a8bea1b956d361ee7cef1945423200c Author: Matthew Garrett Date: Fri Jun 30 02:31:25 2006 -0700 [PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume Some VIA southbridges contain a flag in the ACPI register space that indicates whether an abnormal poweroff has occured, presumably with the intention that it can be cleared on clean shutdown. Some BIOSes check this flag at resume time, and will re-POST the system rather than jump back to the OS if it's set. Clearing it at boot time appears to be sufficient. I'm not sure if drivers/pci/quirks.c is the right place to do it, but I'm not sure where would be cleaner. [akpm@osdl.org: cleanups, build fix] Signed-off-by: Matthew Garrett Cc: Greg KH Cc: "Brown, Len" Cc: "Yu, Luming" Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6e2338992c5a7d0711ce09f1d1b79a1a27d37bca Author: Adrian Bunk Date: Wed Jun 28 18:54:33 2006 +0200 [PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort() This patch adds a proper prototype for pcibios_sort() in arch/i386/pci/pci.h. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit a969888ce91673c7f4b86520d851a6f0d5a5fa7d Author: Greg Kroah-Hartman Date: Tue Jul 11 21:22:58 2006 -0700 [PATCH] USB: move usb-serial.h to include/linux/usb/ USB serial outside of the kernel tree can not build properly due to usb-serial.h being buried down in the source tree. This patch moves the location of the file to include/linux/usb and fixes up all of the usb serial drivers to handle the move properly. Cc: Sergei Organov Signed-off-by: Greg Kroah-Hartman commit 166ffccfd4556ac6a777982d193ae145bb0a21e0 Author: Luiz Fernando N. Capitulino Date: Tue Jul 11 14:19:25 2006 -0300 [PATCH] USB: Anydata: Fixes wrong URB callback. Anydata is using usb_serial_generic_write_bulk_callback() for its read URB, but it should use usb_serial_generic_read_bulk_callback() instead (it's a read URB, isn't it?). Reported by Jon K Hellan . Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit a353678d3136306c1d00f0d2319de1dac8a6b1db Author: David Brownell Date: Thu Jul 6 15:48:53 2006 -0700 [PATCH] USB: gadget section fixups Recent section changes broke gadget builds on some platforms. This patch is the best fix that's available until better section markings exist: - There's a lot of cleanup code that gets used in both init and exit paths; stop marking it as "__exit". (Best fix for this would be an "__init_or_exit" section marking, putting the cleanup in __init when __exit sections get discarded else in __exit.) - Stop marking the use-once probe routines as "__init" since references to those routines are not allowed from driver structures. They're now marked "__devinit", which in practice is a net lose. (Best fix for this is likely to separate such use-once probe routines from the driver structure ... but in general, all busses that aren't hotpluggable will be forced to waste memory for all probe-only code.) In general these broken section rules waste an average of two to four kBytes per driver of code bloat ... because none of the relevant code can ever be reused after module initialization. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 5501a48c15d4a3b81bee1358eb195e26c798d78f Author: Phil Dibowitz Date: Tue Jul 4 12:46:43 2006 -0700 [PATCH] USB: another unusual device Please add the attached device to unusual_devs.h. Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit e1979fef347f534c3797eaa3e10825235ed72766 Author: Colin Leroy Date: Tue Jul 11 11:36:43 2006 +0200 [PATCH] USB: Add one VID/PID to ftdi_sio This patch adds the Testo USB interface to the list of devices recognized by the ftdi_sio module. This device is based on a FT232BL chip, and is used as an interface to get data from digital sensors (thermometer, etc). See http://www.testo.com/ Signed-off-by: Colin Leroy Signed-off-by: Greg Kroah-Hartman commit 7e3bd120e52971d5e255ca800f7de6bf83d8f2d1 Author: Lars Jacob Date: Mon Jul 10 11:53:58 2006 -0400 [PATCH] USB: unusual_devs entry for Sony DSC-H5 This patch (as749) extends the unusual_devs entry for the Sony DSC-T1 and T5 to cover the H5 as well. From: Lars Jacob Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 57b01b1e393b8b874421fb77d4f078b8ce725e63 Author: Alan Stern Date: Mon Jul 10 11:51:12 2006 -0400 [PATCH] USB: unusual_devs entry for Nokia E61 This patch (as748) adds an unusual_devs entry for the Nokia E61 mobile phone. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 9a01355e1779356a69d80d917aef009eda44284a Author: Alan Stern Date: Fri Jul 7 13:45:13 2006 -0400 [PATCH] USB: unusual_devs entry for Nokia N91 This patch (as745) adds an unusual_devs entry for the Nokia N91, just like the entry for the N80 added a couple of weeks ago. Apparently Nokia isn't using very good firmware these days... Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b6c2799dec0c9f6f6de35c2161b246c910108204 Author: Dan Streetman Date: Wed Jul 5 19:17:27 2006 -0400 [PATCH] USB: add ZyXEL vendor/product ID to rtl8150 driver I just got a "ZyXEL Prestige USB Adapter" that is actually RTL8150 adapter. Here is the relevant /proc/bus/usb/devices output (after adding the vendor/product IDs to the driver): T: Bus=01 Lev=02 Prnt=02 Port=02 Cnt=02 Dev#=119 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 P: Vendor=0586 ProdID=401a Rev= 1.00 S: Manufacturer=ZyXEL S: Product=Prestige USB Adapter S: SerialNumber=1027 C:* #Ifs= 1 Cfg#= 1 Atr=80 MxPwr=120mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=ff Driver=rtl8150 E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=83(I) Atr=03(Int.) MxPS= 8 Ivl=1ms This patch adds the ZyXEL vendor ID to the rtl8150.c driver. The device has absolutely no identifying marks on the outside for model type, just a serial number, and I can't find anything on ZyXEL's website, so I called the product ID PRODUCT_ID_PRESTIGE to match the product string. Signed-off-by: Dan Streetman Acked-by: Signed-off-by: Greg Kroah-Hartman commit e37de9e0d6591706a76cff63582cbc721c317333 Author: Matthias Urlichs Date: Thu Jul 6 13:12:53 2006 +0200 [PATCH] USB: Option driver: new product ID Yet another "same name, somewhat different hardware" product. Signed-Off-By: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit b857c651e7e369c12098007772549f817b3bf961 Author: Navaho Gunleg Date: Fri Jun 30 09:44:03 2006 +0200 [PATCH] USB: add support for WiseGroup., Ltd SmartJoy Dual PLUS Adapter This patch is to get the WiseGroup.,Ltd SmartJoy Dual Plus PS2-to-USB Adapter [0x6677:0x8802] correctly detected. It sets the NOGET and MULTI_INPUT quirks to make 2 joystick nodes appear in stead of only one. (As of yet, only confirmed working by myself.) Signed-off-by: Navaho Gunleg Signed-off-by: Greg Kroah-Hartman commit b2f1b0d4649a6597c7320bf359e71014653c630d Author: Bart Oldeman Date: Sun Jul 2 15:07:10 2006 +1200 [PATCH] USB: ipw.c driver fix The below patch fixes the ipw module in kernel 2.6.17 for me; without this change it simply does not work at all (all but the first writes are refused because write_urb_busy is always 1). This problem was there in 2.6.15 as well, but at that point I used the (updated) ipw.c, version 0.4, from http://www.neology.co.za/products/opensource/ipwireless/ which no longer compiles with 2.6.17. It can be made to after a few changes but obviously it's easier if the built-in ipw driver works instead of having to download one from the neology site. From: Bart Oldeman Signed-off-by: Greg Kroah-Hartman commit 49e523b90741b936c874c376b5d140add5c0084d Author: Michal Piotrowski Date: Mon Jul 3 14:20:39 2006 +0200 [PATCH] USB: remove devfs information from Kconfig Devfs is gone. We can remove that information. Signed-off-by: Michal Piotrowski Signed-off-by: Greg Kroah-Hartman commit 028d2a39d1cbcf17242a915f0852acdd36660822 Author: Christoph Lameter Date: Fri Jun 30 02:34:47 2006 -0700 [PATCH] USB: remove empty destructor from drivers/usb/mon/mon_text.c Remove destructor and call kmem_cache_create with NULL for the destructor. Acked-by: Pekka Enberg Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Cc: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit b33488eb5c27c13c3e88cdf29d344ccdcb0859f2 Author: Frank Gevaerts Date: Fri Jun 30 02:34:45 2006 -0700 [PATCH] USB: ipaq.c timing parameters Adds configurable waiting periods to the ipaq connection code. These are not needed when the pocketpc device is running normally when plugged in, but they need extra delays if they are physically connected while rebooting. There are two parameters : * initial_wait : this is the delay before the driver attemts to start the connection. This is needed because the pocktpc device takes much longer to boot if the driver starts sending control packets too soon. * connect_retries : this is the number of times the control urb is retried before finally giving up. The patch also adds a 1 second delay between retries. I'm not sure if the cases where this patch is useful are general enough to include this in the kernel. Signed-off-by: Frank Gevaerts Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b512504e5671f83638be0ddb085c4b1832f623d3 Author: Frank Gevaerts Date: Fri Jun 30 02:34:44 2006 -0700 [PATCH] USB: ipaq.c bugfixes This patch fixes several problems in the ipaq.c driver with connecting and disconnecting pocketpc devices: * The read urb stayed active if the connect failed, causing nullpointer dereferences later on. * If a write failed, the driver continued as if nothing happened. Now it handles that case the same way as other usb serial devices (fix by Luiz Fernando N. Capitulino ) Signed-off-by: Frank Gevaerts Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b972b68c396cfa9f8af7e0b314e22705251bc218 Author: David Brownell Date: Fri Jun 30 02:34:42 2006 -0700 [PATCH] USB: ehci: fix bogus alteration of a local variable In a rare and all-but-unused path, the EHCI driver could reuse a variable in a way that'd make trouble. Specifically, if the first root hub port gets an overcurrent event (rare) during a remote wakeup scenario (all but unused in today's Linux, except for folk working with suspend-to-RAM and similar sleep states), that would look like a fatal error which would shut down the controller. Fix by not reusing that variable. Spotted by Per Hallsmark Fixes http://bugzilla.kernel.org/show_bug.cgi?id=6661 Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 69de51fdda3fd984541978313b66e4f2c44cc23e Author: Kevin Lloyd Date: Fri Jun 30 11:17:55 2006 -0700 [PATCH] USB: add driver for non-composite Sierra Wireless devices This patch creates a new driver, sierra.c, that supports the new non-composite Sierra Wireless WWAN devices. The older Sierra Wireless and Airprime devices are supported in airprime.c. Signed-off-by: Kevin Lloyd Signed-off-by: Greg Kroah-Hartman commit 053be305d3a5ae0152991f25c6579127fb48710c Author: Eric Sesterhenn Date: Tue Jun 27 00:57:42 2006 +0200 [PATCH] USB: fix pointer dereference in drivers/usb/misc/usblcd coverity spotted (id #185) that we still use urb, if the allocation fails in the error path. This patch fixes this by returning directly. Signed-off-by: Eric Sesterhenn Signed-off-by: Greg Kroah-Hartman commit c1b45f247a2901de3982f33196d5caf8ca5b9799 Author: Kyle McMartin Date: Sun Jun 25 18:45:29 2006 -0400 [PATCH] USB: Kill compiler warning in quirk_usb_handoff_ohci Move variables only used on !__hppa__ into that #ifndef section. This cleans up a compiler warning on parisc. Problem pointed out by Joel Soete. Signed-off-by: Kyle McMartin Signed-off-by: Greg Kroah-Hartman commit 224654004ca688af67cec44d9300e8c3f647577c Author: Ian Abbott Date: Mon Jun 26 12:59:17 2006 +0100 [PATCH] USB serial ftdi_sio: Prevent userspace DoS This patch limits the amount of outstanding 'write' data that can be queued up for the ftdi_sio driver, to prevent userspace DoS attacks (or simple accidents) that use up all the system memory by writing lots of data to the serial port. The original patch was by Guillaume Autran, who in turn based it on the same mechanism implemented in the 'visor' driver. I (Ian Abbott) re-targeted the patch to the latest sources, fixed a couple of errors, renamed his new structure members, and updated the implementations of the 'write_room' and 'chars_in_buffer' methods to take account of the number of outstanding 'write' bytes. It seems to work fine, though at low baud rates it is still possible to queue up an amount of data that takes an age to shift (a job for another day!). Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 00d6058ac93048b525b86fa48b413dcb87ac2728 Author: Ian Abbott Date: Mon Jun 26 11:44:22 2006 +0100 [PATCH] USB serial visor: fix race in open/close The anti user-DoS mechanism in the USB serial 'visor' driver can fail in the following way: visor_open: priv->outstanding_urbs = 0 visor_write: ++priv->outstanding_urbs visor_close: visor_open: priv->outstanding_urbs = 0 visor_write_bulk_callback: --priv->outstanding_urbs So priv->outstanding_urbs ends up as (unsigned long)(-1). Not good! I haven't seen this happen with the visor driver as I don't have the hardware, but I have seen it while testing a patch to implement the same functionality in the ftdi_sio driver (patch not yet submitted). The fix is pretty simple: don't reinitialize outstanding_urbs in visor_open. (Again, I haven't tested the fix in visor, but I have tested it in ftdi_sio.) Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 5650b4dd141e823c2b1bc248cb9ad3e9ac88cf19 Author: Phil Dibowitz Date: Sat Jun 24 17:27:54 2006 -0700 [PATCH] USB Storage: Uname in PR/SC Unneeded message This patch adds the kernel version to the usb-storage Protocol/SubClass unneeded message in order to help us troubleshoot such problems. Signed-off-by: Phil Dibowitz Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 883d989a7edf7a62e38e9150990b56209420e9e5 Author: Phil Dibowitz Date: Sat Jun 24 17:27:10 2006 -0700 [PATCH] USB Storage: US_FL_MAX_SECTORS_64 flag This patch adds a US_FL_MAX_SECTORS_64 and removes the Genesys special-cases for this that were in scsiglue.c. It also adds the flag to other devices reported to need it. Signed-off-by: Phil Dibowitz Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 20307949469269ceea6262aaa306dcb55cf43b25 Author: Alan Stern Date: Wed Jun 28 11:20:41 2006 -0400 [PATCH] usbcore: fixes for hub_port_resume This patch (as731) makes a couple of small fixes to the hub_port_resume routine: Don't return status >= 0 when an error occurs; Clear the port-change-suspend status indicator after resuming a device. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d8840d60218ac80c74af3b35adbc4cee93c25f18 Author: Ernis Date: Mon Jun 26 16:02:43 2006 -0400 [PATCH] USB: unusual_devs entry for Samsung MP3 player This patch (as730) contains an unusual_devs entry for a Samsung MP3 device. From: Ernis Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0ddc0634714552af355a1fa11bad6051e6cb12ff Author: Davide Perini Date: Mon Jun 19 17:07:39 2006 -0400 [PATCH] usb-storage: unusual_devs entry for Motorola RAZR V3x This patch (as725) adds an unusual_devs entry for the Motorola RAZR V3x. From: Davide Perini Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b40b7a905ce57608ca93c5032d5ab1f5508d2f11 Author: Alan Stern Date: Mon Jun 19 15:12:38 2006 -0400 [PATCH] USB hub: don't return status > 0 from resume finish_device_resume() in the hub driver isn't careful always to return a negative code in all the error pathways. It also doesn't return 0 in all the success pathways. This patch (as724) fixes the behavior. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit eecd11ed47c8c9bd8e7e3dff35baccae18dd0d84 Author: Alan Stern Date: Mon Jun 19 14:50:15 2006 -0400 [PATCH] usb-storage: fix race between reset and disconnect My recent patch converting usb-storage to use usb_reset_composite_device() added a bug, a race between reset and disconnect. It was necessary to drop the private lock while executing a reset, and if a disconnect occurs at that time it will cause a crash. This patch (as722) fixes the problem by explicitly checking for an early termination after executing each command. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 3dd2ae81f70f191f5b6751d18fdfe61dbafda7e8 Author: Oliver Neukum Date: Fri Jun 23 09:14:17 2006 +0200 [PATCH] USB: update for acm in quirks and debug this adds better debugging output & an update of the quirk list to the acm driver Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 9189bfc2df0fd87e0e537fe7ad4cf3b66a440fe4 Author: Oliver Bock Date: Thu Jun 22 19:04:47 2006 +0200 [PATCH] USB: rename Cypress CY7C63xxx driver to proper name and fix up some tiny things This is a new driver for the Cypress CY7C63xxx mirco controller series. It currently supports the pre-programmed CYC63001A-PC by AK Modul-Bus GmbH. It's based on a kernel 2.4 driver (cyport) by Marcus Maul which I ported to kernel 2.6 using sysfs. I intend to support more controllers of this family (and more features) as soon as I get hold of the required IDs etc. Please see the source code's header for more information. Signed-off-by: Oliver Bock Signed-off-by: Greg Kroah-Hartman commit 58a5b0a6346b71bf01f0d49cfcc91d3225a373aa Author: Zoran Marceta Date: Thu Jun 22 13:28:11 2006 -0400 [PATCH] usbfs: use the correct signal number for disconnection usbfs stores the wrong signal number in the siginfo structure used for notifying user programs about device disconnect. This patch (as726) fixes it. From: Zoran Marceta Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 3b92847425a98d26ad9d2b8682d3ce6020c90752 Author: Matthew Meno Date: Wed Jun 21 15:25:53 2006 -0400 [PATCH] USB: Support for Susteen Datapilot Universal-2 cable in pl2303 The Susteen Datapilot cable (http://www.susteen.com/productdetail/71/producthl/Notempty) has an internal pl2303 to communicate with a set of dummy connector-ends that connect to a variety of cell phones. I've found that it works right out of the box by simply adding the product/vendor id to the pl2303 driver. Signed-off-by: Matt Meno Signed-off-by: Greg Kroah-Hartman commit 5b5daf77a6250f2b1983d092d8237cb169488774 Author: Inaky Perez-Gonzalez Date: Mon Jun 19 18:19:01 2006 -0700 [PATCH] USB: Add some basic WUSB definitions This patch adds basic Wireless USB 1.0 definitions to usb_ch9.h that fit into the existing set of declarations. Boils down to two new recipients for requests (ports and remote pipes), rpipe reset and abort request codes and wire adapter and remote pipe descriptor types. Wire adapters are the USB <-> Wireless USB adaptors; remote pipes are used by those adapters to pipe the host <-> endpoint traffic. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: Greg Kroah-Hartman commit bd97c4f035b47c1a3ae5cc5ceccdda028b25e9d5 Author: Pete Zaitcev Date: Wed Jun 21 15:03:40 2006 -0700 [PATCH] USB: fix visor leaks This patch fixes blatant leaks in visor driver and makes it report mode sensible things in ->write_room (this is only needed if your visor is a terminal though). It is made to fit into 80 columns with a temporary variable. Might even save a few instructions... Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 34f8e761724ecbfe46246f3faa4c7dbfc3555c26 Author: Pete Zaitcev Date: Wed Jun 21 15:00:45 2006 -0700 [PATCH] USB: fix usb-serial leaks, oopses on disconnect This fix addresses two issues: - Unattached port structures were not freed - My initial fix for crash when eventd runs a work in a freed port did not go far enough Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 92164c5dd1ade33f4e90b72e407910de6694de49 Author: David Miller Date: Wed Jun 21 22:26:09 2006 -0700 [PATCH] USB: OHCI hub code unaligned access I noticed this while debugging something unrelated on sparc64. Signed-off-by: David S. Miller Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit c0f8d56197f7d15f841e7d9d6f88909f4feba678 Author: Christophe Mariac Date: Fri Jun 23 17:36:21 2006 +0200 [PATCH] USB: new device ids for ftdi_sio driver Signed-off-by: Greg Kroah-Hartman commit 48437486c69b4baf68ee98530d8119897148c602 Author: D. Peter Siddons Date: Sat Jun 17 18:09:15 2006 -0400 [PATCH] USB: new device id for Thorlabs motor driver Signed-off-by: Greg Kroah-Hartman commit 3d861494729c70d9ebeb7d93caa107897925c355 Author: Peter Moulder Date: Mon Jun 19 22:47:49 2006 +1000 [PATCH] USB: Addition of vendor/product id pair for pl2303 driver Text from the back of the box, for your information/amusement: USB DATA CABLE FOR K700 Series The USB Cable is an ideal link between your mobile phone and PC. Employing the user-friendiy [sic] USB standard,its capacity for rapid data transfer enables functions such as synchronization of phone book and calendar,as well as Internet browsing via a modem-enabled phone.Autual [sic] connection speed is dependent on phone capacity. MADE IN CHINA From: Peter Moulder Signed-off-by: Greg Kroah-Hartman commit 7fac9a3348921e0fc626c7856ce3d1a9746b2b39 Author: Randy Dunlap Date: Thu Jun 22 15:12:41 2006 -0700 [PATCH] USB: fix usb kernel-doc Warning(/var/linsrc/linux-2617-g4//include/linux/usb.h:66): No description found for parameter 'ep_dev' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit a5b7474a0364507d168c7ff473e2d82deb676b08 Author: Lennert Buytenhek Date: Fri Jun 23 23:02:01 2006 +0200 [PATCH] USB: ohci bits for the cirrus ep93xx This patch adds OHCI glue bits for the USB host interface in the Cirrus ep93xx (arm920t) CPU. Signed-off-by: Lennert Buytenhek Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d14feb5ee4a46218f92b21ed52338b64130a151b Author: Daniel Mack Date: Fri Jun 23 21:36:07 2006 +0100 [PATCH] USB: au1200: EHCI and OHCI fixes I received an DBAU1200 eval kit from AMD a few days ago and tried to enable the USB2 port, but the current linux-2.6 GIT did not even compile with CONFIG_SOC_1200, CONFIG_SOC_AU1X00, CONFIG_USB_EHCI and CONFIG_USB_OHCI set. Furthermore, in ehci-hcd.c, platform_driver_register() was called with an improper argument of type 'struct device_driver *' which of course ended up in a kernel oops. How could that ever have worked on your machines? Anyway, here's a trivial patch that makes the USB subsystem working on my board for both OHCI and EHCI. It also removes the /* FIXME use "struct platform_driver" */. Signed-off-by: Daniel Mack Signed-off-by: Ralf Baechle Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 18577a6184efbd95a72562c0c590218460d6ea33 Author: Domen Puncer Date: Fri Jun 23 11:55:43 2006 +0100 [PATCH] USB: au1xxx: compile fixes for OHCI for au1200 Compile fixes for au1200 ohci. First part looks a bit hackish... but it works for me. Signed-off-by: Domen Puncer Signed-off-by: Greg Kroah-Hartman commit 5cab828bf0f52f3697a61aa99c54ee43844f53c0 Author: Hans de Goede Date: Wed Jul 5 18:09:09 2006 +0200 [PATCH] hwmon: Documentation update for abituguru Documentation update for the new bank1_types module param. Also add what we know about different revisions of the uGuru and a note that the abituguru driver unfortunatly does not work with the latest and greatest motherboards, which have what I think is revision 4 of the uGuru. Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 9b2ad1298232a4016a407261bd6811294b09ba97 Author: Hans de Goede Date: Wed Jul 5 18:07:49 2006 +0200 [PATCH] hwmon: Fix for first generation Abit uGuru chips Now that the abituguru driver is seeing some more widespread testing it has turned out that one the first generation of Abit uGuru motherboards, with uGuru revision 1, the autodetect bank1 sensor type code doesn't (always) work. This patch adds a module param to override the autodetect, and it adds validity checks for the value of the 2 other autodetection override module params. An example of howto use the new param can be found here: http://lm-sensors.org/wiki/Configurations/Abit/AN7 Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 1392707977de9e0df18123d56c3148cb0b1c6ab5 Author: Charles Spirakis Date: Wed Jul 5 18:05:15 2006 +0200 [PATCH] hwmon: New maintainer for w83791d Add Charles Spirakis as the maintainer for the w83791d sensor chip driver. Signed-off-by: Charles Spirakis Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 50436a47c6b10c6e4e84e24ea44c5cb85bbcd290 Author: Ben Gardner Date: Sat Jul 1 17:22:18 2006 +0200 [PATCH] pca9539: Honor the force parameter The pca9539 driver doesn't honor the force parameter; it always does detection. This patch will skip detection if forced. Signed-off-by: Ben Gardner Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 5313775f18f22f1dac2b548b598d47d65f90e6b0 Author: Uwe Bugla Date: Sat Jul 1 17:25:08 2006 +0200 [PATCH] i2c-algo-bit: Wipe out dead code i2c-algo-bit: Wipe out dead code Signed-off-by: Uwe Bugla Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b39ad0cf7c19fc14e8f823b1b36245f7a3711655 Author: Mark M. Hoffman Date: Sat Jul 1 17:16:06 2006 +0200 [PATCH] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers Content-Disposition: inline; filename=i2c-algo-error-handling-fix.patch It is possible for i2c_add_adapter() to fail. Several I2C algorithm drivers ignore that fact. This (compile-tested only) patch fixes them. Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 5d925fecac26651e6b0e19cf4ca16933aa640f99 Author: Jean Delvare Date: Sat Jul 1 17:14:32 2006 +0200 [PATCH] i2c: New mailing list We have a new mailing list dedicated to linux i2c: http://lists.lm-sensors.org/mailman/listinfo/i2c Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 5a0174831c48df04df83339578b409c7b5f75885 Author: Jean Delvare Date: Sat Jul 1 17:13:37 2006 +0200 [PATCH] i2c-ite: Plan for removal Plan the i2c-ite and i2c-algo-ite drivers for removal. These drivers never compiled since they were added to the kernel tree 5 years ago. Also see: http://marc.theaimsgroup.com/?l=linux-mips&m=115040510817448 Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 8ced8eee8537b52ef5d77e28d7676ce81bc62359 Author: Jean Delvare Date: Sat Jul 1 17:12:53 2006 +0200 [PATCH] i2c-powermac: Fix master_xfer return value Fix the value returned by the i2c-powermac's master_xfer method. It should return the number of messages processed successfully, but instead returns the number of data bytes in the first (and only) processed message. Also explicitly mention the master_xfer convention so that future implementations get it right directly. Signed-off-by: Jean Delvare Acked-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit c3efacaa68a75049a859cbfd03d52dfdebb7527b Author: Jean Delvare Date: Sat Jul 1 17:06:43 2006 +0200 [PATCH] scx200_acb: Fix the block transactions The scx200_acb i2c bus driver pretends to support SMBus block transactions, but in fact it implements the more simple I2C block transactions. Additionally, it lacks sanity checks on the length of the block transactions, which could lead to a buffer overrun. This fixes an oops reported by Alexander Atanasov: http://marc.theaimsgroup.com/?l=linux-kernel&m=114970382125094 Thanks to Ben Gardner for fixing my bugs :) Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit fd627a01477dadaef3bc8556e5e9d0ef80310c3a Author: Thomas Andrews Date: Sat Jul 1 17:05:12 2006 +0200 [PATCH] scx200_acb: Fix the state machine Fix the scx200_acb state machine: * Nack was sent one byte too late on reads >= 2 bytes. * Stop bit was set one byte too late on reads. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 39288e1ac10b3b9a68a629be67d81a0b53512c4e Author: Peter Milne Date: Sat Jul 1 17:03:20 2006 +0200 [PATCH] i2c-iop3xx: Avoid addressing self Avoid addressing self when sending a slave address. Follows instruction in Intel 80331/80321 manuals. Ignoring this worked previously on 80321, but causes a hang on i2cdetect on 80331. Signed-off-by: Peter Milne Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2369df933f1c632ec3f230774019e37c3969b7ec Author: Mark M. Hoffman Date: Sat Jul 1 17:01:59 2006 +0200 [PATCH] i2c: Fix 'ignore' module parameter handling in i2c-core This patch fixes a bug in the handling of 'ignore' module parameters of I2C client drivers. Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 22e1170310ec6afa41e0dc7ac9dfac735d82dcab Author: Stephen Hemminger Date: Wed Jul 12 15:23:48 2006 -0700 [PATCH] sky2: optimize receive restart When the driver handles multiple packets per NAPI poll, it is better to reload the receive ring, then tell the hardware. Otherwise, under packet storm with flow control, the driver/hardware will degrade down to one packet getting through per pause-exchange. Likewise on transmit, don't wakeup until a little more than minimum ring space is available. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit afa195da458cb06f302c37f8d37b21b177060aed Author: Stephen Hemminger Date: Wed Jul 12 15:23:47 2006 -0700 [PATCH] sky2: PHY power on delays The documentation says we need to wait after turning on the PHY. Also, don't enable WOL by default. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 6a5706b99c98e3c974cf5b55324e4eed7f82e55a Author: Stephen Hemminger Date: Wed Jul 12 15:23:46 2006 -0700 [PATCH] sky2: NAPI suspend/resume of dual port cards The changes to handle suspend/resume didn't handle the case where a dual port card has the first port down, but the second is running. In this driver, all NAPI polling is done on the primary port. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 59139528c8e7880eee437e81647ade1b36af0d41 Author: Stephen Hemminger Date: Wed Jul 12 15:23:45 2006 -0700 [PATCH] sky2: sky2_reset section mismatch Since sky2_reset gets call from sky2_resume it shouldn't be tagged with devinit. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f326fe768b39fe4131b1e2ca266c9c385ca307f4 Author: Stephen Hemminger Date: Wed Jul 12 15:23:44 2006 -0700 [PATCH] sk98lin: fix truncated collision threshold mask Patch to correct broken collision threshold mask in (same problem as sky2 driver). Should be three bits wide, but the mask only allows for 1 bit to be set. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 83405f058eb78b515ccf5b9066fe0a51d55114a0 Author: Stephen Hemminger Date: Wed Jul 12 15:23:43 2006 -0700 [PATCH] skge: fix truncated collision threshold mask Patch to correct broken collision threshold mask in (same problem as sky2 driver). Should be three bits wide, but the mask only allows for 1 bit to be set. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit fbb88b3e0b59fbc877c884f5fc978428b2fe7aea Author: Stephen Hemminger Date: Wed Jul 12 15:23:42 2006 -0700 [PATCH] sky2: fix truncated collision threshold mask Patch to correct broken collision threshold mask in sky2 driver. Should be three bits wide, but the mask only allows for 1 bit to be set. Thanks & Regards Neil Signed-off-by: Neil Horman Signed-off-by: Stephen Hemminger sky2.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit f01cfb3638a2f1ee584913f37e5ba7a8abfed8de Author: Adrian Bunk Date: Wed Jun 28 21:05:31 2006 +0400 [PATCH] w1: remove drivers/w1/w1.h drivers/w1/w1_io.h is both a subset of drivers/w1/w1.h and no longer #include'd by any file. This patch therefore removes w1_io.h. Signed-off-by: Adrian Bunk Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit b4786f1893305312d0a3e602de9080b1b932a681 Author: Ben Gardner Date: Thu Jun 29 22:33:22 2006 +0400 [PATCH] w1: fix idle check loop in ds2482 The idle check loop has a greater-than where it should have a less-than. This causes the ds2482 driver to check for the idle condition exactly once, which causes it to fail on faster machines. Signed-off-by: Ben Gardner Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 4e35dea2f26b16735b242ed1ae876157f46f3b23 Author: Evgeniy Polyakov Date: Mon Jun 19 09:59:02 2006 +0400 [PATCH] W1: remove w1 mail list from lm_sensors. lm_sensors mail list is going to be splitted into separate subdev lists, so remove w1 from there. http://lists.lm-sensors.org/pipermail/lm-sensors/2006-June/016507.html Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit fd1278d720b48ad7576f64014b916cc77365cb3f Author: Marcel Holtmann Date: Wed Jul 12 23:00:07 2006 +0200 [Bluetooth] Fix deadlock in the L2CAP layer The Bluetooth L2CAP layer has 2 locks that are used in softirq context, (one spinlock and one rwlock, where the softirq usage is readlock) but where not all usages of the lock were _bh safe. The patch below corrects this. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Marcel Holtmann commit 0263603a01e802f79e369ac489793e5320031560 Author: Marcel Holtmann Date: Wed Jul 12 22:57:52 2006 +0200 [Bluetooth] Let BT_HIDP depend on INPUT This patch lets BT_HIDP depend on instead of select INPUT. This fixes the following warning during an s390 build: net/bluetooth/hidp/Kconfig:4:warning: 'select' used by config symbol 'BT_HIDP' refer to undefined symbol 'INPUT' A dependency on INPUT also implies !S390 (and therefore makes the explicit dependency obsolete) since INPUT is not available on s390. The practical difference should be nearly zero, since INPUT is always set to y unless EMBEDDED=y (or S390=y). Signed-off-by: Adrian Bunk Signed-off-by: Marcel Holtmann commit 420cc3505f91246699bcfb88d30c4466adc0b87b Author: Marcel Holtmann Date: Thu Jul 6 15:53:31 2006 +0200 [Bluetooth] Avoid NULL pointer dereference with tty->driver This patch checks for tty->driver before trying to call flush_buffer(). Signed-off-by: Marcel Holtmann commit 25ea6db04a96d7871e7ece27d566f3228d59d932 Author: Marcel Holtmann Date: Thu Jul 6 15:40:09 2006 +0200 [Bluetooth] Remaining transitions to use kzalloc() This patch makes the remaining transitions to use kzalloc(). Signed-off-by: Marcel Holtmann commit 4c2248cc57f83ce551511a6c1736383938dd9d1b Author: Brice Goglin Date: Sun Jul 9 21:10:18 2006 -0400 [PATCH] myri10ge return value fix Andrew Morton wrote: > All these functions return error codes, and we're not checking them. We > should. So there's a patch which marks all these things as __must_check, > which causes around 1,500 new warnings. > The following patch fixes such a warning in myri10ge. Check pci_enable_device() return value in myri10ge_resume(). Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 8431adfd37c306c05abeac8879be7b4e03273a4f Author: Deepak Saxena Date: Tue Jul 11 23:02:48 2006 -0700 [PATCH] Update smc91x driver with ARM Versatile board info We need to specify a Versatile-specific SMC_IRQ_FLAGS value or the new generic IRQ layer will complain thusly: No IRQF_TRIGGER set_type function for IRQ 25 () Signed-off-by: Deepak Saxena Signed-off-by: Jeff Garzik commit 709cf0187d286cb1bf2c210e62bba98afdec859c Author: Auke Kok Date: Mon Jul 10 08:51:43 2006 -0700 [PATCH] ixgb: fix tx unit hang - properly calculate desciptor count There were some tso bugs that only showed up with heavy load and 16kB pages that this patch fixes by making the driver's internal use count of descriptors match the count that it was estimating it needed using the DESC_NEEDED macro. This bug caused NETDEV_WATCHDOG resets aka tx timeouts. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit c5d965caa1dbb54077673cf22e3f8a58e1cc866c Author: Dmitry Torokhov Date: Thu Jul 6 23:58:27 2006 -0700 [PATCH] smsc-ircc2: fix section reference mismatches subsystem_configurations array is only used by an __init function, therefore it should be marked __initdata, not __devinitdata. Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4626dd46f5e70dfb70f4b57cf527c8de9f80e4fa Author: Andrew Morton Date: Thu Jul 6 23:58:26 2006 -0700 [PATCH] 8139cp.c printk fix drivers/net/8139cp.c: In function 'cp_init_one': drivers/net/8139cp.c:1919: warning: format '%lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t' drivers/net/8139cp.c:1919: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit e6a8fee2098f29749e4e48321611f2d661b2eb71 Author: Ananda Raju Date: Thu Jul 6 23:58:23 2006 -0700 [PATCH] s2io driver irq fix Modification and bug fixes with respect to irq registration. - Enable interrupts after request_irq - Restored MSI data register value at driver unload time Signed-off-by: Ananda Raju Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 61ef5c00a6477e076b8b77be805c5f58b77539cf Author: Andrew Morton Date: Thu Jul 6 23:58:19 2006 -0700 [PATCH] e1000: irq naming update Use the new names. Cc: Auke Kok Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 95d161cbab9d4da8b3c2d179ae11825e1294989e Author: Ayaz Abdulla Date: Thu Jul 6 16:46:25 2006 -0400 [PATCH] forcedeth: watermark fixup This patch defines the watermark registers and fixes up the use of this register. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 9744e218aad2ef4569b0de960ff193fb50f5d6e0 Author: Ayaz Abdulla Date: Thu Jul 6 16:45:58 2006 -0400 [PATCH] forcedeth: deferral fixup This patch adds the definition for the deferral registers and fixes up the use of these registers. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit c2ce920468624d87ec5f91f080ea99681dae6d88 Author: Krzysztof Halasa Date: Wed Jul 12 13:46:12 2006 -0700 [WAN]: converting generic HDLC to use netif_dormant*() This patch converts generic HDLC (and WAN drivers using it) from hdlc_set_carrier() to netif_dormant*() interface. WAN hardware drivers should now use netif_carrier_on|off() like other network drivers. Signed-off-by: Krzysztof Halasa Signed-off-by: David S. Miller commit b47b2ec19892ffc2b06ebf138ed4aa141275a1c2 Author: Herbert Xu Date: Wed Jul 12 13:29:56 2006 -0700 [IPV4]: Fix error handling for fib_insert_node call The error handling around fib_insert_node was broken because we always zeroed the error before checking it. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 4b260a98f1afc74cd6b73ce0616d76b441dbe8c5 Author: Ralf Baechle Date: Wed Jul 12 13:26:26 2006 -0700 [NETROM] lockdep: fix false positive NETROM network devices are virtual network devices encapsulating NETROM frames into AX.25 which will be sent through an AX.25 device, so form a special "super class" of normal net devices; split their locks off into a separate class since they always nest. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit b1d21ca83c9139e7889a754934bcdd7071157560 Author: Ralf Baechle Date: Wed Jul 12 13:25:56 2006 -0700 [ROSE] lockdep: fix false positive ROSE network devices are virtual network devices encapsulating ROSE frames into AX.25 which will be sent through an AX.25 device, so form a special "super class" of normal net devices; split their locks off into a separate class since they always nest. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit c19c4b9c9acb4ab6f5477ae9ca2c0a8619f19c7a Author: Ralf Baechle Date: Wed Jul 12 13:25:23 2006 -0700 [AX.25]: Optimize AX.25 socket list lock Right now all uses of the ax25_list_lock lock are _bh locks but knowing some code is only ever getting invoked from _bh context we can better. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit da952315c9c625bd513c6162613fd3fd01d91aae Author: Herbert Xu Date: Tue Jul 11 13:50:09 2006 -0700 [IPCOMP]: Fix truesize after decompression The truesize check has uncovered the fact that we forgot to update truesize after pskb_expand_head. Unfortunately pskb_expand_head can't update it for us because it's used in all sorts of different contexts, some of which would not allow truesize to be updated by itself. So the solution for now is to simply update it in IPComp. This patch also changes skb_put to __skb_put since we've just expanded tailroom by exactly that amount so we know it's there (but gcc does not). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8a6ce0c083f5736e90dabe6d8ce077e7dd0fa35f Author: YOSHIFUJI Hideaki Date: Tue Jul 11 13:05:30 2006 -0700 [IPV6]: Use ipv6_addr_src_scope for link address sorting. In the source address selection, the address must be sorted from global to node-local. But, ifp->scope is different from the scope for source address selection. 2001::1 fe80::1 ::1 ifp->scope 0 0x02 0x01 ipv6_addr_src_scope(&ifp->addr) 0x0e 0x02 0x01 So, we need to use ipv6_addr_src_scope(&ifp->addr) for sorting. And, for backward compatibility, addresses should be sorted from new one to old one. Signed-off-by: YOSHIFUJI Hideaki Acked-by: Brian Haley Signed-off-by: David S. Miller commit 6150c22e2ac3f7dbe73e7ae7817785070d0cff1f Author: Xiaoliang (David) Wei Date: Tue Jul 11 13:03:28 2006 -0700 [TCP] tcp_highspeed: Fix AI updates. I think there is still a problem with the AIMD parameter update in HighSpeed TCP code. Line 125~138 of the code (net/ipv4/tcp_highspeed.c): /* Update AIMD parameters */ if (tp->snd_cwnd > hstcp_aimd_vals[ca->ai].cwnd) { while (tp->snd_cwnd > hstcp_aimd_vals[ca->ai].cwnd && ca->ai < HSTCP_AIMD_MAX - 1) ca->ai++; } else if (tp->snd_cwnd < hstcp_aimd_vals[ca->ai].cwnd) { while (tp->snd_cwnd > hstcp_aimd_vals[ca->ai].cwnd && ca->ai > 0) ca->ai--; In fact, the second part (decreasing ca->ai) never decreases since the while loop's inequality is in the reverse direction. This leads to unfairness with multiple flows (once a flow happens to enjoy a higher ca->ai, it keeps enjoying that even its cwnd decreases) Here is a tentative fix (I also added a comment, trying to keep the change clear): Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 781b456a980ec987a4be248f236c59658f651240 Author: Stephen Hemminger Date: Mon Jul 10 20:25:29 2006 -0700 [MAINTAINERS]: Add proper entry for TC classifier Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 8bf2b7b1888babe182a503437f6d40062aa84037 Author: Ralf Baechle Date: Mon Jul 10 20:21:05 2006 -0700 [NETROM]: Drop lock before calling nr_destroy_socket nr_destroy_socket takes the socket lock itself so it should better be called with the socket unlocked. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 5cc29e3bea77092c48e5c71d792c7461e6a6c4cf Author: Ralf Baechle Date: Mon Jul 10 16:23:21 2006 -0700 [NETROM]: Fix locking order when establishing a NETROM circuit. When establishing a new circuit in nr_rx_frame the locks are taken in a different order than in the rest of the stack. This should be harmless but triggers lockdep. Either way, reordering the code a little solves the issue. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 95ff9f4d3cc72b62b76498290d00d129e1e62545 Author: Ralf Baechle Date: Mon Jul 10 16:21:29 2006 -0700 [AX.25]: Fix locking of ax25 protocol function list. Delivery of AX.25 frame to the layer 3 protocols happens in softirq context so locking needs to be bh-proof. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit e55ffac6011731c455856072cb23aa20bd55c367 Author: Brian Haley Date: Mon Jul 10 15:25:51 2006 -0700 [IPV6]: order addresses by scope If IPv6 addresses are ordered by scope, then ipv6_dev_get_saddr() can break-out of the device addr_list for() loop when the candidate source address scope is less than the destination address scope. Signed-off-by: Brian Haley Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 15e0c694367332d7e7114c7c73044bc5fed9ee48 Author: Alan Cox Date: Wed Jul 12 15:05:41 2006 +0100 [PATCH] ide: fix Jmicron support Prior to 2.6.18rc1 you could install with devices on a JMicron chipset using the "all-generic-ide" option. As of this kernel the AHCI driver grabs the controller and rams it into AHCI mode losing the PATA ports and making CD drives and the like vanish. The all-generic-ide option fails because the AHCI driver grabbed the PCI device and reconfigured it. To fix this three things are needed. #1 We must put the chip into dual function mode #2 The AHCI driver must grab only function 0 (already in your rc1 tree) #3 Something must grab the PATA ports The attached patch is the minimal risk edition of this. It puts the chip into dual function mode so that AHCI will grab the SATA ports without losing the PATA ports. To keep the risk as low as possible the third patch adds the PCI identifiers for the PATA port and the FN check to the ide-generic driver. There is a more featured jmicron driver on its way but that adds risk and the ide-generic support is sufficient to install and run a system. The actual chip setup done by the quirk is the precise setup recommended by the vendor. (The JMB368 appears only in the ide-generic entry as it has no AHCI so does not need the quirk) Signed-off-by: Alan Cox Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit f6dc8c5b8e04ce28720155383e971561a23899d5 Author: Chase Venters Date: Sat Jul 8 11:10:29 2006 -0500 [PATCH] Make cpu_relax() imply barrier() on all arches During the recent discussion of taking 'volatile' off of the spinlock, I noticed that while most arches #define cpu_relax() such that it implies barrier(), some arches define cpu_relax() to be empty. This patch changes the definition of cpu_relax() for frv, h8300, m68knommu, sh, sh64, v850 and xtensa from an empty while(0) to the compiler barrier(). Signed-off-by: Chase Venters Acked-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 0f74964627e0ece4ac8da0e2cd01906ec322b4fe Author: Ingo Molnar Date: Wed Jul 12 09:03:10 2006 -0700 [PATCH] lockdep: HPET/RTC fix Joseph Fannin reported that hpet_rtc_interrupt() enables hardirqs in irq context: [ 25.628000] [] trace_hardirqs_on+0xce/0x200 [ 25.628000] [] _spin_unlock_irq+0x31/0x70 [ 25.628000] [] rtc_get_rtc_time+0x44/0x1a0 [ 25.628000] [] hpet_rtc_interrupt+0x21b/0x280 [ 25.628000] [] handle_IRQ_event+0x31/0x70 [ 25.628000] [] handle_edge_irq+0xe7/0x210 [ 25.628000] [] do_IRQ+0x92/0x120 [ 25.628000] [] common_interrupt+0x25/0x2c the call of rtc_get_rtc_time() is highly suspect. At a minimum we need the patch below to save/restore hardirq state. Signed-off-by: Ingo Molnar Cc: Joseph Fannin Cc: John Stultz Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a29b0b74e73b66674d20a170e463fe9032f2272a Author: Andrew Morton Date: Wed Jul 12 09:03:08 2006 -0700 [PATCH] alloc_fdtable() expansion fix We're supposed to go the next power of two if nfds==nr. Of `nr', not of `nfsd'. Spotted by Rene Scharfe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec572e3f87c02a6dd5be25841dc482a52356947f Author: Eric W. Biederman Date: Wed Jul 12 09:03:08 2006 -0700 [PATCH] msi: Only keep one msi_desc in each slab entry. It looks like someone confused kmem_cache_create with a different allocator and was attempting to give it knowledge of how many cache entries there were. With the unfortunate result that each slab entry was big enough to hold every irq. Signed-off-by: Eric W. Biederman Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0635170b544b01b46a81b4ac5cff5020ab59d1fc Author: Adam B. Jerome Date: Wed Jul 12 09:03:07 2006 -0700 [PATCH] /fs/proc/: 'larger than buffer size' memory accessed by clear_user() Address a potential 'larger than buffer size' memory access by clear_user(). Without this patch, this call to clear_user() can attempt to clear too many (tsz) bytes resulting in a wrong (-EFAULT) return code by read_kcore(). Signed-off-by: Adam B. Jerome Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 232ba9dbd68bb084d5d90c511f207d18eae614da Author: Arjan van de Ven Date: Wed Jul 12 09:03:06 2006 -0700 [PATCH] lockdep: annotate the sysfs i_mutex to be a separate class sysfs has a different i_mutex lock order behavior for i_mutex than the other filesystems; sysfs i_mutex is called in many places with subsystem locks held. At the same time, many of the VFS locking rules do not apply to sysfs at all (cross directory rename for example). To untangle this mess (which gives false positives in lockdep), we're giving sysfs inodes their own class for i_mutex. Signed-off-by: Arjan van de Ven Cc: Ingo Molnar Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d579091b4385e9386e244622d593fe064aa8e8e7 Author: Kirill Korotaev Date: Wed Jul 12 09:03:05 2006 -0700 [PATCH] fix fdset leakage When found, it is obvious. nfds calculated when allocating fdsets is rewritten by calculation of size of fdtable, and when we are unlucky, we try to free fdsets of wrong size. Found due to OpenVZ resource management (User Beancounters). Signed-off-by: Alexey Kuznetsov Signed-off-by: Kirill Korotaev Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abf75a5033d4da7b8a7e92321d74021d1fcfb502 Author: Marcel Holtmann Date: Wed Jul 12 13:12:00 2006 +0200 [PATCH] Fix prctl privilege escalation and suid_dumpable (CVE-2006-2451) Based on a patch from Ernie Petrides During security research, Red Hat discovered a behavioral flaw in core dump handling. A local user could create a program that would cause a core file to be dumped into a directory they would not normally have permissions to write to. This could lead to a denial of service (disk consumption), or allow the local user to gain root privileges. The prctl() system call should never allow to set "dumpable" to the value 2. Especially not for non-privileged users. This can be split into three cases: 1) running as root -- then core dumps will already be done as root, and so prctl(PR_SET_DUMPABLE, 2) is not useful 2) running as non-root w/setuid-to-root -- this is the debatable case 3) running as non-root w/setuid-to-non-root -- then you definitely do NOT want "dumpable" to get set to 2 because you have the privilege escalation vulnerability With case #2, the only potential usefulness is for a program that has designed to run with higher privilege (than the user invoking it) that wants to be able to create root-owned root-validated core dumps. This might be useful as a debugging aid, but would only be safe if the program had done a chdir() to a safe directory. There is no benefit to a production setuid-to-root utility, because it shouldn't be dumping core in the first place. If this is true, then the same debugging aid could also be accomplished with the "suid_dumpable" sysctl. Signed-off-by: Marcel Holtmann Signed-off-by: Linus Torvalds commit d2a5b9d45f31bf5e5a1b89a87421e218ebe1a6ba Author: Randy Dunlap Date: Tue Jul 11 12:28:25 2006 +0200 [ALSA] Fix undefined (missing) references in ISA MIRO sound driver WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_create WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_pcm WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_timer WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/sound/isa/opti9xx/snd-miro.ko needs unknown symbol snd_cs4231_mixer WARNING: /lib/modules/2.6.18-rc1-mm1/kernel/fs/reiser4/reiser4.ko needs unknown symbol generic_file_read Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d35367e1cbe4cb69f6ced0bf347c0c478752d95d Author: Adrian Bunk Date: Tue Jul 11 12:09:20 2006 +0200 [ALSA] make sound/isa/gus/gusextreme.c:devices static 'devices' is not a good name for a global variable. Thankfully, it can become static. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2ece5f42a284fecfb77b1c63f2263065e12a518f Author: Takashi Iwai Date: Thu Jul 6 19:16:40 2006 +0200 [ALSA] hda-codec - Fix missing array terminators in AD1988 codec support Fixed the missing array terminators in AD1988 codec support code. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2999ff5ba12a3dce5a86acd7078fd8787623ec63 Author: Takashi Iwai Date: Wed Jul 5 17:16:58 2006 +0200 [ALSA] Fix a deadlock in snd-rtctimer Fix a occasional deadlock occuring with snd-rtctimer driver, added irqsave to the lock in tasklet (ALSA bug#952). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f40b68903ccd511ea9d658b4bce319dd032a265a Author: Takashi Iwai Date: Wed Jul 5 16:51:05 2006 +0200 [ALSA] Fix section mismatch errors in ALSA PCI drivers Fixed 'section mismatch' errors in ALSA PCI drivers: - removed invalid __devinitdata from pci id tables - fix/remove __devinit of functions called in suspend/resume Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 562b590d4e838ecaca2cfd246fd4df55dc6db18a Author: Clemens Ladisch Date: Wed Jul 5 11:24:22 2006 +0200 [ALSA] remove unused snd_minor.name field Drop the snd_minor structure's name field that was just a helper for devfs device deregistration. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit b130807dce4a8f91f9662e93d1aa813d806e14a8 Author: Randy Dunlap Date: Tue Jul 4 14:25:26 2006 +0200 [ALSA] Fix no mpu401 interface can cause hard freeze This patch fixes the remaining instances in our tree where a non- existent mpu401 interface can cause a hard freeze when i/o is issued. This commit closes Malone #34831. Bug: https://launchpad.net/distros/ubuntu/+source/linux-source-2.6.15/+bug/34831 patch location: http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=b422309cdd980cfefe99379796c04e961d3c1544 From: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 40e1a9c0d428740a5c10a5be2335b9d7c39df043 Author: Clemens Ladisch Date: Mon Jul 3 16:38:28 2006 +0200 [ALSA] wavefront: fix __init/__devinit confusion The wavefront driver used __init in some places referenced by __devinit functions. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 1a806f487da563d0b60375665911009e60a7d121 Author: Takashi Iwai Date: Mon Jul 3 15:58:16 2006 +0200 [ALSA] Fix workaround for AD1988A rev2 codec Fix the workaround for AD1988A rev2 codec not to apply to AD1988B codec chips. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cc63935f56d1b2486fa17bea63ee3cfc7b9c1304 Author: Takashi Iwai Date: Fri Jun 30 15:31:25 2006 +0200 [ALSA] trivial: Code clean up of i2c/cs8427.c - Fix spaces, wrap lines in 80 columns. - Move EXPORT_SYMBOL() adjacent to each function. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7fd37481b1e26edc36a011a3760f10c34fffda37 Author: Adrian Bunk Date: Fri Jun 30 13:52:24 2006 +0200 [ALSA] sound/i2c/cs8427.c: don't export a static function Static functions shouldn't be exported. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4f42bcc19adbf22d566e6d009b76fb039a15ccd7 Author: Takashi Iwai Date: Thu Jun 29 17:05:31 2006 +0200 [ALSA] intel8x0 - Add ac97 quirk for Tyan Thunder K8WE board Added the default ac97 quirk (hp_only) for Tyan Thunder K8WE board. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9f37c5b3ae6299b35287cfce3635439cf3cc28be Author: Takashi Iwai Date: Thu Jun 29 16:40:21 2006 +0200 [ALSA] Reduce the string length of Terratec Aureon 7.1 Universe Fix the driver string name for Terratec Aureon 7.1 Universe to fit in 15 letters to avoid the overflow. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c775ac76e8127ce0653162f04c9672402d579b65 Author: Jaroslav Kysela Date: Thu Jun 29 16:12:30 2006 +0200 [ALSA] sound/pci/Kconfig - fix broken indenting for SND_FM801_TEA575X Signed-off-by: Jaroslav Kysela commit efce4bb9ecd033c9e0f221549be0098bcf6a3aad Author: Adrian Bunk Date: Thu Jun 29 13:22:29 2006 +0200 [ALSA] fix the SND_FM801_TEA575X dependencies CONFIG_SND_FM801=y, CONFIG_SND_FM801_TEA575X=m resulted in the following compile error: <-- snip --> ... LD vmlinux sound/built-in.o: In function 'snd_fm801_free': fm801.c:(.text+0x3c15b): undefined reference to 'snd_tea575x_exit' sound/built-in.o: In function 'snd_card_fm801_probe': fm801.c:(.text+0x3cfde): undefined reference to 'snd_tea575x_init' make: *** [vmlinux] Error 1 <-- snip --> This patch fixes kernel Bugzilla #6458. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cb6dd2609779e55b34876d75a9092b1a1f513142 Author: Eric Sesterhenn Date: Wed Apr 12 12:56:10 2006 +0200 [ALSA] Memory leak in sound/pcmcia/pdaudiocf/pdaudiocf.c if one of the first three CS_CHECKS fails, we goto cs_failed: In this case parse we donr kfree() parse. Since the the last three CS_CHECKS might also fail, i moved the kfree() below all the CS_CHECKs and added one in the error path. This fixes coverity bug id #1099 Signed-off-by: Eric Sesterhenn Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c67646641cab01c93a56674bfcd963f55442dad5 Author: Linus Torvalds Date: Wed Jul 12 08:29:46 2006 -0700 Add PIIX4 APCI quirk for the 440MX chipset too This is confirmed to fix a hang due to PCI resource conflicts with setting up the Cardbus bridge on old laptops with the 440MX chipsets. Original report by Alessio Sangalli, lspci debugging help by Pekka Enberg, and trial patch suggested by Daniel Ritz: "From the docs available i would _guess_ this thing is really similar to the 82443BX/82371AB combination. at least the SMBus base address register is hidden at the very same place (32bit at 0x90 in function 3 of the "south" brigde)" The dang thing is largely undocumented, but the patch was corroborated by Asit Mallick: "I am trying to find the register information. 440MX is an integration of 440BX north-bridge without AGP and PIIX4E (82371EB). PIIX4 quirk should cover the ACPI and SMBus related I/O registers." and verified to fix the problem by Alessio. Cc: Daniel Ritz Cc: Asit Mallick Cc: Pekka Enberg Cc: Ivan Kokshaysky Cc: Dmitry Torokhov Tested-by: Alessio Sangalli Signed-off-by: Linus Torvalds commit d2c993d845781d160a7ef759a3e65c6892c4a270 Author: Heiko Carstens Date: Wed Jul 12 16:41:55 2006 +0200 [S390] Fix sparse warnings. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7e560814de1972e1bfc780616841d7a0032ca467 Author: Cornelia Huck Date: Wed Jul 12 16:40:19 2006 +0200 [S390] path grouping and path verifications fixes. 1. Multipath devices for which SetPGID is not supported are not handled well. Use NOP ccws for path verification (sans path grouping) when SetPGID is not supported. 2. Check for PGIDs already set with SensePGID on _all_ paths (not just the first one) and try to find a common one. Moan if no common PGID can be found (and use NOP verification). If no PGIDs have been set, use the css global PGID (as before). (Rationale: SetPGID will get a command reject if the PGID it tries to set does not match the already set PGID.) 3. Immediately before reboot, issue RESET CHANNEL PATH (rcp) on all chpids. This will remove the old PGIDs. rcp will generate solicited CRWs which can be savely ignored by the machine check handler (all other actions create unsolicited CRWs). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 5c898ba9d4b6c14fdd367b96e3641c2508b4a4a9 Author: Heiko Carstens Date: Wed Jul 12 16:40:14 2006 +0200 [S390] xpram module parameter parsing. The module parameters for xpram are not or in a wrong way parsed. The xpram module uses the module_param_array directive with an int parameter which causes the kernel to automatically parse the passed numbers. This will cause errors if arguments are omitted or cause wrong results if arguments have size qualifiers. Use module_param_array with charp and parse the arguments later. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit abdba61a4361e5d47c1633c9e7f56d32dbf4aae8 Author: Heiko Carstens Date: Wed Jul 12 16:39:58 2006 +0200 [S390] cpu_relax() is supposed to have barrier() semantics. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 13492c50f69bdf60a42debc6bd3ec49cc1dc941e Author: Martin Schwidefsky Date: Wed Jul 12 16:39:55 2006 +0200 [S390] fix futex_atomic_cmpxchg_inatomic futex_atomic_cmpxchg_inatomic has the same bug as the other atomic futex operations: the operation needs to be done in the user address space, not the kernel address space. Add the missing sacf 256 & sacf 0. Signed-off-by: Martin Schwidefsky commit 6ab4879a0d074c938fd17dba141dce042fc17bee Author: Cornelia Huck Date: Wed Jul 12 16:39:50 2006 +0200 [S390] subchannel register/unregister mutex. Add a reg_mutex to prevent unregistering a subchannel before it has been registered. Since 2.6.17, we've seen oopses in kslowcrw when a device is found to be not operational during sense id when doing initial device recognition; it is not clear yet why that particular problem was not (yet) observed with earlier kernels... Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 63f4f9e1281ea9b9a2304bd13d657ba9d401c9a7 Author: Heiko Carstens Date: Wed Jul 12 16:39:47 2006 +0200 [S390] raw_local_save_flags/raw_local_irq_restore type check Make sure that raw_local_save_flags and raw_local_irq_restore always get an unsigned long parameter. raw_irqs_disabled should call raw_local_save_flags instead of local_save_flags. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f4a10b211ddb71d6b4e423fd529468691dec5cca Author: Heiko Carstens Date: Wed Jul 12 16:39:42 2006 +0200 [S390] __builtin_trap() and gcc version. __builtin_trap() has the archictecture defined backend in gcc since gcc 3.3. To make sure the kernel builds with gcc 3.2 as well, use the old style BUG() statement if compiled with older gcc versions. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 2704f0e69f9e191c6f5873ebfc878e4be1893ef8 Author: Pavel Machek Date: Tue Jul 11 22:56:14 2006 +0100 [ARM] 3725/1: sharpsl_pm: warn about wrong temperature Patch from Pavel Machek Also warn users about charging in unsuitable temperature. Signed-off-by: Pavel Machek Acked-by: Richard Purdie Acked-by: Richard Purdie Signed-off-by: Russell King commit 3821589c3becb4620dd56bf7f85c14084be1cf22 Author: Pavel Machek Date: Tue Jul 11 22:56:13 2006 +0100 [ARM] 3723/1: collie charging Patch from Pavel Machek It seems that sharp had charger on by default... This at least turns it off. Also battery reading now works and is useful. Signed-off-by: Pavel Machek Acked-by: Richard Purdie Signed-off-by: Russell King commit f7ede370a2aac96903d6e25f3b04345fa6d066f2 Author: Thomas Gleixner Date: Tue Jul 11 22:54:34 2006 +0100 [ARM] 3728/1: Restore missing CPU Hotplug irq helper Patch from Thomas Gleixner From: Thomas Gleixner The genirq conversion of ARM lost a CPU Hotplug helper function. Restore it. Signed-off-by: Thomas Gleixner Signed-off-by: Russell King commit b94ea6c08d9f9ac5339b1c2025ce3ca87b007200 Author: Pavel Machek Date: Tue Jul 11 22:54:15 2006 +0100 [ARM] 3727/1: fix ucb initialization on collie Patch from Pavel Machek From: Dirk Opfer Fix ucb initialization on collie. Wrong frequency was used and that led to things not working quite correctly. (I had to actually disable checks in my tree to get it to boot). It now includes all the neccessary parts to get it to compile :-). Signed-off-by: Pavel Machek Acked-by: Richard Purdie Signed-off-by: Russell King commit dc5bc8f1e96c32f28bddf32a14ef9251fb3071d0 Author: Russell King Date: Mon Jul 10 16:33:54 2006 +0100 [ARM] Allow Versatile to be built for AB and PB If a configuration was chosen to support both the Versatile AB and PB boards, the result would write to registers not available on the PB version of the board. Resolve this by using machine_is_xxx(). Also, for the CLCD, despite how the code looks, both the AB and PB access the same location to control the clock rate - it's just called something different between the two board versions. Invent our own name for this location and use it unconditionally. Signed-off-by: Russell King commit 20c4f88b7e4c2cd73bd4276417a9a0d4d22b0d66 Author: Lennert Buytenhek Date: Mon Jul 10 16:29:11 2006 +0100 [ARM] 3726/1: update {ep93xx,ixp2000,ixp23xx,lpd270,onearm} defconfigs to 2.6.18-rc1 Patch from Lennert Buytenhek Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 7a2c3029850843210a55cf15f36227c8e578e6bd Author: Pavel Machek Date: Mon Jul 10 16:29:10 2006 +0100 [ARM] 3721/1: Small cleanup for locomo.c Patch from Pavel Machek Cleanup locomo.c. Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 7c3dec0679c66ce177726802adbe2f403942fc27 Author: Linus Torvalds Date: Mon Jul 10 22:21:43 2006 -0700 x86 MacMini: make built-in speaker sound actually work The MacMini board table seems to largely look like any bog-standard Intel 945 board. Signed-off-by: Linus Torvalds commit 2c87e2cd0b57f63c226cd51f55ccc36867541a24 Author: Andi Kleen Date: Mon Jul 10 17:06:24 2006 +0200 [PATCH] x86_64: Fix access check in ptrace compat We can't safely directly access an compat_alloc_user_space() pointer with the siginfo copy functions. Bounce it through the stack. Noticed by Al Viro using sparse [ This was only added post 2.6.17, not in any released kernel ] Cc: Al Viro Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1cfcea1b2d67987ddb84dc75f454321bcf536555 Author: Andi Kleen Date: Mon Jul 10 17:06:21 2006 +0200 [PATCH] x86_64: Allow oprofile for model P4 models Add it for P4 model 6 - reported to work and have a similar PMU to earlier P4s. Add an p4force=1 module override parameter for future use. We had a discussion about that earlier - it's a trade off between the PMU staying compatible or not. I think the force parameter is a reasonable compromise. Cc: oprofile-list@lists.sf.net Cc: Asit Mallick Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 46f6976101c359202422753d15955f67aafabe2b Author: Andi Kleen Date: Mon Jul 10 17:06:18 2006 +0200 [PATCH] x86_64: Fix up bogus defaults in ACPI Kconfig No need for video to be always in No need for smart battery driver to be always in Acked-by: Len Brown Cc: linux-acpi@vger.kernel.org Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit aa0a9f373e3edb2c090f3fa0eb292712cfa97f81 Author: Muli Ben-Yehuda Date: Mon Jul 10 17:06:15 2006 +0200 [PATCH] x86_64: Fix Calgary copyright statements per IBM guidelines Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 77dac90fe4c3d05917045169ec1e3dbc589c0865 Author: Muli Ben-Yehuda Date: Mon Jul 10 17:06:12 2006 +0200 [PATCH] x86_64: Add a MAINTAINERS entry for Calgary Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0d2caebd562a20188a0d7f4e4f516b7ed69f319e Author: Jacob Shin Date: Mon Jul 10 17:06:09 2006 +0200 [PATCH] x86_64: Fix hotplug problem in mce amd Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3391c22e5b6aaeb289bcc1ad0d5b3f2ba5421f22 Author: Markus Schoder Date: Mon Jul 10 17:06:06 2006 +0200 [PATCH] x86_64: Bring x86-64 ia32 emul in sync with i386 on READ_IMPLIES_EXEC enabling Currently ia32 binaries behave differently with respect to enabling READ_IMPLIES_EXEC. On i386 a binary with the exec_stack flag set is executed with READ_IMPLIES_EXEC enabled as well. The same binary executes without READ_IMPLIES_EXEC on x86-64. This causes binaries that work on i386 to fail on x86-64 which goes somewhat against the whole 32 bit emulation idea. It has been argued that READ_IMPLIES_EXEC should not be enabled at all for binaries that have the exec_stack flag. Which is probably a valid point. However until this is clarified I think x86-64 should behave the same for ia32 binaries as i386. The following patch brings x86-64 in sync with i386 for ia32 binaries. Signed-off-by: Markus Schoder Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d5d8ad78b05d13c658aae8f4b06b6d339f13fd58 Author: Andi Kleen Date: Mon Jul 10 17:06:03 2006 +0200 [PATCH] x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9faefb6d41f770e9cebad0fa180e7e78ef861211 Author: Alan Cox Date: Mon Jul 10 14:24:23 2006 -0700 [DCCP]: Fix sparse warnings. No actual bugs that I can see just a couple of unmarked casts getting annoying in my debug log files. Signed-off-by: Alan Cox Signed-off-by: David S. Miller commit c427d27452b41378e305af80db5757da048dd38e Author: David S. Miller Date: Mon Jul 10 14:16:32 2006 -0700 [TCP]: Remove TCP Compound This reverts: f890f921040fef6a35e39d15b729af1fd1a35f29 The inclusion of TCP Compound needs to be reverted at this time because it is not 100% certain that this code conforms to the requirements of Developer's Certificate of Origin 1.1 paragraph (b). Signed-off-by: David S. Miller commit 1eeb7e42888b3bde403596eebdbd64452a53f4d5 Author: Ralf Baechle Date: Mon Jul 10 11:24:46 2006 -0700 [BPQ] lockdep: fix false positive Bpqether is encapsulating AX.25 frames into ethernet frames. There is a virtual bpqether device paired with each ethernet devices, so it's normal to pass through dev_queue_xmit twice for each frame which triggers the locking detector. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 7466d90f858ad89dda6f47b744e0a839937907a3 Author: Herbert Xu Date: Sun Jul 9 18:18:00 2006 -0700 [IPV4] inetpeer: Get rid of volatile from peer_total The variable peer_total is protected by a lock. The volatile marker makes no sense. This shaves off 20 bytes on i386. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bde3445c562dc72f0003550ba30db1e39be10366 Author: Ralf Baechle Date: Sun Jul 9 18:16:44 2006 -0700 [AX.25]: Get rid of the last volatile. This volatile makes no sense - not even wearing pink shades ... Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit e2b209509ca33743864846aef2e1b2afc21f7915 Author: Shankar Anand Date: Mon Jul 10 04:45:44 2006 -0700 [PATCH] knfsd: nfsd4: add per-operation server stats Add an nfs4 operations count array to nfsd_stats structure. The count is incremented in nfsd4_proc_compound() where all the operations are handled by the nfsv4 server. This count of individual nfsv4 operations is also entered into /proc filesystem. Signed-off-by: Shankar Anand Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd6b3956e9923915da789df1c665976b5583cfb0 Author: Eric Sesterhenn Date: Mon Jul 10 04:45:43 2006 -0700 [PATCH] isdn: cleanup i_rdev udage Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c16e9c888985761511bd1905b00fb271169c3c0 Author: Arjan van de Ven Date: Mon Jul 10 04:45:42 2006 -0700 [PATCH] lockdep: disable lock debugging when kernel state becomes untrusted Disable lockdep debugging in two situations where the integrity of the kernel no longer is guaranteed: when oopsing and when hitting a tainting-condition. The goal is to not get weird lockdep traces that don't make sense or are otherwise undebuggable, to not waste time. Lockdep assumes that the previous state it knows about is valid to operate, which is why lockdep turns itself off after the first violation it reports, after that point it can no longer make that assumption. A kernel oops means that the integrity of the kernel compromised; in addition anything lockdep would report is of lesser importance than the oops. All the tainting conditions are of similar integrity-violating nature and also make debugging/diagnosing more difficult. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e54695a59c278b9ff48cd4b263da7a1d392f5061 Author: Andrew Morton Date: Mon Jul 10 04:45:42 2006 -0700 [PATCH] checklist update Update Documentation/SubmitChecklist. - Mention lockdep coverage - Describe documentation requirements - Number the various items to simplify the composition of caustic emails. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e62c23c751b5136ed52ac324ecf78a814e2d2fe3 Author: Adrian Bunk Date: Mon Jul 10 04:45:40 2006 -0700 [PATCH] proper prototype for drivers/message/i2o/device.c:i2o_parm_issue() Add a proper prototype for i2o_parm_issue() in core.h. Signed-off-by: Adrian Bunk Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c59923a15c12d2b3597af913bf234a0ef264a38b Author: Christoph Hellwig Date: Mon Jul 10 04:45:40 2006 -0700 [PATCH] remove the tasklist_lock export As announced half a year ago this patch will remove the tasklist_lock export. The previous two patches got rid of the remaining modular users. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f84dfe82962759f3355eacc8e377361bb77b5274 Author: Heiko Carstens Date: Mon Jul 10 04:45:39 2006 -0700 [PATCH] s390: remove BINFMT_ELF32 config option Remove BINFMT_ELF32 config option. Support should be always compiled in if CONFIG_COMPAT is set. Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 289fbc21ea5ac445dfb4326090b1912387e849b5 Author: Christoph Hellwig Date: Mon Jul 10 04:45:38 2006 -0700 [PATCH] disallow modular binfmt_elf32 Currently most architectures either always build binfmt_elf32 in the kernel image or make it a boolean option. Only sparc64 and s390 allow to build it modularly. This patch turns the option into a boolean aswell because elf requires various symbols that shouldn't be available to modules. The most urgent one is tasklist_lock whos export this patch series kills, but there are others like force_sgi aswell. Note that sparc doesn't allow a modular 32bit a.out handler either, and that would be the more useful case as only few people want 32bit sunos compatibility and 99.9% of all sparc64 users need 32bit linux native elf support. Signed-off-by: Christoph Hellwig Acked-by: "David S. Miller" Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c318bef5f61baf6bbda2dcfe8c2ef71007c7fea Author: Christoph Hellwig Date: Mon Jul 10 04:45:37 2006 -0700 [PATCH] snsc: switch from force_sig to kill_proc Currently the snsc driver uses force_sig to send init a SIGPWR when the system overheats. This patch switches it to kill_proc instead which has the following advantages: (1) gets rid of one of the last remaining tasklist_lock users in modular code (2) simplifies the snsc code significantly The downside is that an init implementation could in theory block SIGPWR and it would not get delivered. The sysvinit code used by all major distributions doesn't do this and blocking this signal in init would be a rather stupid thing to do. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit babcfade47371eea81fd7f24d892b5ff5b1786ea Author: Jim Cromie Date: Mon Jul 10 04:45:37 2006 -0700 [PATCH] pc8736x_gpio: fix re-modprobe errors: fix/finish cdev-init - Switch from register_chrdev() to (register|alloc)_chrdev_region(). - use a cdev. This was intended for original patchset, but was overlooked. We use a single cdev for all pins (minor device-numbers), as gleaned from cs5535_gpio, and in contrast to whats currently done in scx200_gpio (which I'll fix soon) Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27385085f19a9bc9b147905554e6e2509fdaceb2 Author: Jim Cromie Date: Mon Jul 10 04:45:36 2006 -0700 [PATCH] pc8736x_gpio: fix re-modprobe errors: undo region reservation Fix module-init-func by repairing usage of platform_device_del/put in module-exit-func. IOW, it imitates Ingo's 'mishaps' patch, which fixed the module-init-func's undo handling. Also fixes lack of release_region to undo the earlier registration. Also starts to 'use a cdev' which was originally intended (its present in scx200_gpio). Code compiles and runs, exhibits a lesser error than previously. (re-register-chrdev fails) Since I had to add "include ", I went ahead and made 2 tweaks that fell into diff-context-window: - remove include everyone's doing it - copyright updates - current date is 'wrong' Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f197842d0f3dd994882407f8760f2eda9005191 Author: Jim Cromie Date: Mon Jul 10 04:45:35 2006 -0700 [PATCH] pc8736x_gpio: fix re-modprobe errors: define and use constants add constant defines - preparatory patch - adds #define CONSTs for max-pin, gpio-addr-range (for reserving region) - fix wrong max-pin check in gpio_open() - add 'Winbond' to module description. NSC sold the product, Winbond has supported us / lm-sensors Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a87d9425e0347c0e880254816d8e9f41a0e2b0c Author: Chris Boot Date: Mon Jul 10 04:45:34 2006 -0700 [PATCH] LED Class support for Soekris net48xx Add LED Class device support for the Soekris net48xx Error LED. Tested only on a net4801, but should work on a net4826 as well. I'd love to find a way of detecting a Soekris net48xx device but there is no DMI or any Soekris-specific PCI devices. [akpm@osdl.org: fixlets, cleanups] Signed-off-by: Chris Boot Cc: Ben Dooks Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36cf96f5e7c098731a1ad9d79694d6f591b18e7f Author: Andreas Gruenbacher Date: Mon Jul 10 04:45:33 2006 -0700 [PATCH] Remove leftover ext3 acl declarations These functions no longer exist; remove their declarations. Signed-off-by: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2017b376c01a54bf7d26ad4f461abe9b5f9064fe Author: Eric Sesterhenn Date: Mon Jul 10 04:45:32 2006 -0700 [PATCH] aoe: cleanup i_rdev usage Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21d71f513b6221f482ed6ad45e05f073ae67f319 Author: Ingo Molnar Date: Mon Jul 10 04:45:32 2006 -0700 [PATCH] uninline init_waitqueue_head() allyesconfig vmlinux size delta: text data bss dec filename 20736884 6073834 3075176 29885894 vmlinux.before 20721009 6073966 3075176 29870151 vmlinux.after ~18 bytes per callsite, 15K of text size (~0.1%) saved. (as an added bonus this also removes a lockdep annotation.) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92eb7a2f28d551acedeb5752263267a64b1f5ddf Author: Andrew Morton Date: Mon Jul 10 04:45:31 2006 -0700 [PATCH] fix weird logic in alloc_fdtable() There's a fairly obvious infinite loop in there. Also, use roundup_pow_of_two() rather than open-coding stuff. Cc: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38e0e8c0550eaed1af48ec5ad9ddb8a25e8b04ae Author: Maciej W. Rozycki Date: Mon Jul 10 04:45:30 2006 -0700 [PATCH] char/rtc: Handle memory-mapped chips properly Handle memory-mapped chips properly, needed for example on DECstations. This support was in Linux 2.4 but for some reason got lost in 2.6. This patch is taken directly from the linux-mips repository. [akpm@osdl.org: cleanup] Signed-off-by: Maciej W. Rozycki Signed-off-by: Martin Michlmayr Cc: Paul Gortmaker Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06c67befeeb16f2995c11b0e04a348103ddbfab1 Author: Lennert Buytenhek Date: Mon Jul 10 04:45:27 2006 -0700 [PATCH] make valid_mmap_phys_addr_range() take a pfn Newer ARMs have a 40 bit physical address space, but mapping physical memory above 4G needs a special page table format which we (currently?) do not use for userspace mappings, so what happens instead is that mapping an address >= 4G will happily discard the upper bits and wrap. There is a valid_mmap_phys_addr_range() arch hook where we could check for >= 4G addresses and deny the mapping, but this hook takes an unsigned long address: static inline int valid_mmap_phys_addr_range(unsigned long addr, size_t size); And drivers/char/mem.c:mmap_mem() calls it like this: static int mmap_mem(struct file * file, struct vm_area_struct * vma) { size_t size = vma->vm_end - vma->vm_start; if (!valid_mmap_phys_addr_range(vma->vm_pgoff << PAGE_SHIFT, size)) So that's not much help either. This patch makes the hook take a pfn instead of a phys address. Signed-off-by: Lennert Buytenhek Cc: Bjorn Helgaas Cc: "Luck, Tony" Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49c0dab7e6000888b616bedcbbc8cd4710331610 Author: Doug Thompson Date: Mon Jul 10 04:45:19 2006 -0700 [PATCH] Fix and enable EDAC sysfs operation When EDAC was first introduced into the kernel it had a sysfs interface, but due to some problems it was disabled in 2.6.16 and remained disabled in 2.6.17. With feedback, several of the control and attribute files of that interface had some good constructive feedback. PCI Blacklist/Whitelist was a major set which has design issues and it has been removed in this patch. Instead of storing PCI broken parity status in EDAC, it has been moved to the pci_dev structure itself by a previous PCI patch. A future patch will enable that feature in EDAC by utilizing the pci_dev info. The sysfs is now enabled in this patch, with a minimal set of control and attribute files for examining EDAC state and for enabling/disabling the memory and PCI operations. The Documentation for EDAC has also been updated to reflect the new state of EDAC operation. Signed-off-by:Doug Thompson Cc: Greg KH Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68e3c5e3b5c29ea76152dc1d1482826434d45019 Author: Dave Jones Date: Mon Jul 10 04:45:18 2006 -0700 [PATCH] s390: broken null test in claw driver Whoops, better hope this never gets passed a null dev in its current state. Signed-off-by: Dave Jones Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Michael Holzheu Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1c0a578ca960d10fce049765bb9e5a53fb53d2e Author: Dave Jones Date: Mon Jul 10 04:45:18 2006 -0700 [PATCH] fix oddball boolean logic in s390 netiucv Signed-off-by: Dave Jones Cc: Heiko Carstens Cc: Andreas Herrmann Cc: Michael Holzheu Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c4b9a9b553794d81cc8a335dac270ac86fd7798 Author: Serge E. Hallyn Date: Mon Jul 10 04:45:17 2006 -0700 [PATCH] s390: move var declarations behind ifdef Two variables in drivers/s390/net/qeth_main.c:qeth_send_packet() are only used if CONFIG_QETH_PERF_STATS. Move their definition under the same ifdef to remove compiler warning. Signed-off-by: Serge Hallyn Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d77f6fcf841261796f01cba19b4ea1ad8713936 Author: Jeff Dike Date: Mon Jul 10 04:45:16 2006 -0700 [PATCH] uml: make mconsole version requests happen in a process Handling a host mconsole version request must be done in a process context rather than interrupt context now that utsname information can be process-specific rather than global. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03a3f824eae944e9d3649cbccf874e7fbe228477 Author: Jeff Dike Date: Mon Jul 10 04:45:15 2006 -0700 [PATCH] uml: remove unused variable The dedevfsification of UML left an unused variable behind. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ead6feedd28091d86cde0843be914847b4e10e8 Author: Jeff Dike Date: Mon Jul 10 04:45:15 2006 -0700 [PATCH] uml: add some EINTR protection Add some more uses of the CATCH_EINTR wrapper. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 108ffa8cbfa323d462a2f4b49f38da3205d36e5a Author: Jeff Dike Date: Mon Jul 10 04:45:14 2006 -0700 [PATCH] uml: formatting fixes Fix a bunch of formatting problems. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d3468a6643a6a5905e2ac9ae1fa1aefc06d882a Author: Jeff Dike Date: Mon Jul 10 04:45:13 2006 -0700 [PATCH] uml: move _kern.c files Move most *_kern.c files in arch/um/kernel to *.c. This makes UML somewhat more closely resemble the other arches. [akpm@osdl.org: use the new INTF_* flags] Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 469226a431f553a7b3ec17d87ce3c2d1c6c25fb2 Author: Jeff Dike Date: Mon Jul 10 04:45:13 2006 -0700 [PATCH] uml: remove syscall debugging Eliminate an unused debug option. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29ac1c2142346e1e0e072f41df31688fc42ff540 Author: Jeff Dike Date: Mon Jul 10 04:45:12 2006 -0700 [PATCH] uml: make some symbols static A few sigio-related things can be made static. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61232f2fe44f7ac12d7512d099a8f10923eff7ea Author: Jeff Dike Date: Mon Jul 10 04:45:11 2006 -0700 [PATCH] uml: fix exitcall ordering bug This fixes an exitcall ordering bug - calls to ignore_sigio_fd can come from exitcalls that come after the sigio thread has been killed. This would cause shutdown to hang or crash. Fixed by having ignore_sigio_fd check that the thread is present before trying to communicate with it. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e64d96aeb495709c13307e2d79f3ee37e96aa4e Author: Jeff Dike Date: Mon Jul 10 04:45:11 2006 -0700 [PATCH] uml: remove os_isatty os_isatty can be made to disappear by moving maybe_sigio_broken from kernel to user code. This also lets write_sigio_workaround become static. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfaafd7184f044c63cd937cb0ffb4334b4ec7635 Author: Jeff Dike Date: Mon Jul 10 04:45:10 2006 -0700 [PATCH] uml: remove spinlock wrapper functions The irq_spinlock is not needed from user code any more, so the irq_lock and irq_unlock wrappers can go away. This also changes the name of the lock to irq_lock. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ae43ff8aa60f81f5d82a4911d704ce8902d11fb Author: Jeff Dike Date: Mon Jul 10 04:45:09 2006 -0700 [PATCH] uml: mark forward_interrupts as being mode-specific Mark forward_interrupts as being tt-mode only. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bacf4549187ddb624a5d89129c7dccc0ca67ce7c Author: Jeff Dike Date: Mon Jul 10 04:45:09 2006 -0700 [PATCH] uml: ifdef a mode-specific function uml_idle_timer is tt-mode only, so ifdef it as such to make it easier to spot when tt mode is killed. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 872aaa65a6ef30edef05a89977f7021f9840b215 Author: Jeff Dike Date: Mon Jul 10 04:45:08 2006 -0700 [PATCH] uml: timer handler tidying Get rid of a user of timer_irq_inited (and first_tick) by observing that prev_ticks can be used to decide if this is the first call. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e64bd134085451fe3f751025c5d5a70729164b7c Author: Jeff Dike Date: Mon Jul 10 04:45:07 2006 -0700 [PATCH] uml: signal initialization cleanup It turns out that init_new_thread_signals is always called with altstack == 1, so we can eliminate the parameter. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9914aee827322f46c306d724b38ad73af7daa9a5 Author: Jeff Dike Date: Mon Jul 10 04:45:07 2006 -0700 [PATCH] uml: remove useless declaration wall_to_monotonic isn't used in this file, so we can remove the declaration. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23bbd586ed7894982fd9323f63b2065afbb77773 Author: Jeff Dike Date: Mon Jul 10 04:45:06 2006 -0700 [PATCH] uml: fix static binary segfault When UML is built as a static binary, it segfaults when run. The reason is that a memory hole that is present in dynamic binaries isn't there in static binaries, and it contains essential stuff. This fix removes the code which maps some anonymous memory into that hole and cleans up some related code. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8633c2331e738218c7356633e1c4adb75726225f Author: Jeff Dike Date: Mon Jul 10 04:45:05 2006 -0700 [PATCH] uml: remove some useless exports Spotted by Al Viro - eliminate a couple useless exports. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aceb343464a136e1c0de5294b097a1f9ab018870 Author: Jeff Dike Date: Mon Jul 10 04:45:05 2006 -0700 [PATCH] uml: timer initialization cleanup This cleans up the mess that is the timer initialization. There used to be two timer handlers - one that basically ran during delay loop calibration and one that handled the timer afterwards. There were also two sets of timer initialization code - one that starts in user code and calls into the kernel side of the house, and one that starts in kernel code and calls user code. This eliminates one timer handler and consolidates the two sets of initialization code. [akpm@osdl.org: use new INTF_ flags] Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 598d188af1a0645dc75c9541eff0017a4f6d9987 Author: Tyler Date: Mon Jul 10 04:45:03 2006 -0700 [PATCH] uml: clean up address space limits code I was looking at the code of the UML and more precisely at the functions set_task_sizes_tt and set_task_sizes_skas. I noticed that these 2 functions take a paramater (arg) which is not used : the function is always called with the value 0. I suppose that this value might change in the future (or even can be configured), so I added a constant in mem_user.h file. Also, I rounded CONFIG_HOST_TASk_SIZE to a 4M. Signed-off-by: Tyler Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f49d7247828bd2d992cf9bd78e5e33a421fb0ba Author: Irwan Djajadi Date: Mon Jul 10 04:45:02 2006 -0700 [PATCH] pcf8563: remove MOD_INC_USE_COUNT, MOD_DEC_USE_COUNT It already has .owner. Signed-off-by: Irwan Djajadi Signed-off-by: Alexey Dobriyan Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32ea086b7b6423e8ab1874389741bcef4d50f938 Author: Eric Sesterhenn Date: Mon Jul 10 04:45:02 2006 -0700 [PATCH] cris: switch to iminor/imajor Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aeceb15738958fe59cd9fe537f40317b1a3bc731 Author: Linus Torvalds Date: Mon Jul 10 04:45:01 2006 -0700 [PATCH] swsusp: fix panic when signature can't be read Do not panic a machine when swsusp signature can't be read. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 712f403af6682c942d8ff8bfbd54eed03643a796 Author: Andrew Morton Date: Mon Jul 10 04:45:00 2006 -0700 [PATCH] swsusp warning fix kernel/power/swap.c: In function 'swsusp_write': kernel/power/swap.c:275: warning: 'start' may be used uninitialized in this function gcc isn't smart enough, so help it. Cc: Pavel Machek Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95018f7c94cbe4e78fc014b6ce52004714c06e2a Author: Rafael J. Wysocki Date: Mon Jul 10 04:45:00 2006 -0700 [PATCH] swsusp: do not use memcpy for snapshotting memory swsusp should not use memcpy for snapshotting memory, because on some architectures memcpy may increase preempt_count (i386 does this when CONFIG_X86_USE_3DNOW is set). Then, as a result, wrong value of preempt_count is stored in the image. Replace memcpy in copy_data_pages with an open-coded loop. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ba1c6c88c945b065a75094830f6b76f414e42ad Author: Andrew Morton Date: Mon Jul 10 04:44:59 2006 -0700 [PATCH] get_cmos_time() locking fix (lockdep) rtc_lock is supposed to be irq-safe. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11eebe307e4d3afa33eb25e999ac458ac4f9b41e Author: Adrian Bunk Date: Mon Jul 10 04:44:56 2006 -0700 [PATCH] i386 defconfig: set CONFIG_PM_STD_PARTITION="" Matthew Wilcox notified me that CONFIG_PM_STD_PARTITION="/dev/hda2" in the i386 defconfig wasn't a good idea (especially since it prevented booting for him due to another bug). This patch sets CONFIG_PM_STD_PARTITION="" in the i386 defconfig. Signed-off-by: Adrian Bunk Cc: Matthew Wilcox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84e8cd6dbc00b4979e8d1c15c80d91987aeb3417 Author: David Howells Date: Mon Jul 10 04:44:55 2006 -0700 [PATCH] FRV: Introduce asm-offsets for FRV arch Introduce the use of asm-offsets into the FRV architecture. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d8c4e3b0150ff537902477ed62f8a8e9e70007b Author: David Howells Date: Mon Jul 10 04:44:55 2006 -0700 [PATCH] FDPIC: Add coredump capability for the ELF-FDPIC binfmt Add coredump capability for the ELF-FDPIC binfmt. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4cac1a0227a6f84be0381cd350a3c8730a4a671 Author: David Howells Date: Mon Jul 10 04:44:54 2006 -0700 [PATCH] FDPIC: Move roundup() into linux/kernel.h Move the roundup() macro from binfmt_elf.c into linux/kernel.h as it's generally useful. [akpm@osdl.org: nuke all the other implementations] Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01bf466e1866feeb7fce0319cbafe0166e29f5e4 Author: David Howells Date: Mon Jul 10 04:44:53 2006 -0700 [PATCH] FDPIC: Define SEEK_* constants in the Linux kernel headers Add definitions for SEEK_SET, SEEK_CUR and SEEK_END to the kernel header files. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a2ab7f5df76b920d62b908919d987d3b8a82856 Author: David Howells Date: Mon Jul 10 04:44:53 2006 -0700 [PATCH] FDPIC: Adjust the ELF-FDPIC driver to conform more to the CodingStyle Adjust the ELF-FDPIC binfmt driver to conform much more to the CodingStyle, silly though it may be. Further changes: (*) Drop the casts to long for addresses in kdebug() statements (they're unsigned long already). (*) Use extra variables to avoid expressions longer than 80 chars by splitting the statement into multiple statements and letting the compiler optimise them back together. (*) Eliminate duplicate call of ksize() when working out how much space was actually allocated for the stack. (*) Discard the commented-out load_shlib prototype and op pointer as this will not be supported in ELF-FDPIC for the foreseeable future. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21ff821630c0e64f5d2fab96ced72000d77fa90b Author: David Howells Date: Mon Jul 10 04:44:52 2006 -0700 [PATCH] NOMMU: Fix execution off of ramfs with mmap() Fix execution through the FDPIC binfmt of programs stored on ramfs by preventing the ramfs mmap() returning successfully on a private mapping of a ramfs file. This causes NOMMU mmap to make a copy of the mapped portion of the file and map that instead. This could be improved by granting direct mapping access to read-only private mappings for which the data is stored on a contiguous run of pages. However, this is only likely to be the case if the file was extended with truncate before being written. ramfs is left to map the file directly for shared mappings so that SYSV IPC and POSIX shared memory both still work. Signed-off-by: David Howells Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dec17eb577169f78d642c5424e4264186d27115 Author: David Howells Date: Mon Jul 10 04:44:51 2006 -0700 [PATCH] FRV: Fix FRV arch compile errors Fix some FRV arch compile errors, including: (*) Marking nr_kernel_pages as __meminitdata so that references to it end up being properly calculated rather than being assumed to be in the small data section (and thus calculated wrt the GP register). Not doing this causes the linker to emit errors as the offset is too big to fit into the load instruction. (*) Move pm_power_off into an unconditionally compiled .c file as it's now unconditionally accessed. (*) Declare frv_change_cmode() in a header file rather than in a .c file, and declare it asmlinkage. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1aeb21d626327ee909fef03f72aea6e8a60e6c0c Author: David Howells Date: Mon Jul 10 04:44:50 2006 -0700 [PATCH] FDPIC: Fix FDPIC compile errors Fix FDPIC compile errors. (akpm: we suspect it fixes a warning) Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6174df5eec9cdfd598c03d6d0807e344e109213 Author: Zhang, Yanmin Date: Mon Jul 10 04:44:49 2006 -0700 [PATCH] mmap zero-length hugetlb file with PROT_NONE to protect a hugetlb virtual area Sometimes, applications need below call to be successful although "/mnt/hugepages/file1" doesn't exist. fd = open("/mnt/hugepages/file1", O_CREAT|O_RDWR, 0755); *addr = mmap(NULL, 0x1024*1024*256, PROT_NONE, 0, fd, 0); As for regular pages (or files), above call does work, but as for huge pages, above call would fail because hugetlbfs_file_mmap would fail if (!(vma->vm_flags & VM_WRITE) && len > inode->i_size). This capability on huge page is useful on ia64 when the process wants to protect one area on region 4, so other threads couldn't read/write this area. A famous JVM (Java Virtual Machine) implementation on IA64 needs the capability. Signed-off-by: Zhang Yanmin Cc: David Gibson Cc: Hugh Dickins [ Expand-on-mmap semantics again... this time matching normal fs's. wli ] Acked-by: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6b7d3b62069be60d5b13358bac8670dacdd7a81 Author: Alan Stern Date: Mon Jul 10 04:44:47 2006 -0700 [PATCH] usb-storage: wait for URB to complete We all failed to notice that Franck's recent update to usb-storage allowed an URB to complete after its context data was no longer valid. This patch (as746) makes the driver wait for the URB to complete whenever there's a timeout. Although timeouts in usb-storage are relatively uncommon, they do occur. Without this patch the code in 2.6.18-rc1 will fault within an interrupt handler, which is not nice at all. Signed-off-by: Alan Stern Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82081797b7d72108a47c82997349d1ea6a3eb3d5 Author: Linas Vepstas Date: Mon Jul 10 04:44:46 2006 -0700 [PATCH] pci: initialize struct pci_dev.error_state The pci channel state is currently uninitialized, thus there are two ways of indicating that "everything's OK": 0 and 1. This is a bit of a burden. If a devce driver wants to check if the pci channel is in a working or a disconnected state, the driver writer must perform checks similar to if((pdev->error_state != 0) && (pdev->error_state != pci_channel_io_normal)) { whatever(); } which is rather akward. The first check is needed because stuct pci_dev is inited to all-zeros. The scond is needed because the error recovery will set the state to pci_channel_io_normal (which is not zero). This patch fixes this awkwardness. Signed-off-by: Linas Vepstas Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e01af0384f54023b4548b7742952da2ffcafd4cd Author: Michael Hanselmann Date: Mon Jul 10 04:44:45 2006 -0700 [PATCH] powermac: Combined fixes for backlight code This patch fixes several problems: - pmac_backlight_key() is called under interrupt context, and therefore can't use mutexes or semaphores, so defer the backlight level for later, as it's not critical (original code by Aristeu S. Rozanski F. ). - Add exports for functions that might be called from modules - Fix Kconfig depdencies on PMAC_BACKLIGHT. - Fix locking issues on calls from inside the driver (reported by Aristeu S. Rozanski F., too) - Fix wrong calculation of backlight values in some of the drivers - Replace pmac_backlight_key_up/down by inline functions [akpm@osdl.org: fix function prototypes] Signed-off-by: Michael Hanselmann Acked-by: Aristeu S. Rozanski F. Acked-by: Rene Nussbaumer Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58d383a6222d66be9483598c51bae34e7d3c2c37 Author: Segher Boessenkool Date: Mon Jul 10 04:44:45 2006 -0700 [PATCH] powerpc: make OF interrupt tree parsing more strict This patch fixes a bit of boundchecking in the new Open Firmware interrupt tree parsing code. It's important that it fails when things aren't correct in order to trigger fallback mecanisms that are necessary to make some machines work properly. Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f620753b9584558cd3bcc1712fca16663aacdce4 Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:44 2006 -0700 [PATCH] powerpc: fix SMU driver interrupt mapping The SMU driver tries to map an interrupt from the device-tree before the interrupt controllers in the machine have been enumerated. This doesn't work properly and cause machines like the Quad g5 to fail booting later on when some drivers waits endlessly for an SMU request to complete. This is the second problem preventing boot on the Quad g5. This fixes it and also makes the SMU driver a bit more resilient to not having an interrupt. Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06fe98e6369330d522705d5e67a2eddac2fd5bba Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:43 2006 -0700 [PATCH] powerpc: fix MPIC OF tree parsing on Apple quad g5 The quad g5 currently doesn't boot due to two problems. This patch fixes the first one: Apple new way of doing interrupt specifiers in OF for devices using the HT APIC isn't properly parsed by the new MPIC driver code. Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e99e4582861578fb00d84d085f8f283569f51dd Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:42 2006 -0700 [PATCH] powerpc: fix trigger handling in the new irq code This patch slightly reworks the new irq code to fix a small design error. I removed the passing of the trigger to the map() calls entirely, it was not a good idea to have one call do two different things. It also fixes a couple of corner cases. Mapping a linux virtual irq to a physical irq now does only that. Setting the trigger is a different action which has a different call. The main changes are: - I no longer call host->ops->map() for an already mapped irq, I just return the virtual number that was already mapped. It was called before to give an opportunity to change the trigger, but that was causing issues as that could happen while the interrupt was in use by a device, and because of the trigger change, map would potentially muck around with things in a racy way. That was causing much burden on a given's controller implementation of map() to get it right. This is much simpler now. map() is only called on the initial mapping of an irq, meaning that you know that this irq is _not_ being used. You can initialize the hardware if you want (though you don't have to). - Controllers that can handle different type of triggers (level/edge/etc...) now implement the standard irq_chip->set_type() call as defined by the generic code. That means that you can use the standard set_irq_type() to configure an irq line manually if you wish or (though I don't like that interface), pass explicit trigger flags to request_irq() as defined by the generic kernel interfaces. Also, using those interfaces guarantees that your controller set_type callback is called with the descriptor lock held, thus providing locking against activity on the same interrupt (including mask/unmask/etc...) automatically. A result is that, for example, MPIC's own map() implementation calls irq_set_type(NONE) to configure the hardware to the default triggers. - To allow the above, the irq_map array entry for the new mapped interrupt is now set before map() callback is called for the controller. - The irq_create_of_mapping() (also used by irq_of_parse_and_map()) function for mapping interrupts from the device-tree now also call the separate set_irq_type(), and only does so if there is a change in the trigger type. - While I was at it, I changed pci_read_irq_line() (which is the helper I would expect most archs to use in their pcibios_fixup() to get the PCI interrupt routing from the device tree) to also handle a fallback when the DT mapping fails consisting of reading the PCI_INTERRUPT_PIN to know wether the device has an interrupt at all, and the the PCI_INTERRUPT_LINE to get an interrupt number from the device. That number is then mapped using the default controller, and the trigger is set to level low. That default behaviour works for several platforms that don't have a proper interrupt tree like Pegasos. If it doesn't work for your platform, then either provide a proper interrupt tree from the firmware so that fallback isn't needed, or don't call pci_read_irq_line() - Add back a bit that got dropped by my main rework patch for properly clearing pending IPIs on pSeries when using a kexec Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50099328e4fe7c9f8981f408071a1ff82d59ddf8 Author: Johannes Berg Date: Mon Jul 10 04:44:41 2006 -0700 [PATCH] aoa: tas: add missing bass/treble controls This patch adds the bass/treble controls to snd-aoa that snd-powermac always had for tas3004 based machines. Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e5102ad70aaafe49823a02b368c0c3032c91439 Author: Johannes Berg Date: Mon Jul 10 04:44:40 2006 -0700 [PATCH] aoa: layout fabric: add missing module aliases The layout fabric gained support for all IDs when I extracted those from the OSX description file. But apparently I had forgotten to add them all as module aliases so the module will also load. This patch adds them. Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b8f52f5b93e08f04b08e64e62d675bc43dd618e Author: Johannes Berg Date: Mon Jul 10 04:44:39 2006 -0700 [PATCH] aoa: tas: surface DRC control again This patch makes the DRC control visible again for TAS chips. Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a4f57874538fc05b99bd3bf7106f3df9b23a4ab Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:39 2006 -0700 [PATCH] aoa: tas: fix initialisation/reset This patch fixes the initialisation and reset of the tas codec. The tas will often reset if the i2s clocks go away so it needs to be completely re-initialised when clocks come back. Also, this patch adds some code for DRC that will be exploited later to add a DRC control again, fixing a regression over snd-powermac. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14b42963f64b98ab61fa9723c03d71aa5ef4f862 Author: Johannes Berg Date: Mon Jul 10 04:44:38 2006 -0700 [PATCH] aoa: tas: change PCM1 name to PCM This patch changes the PCM1 control name to PCM to make it play nice with the softvol plugin (which will then go away if it sees a proper PCM slider) Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a677c8fb8aa03e6ad9c206cb7284d294761ced2c Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:37 2006 -0700 [PATCH] aoa fabric layout: clean up messages This patch cleans up the printk's in the layout fabric and also makes it display which type of GPIO access it is going to use. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e53fcabc6d923e9c1cdd073ea2e2212daf907622 Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:37 2006 -0700 [PATCH] aoa: pmf gpio: report if function calling fails This patch makes the pmf GPIO layer in aoa report if calling a platform function failed. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 977c60238cfff1f9eb07cfd78bc02da91b7b499b Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:36 2006 -0700 [PATCH] aoa: i2sbus: revamp control layer This patch revamps the i2sbus control layer by using the macio/keylargo functions instead of directly mapping. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a08bc4cb09dfea4cb1d29061d82b04338ed7c21a Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:35 2006 -0700 [PATCH] aoa: fix when all is built into the kernel This patch fixes initialisation issues when all of aoa is built into the kernel by re-ordering the link order in the Makefile and making the soundbus use subsys_initcall so it is initialised earlier. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 389ba79582b9bc2463b44ad60df62d709ebcdf97 Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:34 2006 -0700 [PATCH] aoa: i2sbus: fix for PowerMac7,2 and 7,3 This patch cleans up the resource handling in i2sbus and adds workarounds for the broken device trees on the PowerMac7,2 and 7,3. Some of this code will later move again when macio_asic is going to export all the sub-nodes too. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9d08de57b0beb6623a89d8a8f501040c5eadacb Author: Benjamin Herrenschmidt Date: Mon Jul 10 04:44:34 2006 -0700 [PATCH] aoa: i2sbus: move module parameter declaration up This patch moves the i2sbus 'force' module parameter declaration to the top of the file. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a14cf4508a77d03436f34a1f6a9bc3eee12fc08 Author: Andreas Schwab Date: Mon Jul 10 04:44:33 2006 -0700 [PATCH] Fix snd-aoa irq conversion Use proper irq mapping interface for snd-aoa-i2sbus. Signed-off-by: Andreas Schwab Acked-by: Benjamin Herrenschmidt Signed-off-by: Johannes Berg Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e154ff3d2c5ad313ef0c66e6217502361cad2799 Author: Roman Zippel Date: Mon Jul 10 04:44:32 2006 -0700 [PATCH] adjust clock for lost ticks A large number of lost ticks can cause an overadjustment of the clock. To compensate for this we look at the current error and the larger the error already is the more careful we are at adjusting the error. As small extra fix reset the error when the clock is set. Signed-off-by: Roman Zippel Acked-by: john stultz Cc: Uwe Bugla Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32dd66fce3b0ad5857433433b795844cb397608e Author: Heiko Carstens Date: Mon Jul 10 04:44:31 2006 -0700 [PATCH] vmstat: export all_vm_events() Add missing EXPORT_SYMBOL for all_vm_events(). Git commit f8891e5e1f93a128c3900f82035e8541357896a7 caused this: Building modules, stage 2. MODPOST WARNING: "all_vm_events" [arch/s390/appldata/appldata_mem.ko] undefined! CC arch/s390/appldata/appldata_mem.mod.o Cc: Christoph Lameter Cc: Gerald Schaefer Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f4599e9cd6bca0efc1000359584d1cff68f9f13 Author: Christoph Lameter Date: Mon Jul 10 04:44:30 2006 -0700 [PATCH] ZVC: add __inc_zone_state for !SMP configuration It turns out that there is a way to build a kernel with NUMA and no SMP. In that case we are missing one definition __inc_zone_state. Provide that missing __inc_zone_state. (akpm: NUMA && !SMP sounds odd, but I am told "But there is the concept of cpuless nodes. A NUMA system without SMP has a single processor but multiple memory nodes. This used to work before on IA64 (wasn't aware of it, never seen anyone with this kind of thing).") Acked-by: Tony Luck Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06a9ec291b3aec9c7e36af0a10ad2b556bd7e84f Author: Thomas Gleixner Date: Mon Jul 10 04:44:30 2006 -0700 [PATCH] pi-futex: Validate futex type instead of oopsing Calling futex_lock_pi is called with a reference to a non PI futex and waiters exist already, lookup_pi_state() oopses due to pi_state == NULL. Check this condition and return -EINVAL to userspace. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: Jakub Jelinek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bed936f7eab946c60170bc92a1aea597da158e02 Author: Konstantin Karasyov Date: Mon Jul 10 04:44:26 2006 -0700 [PATCH] ACPI: fix fan/thermal resume Daniel Ritz says: The acpi driver suspend/resume patches that went in recently caused a regression on my box (toshiba tecra 8000 laptop): after resume from swsusp the fan turns on keeping blowing cold air out of my notebook. before the patches, the fan was off and would only make noise when required. it's the same thing described in bugzilla.kernel.org #5000. the acpi suspend/resume patches or at least parts of them originate in this bug. now the last patch in the report (attach id 8438) actually fixes the problem - for me and the reporter. this is a trimmed down version of that patch. Signed-off-by: Daniel Ritz Cc: Len Brown Cc: Sanjoy Mahajan Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 868e81b8ada8fa05bdc08b5e6fa73307caaeab6d Author: Yoshinori Sato Date: Mon Jul 10 04:44:24 2006 -0700 [PATCH] h8300 remove duplicate define Signed-off-by: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80d6679a62fe45f440d042099d997a42e4e8c59d Author: Adrian Bunk Date: Mon Jul 10 04:44:24 2006 -0700 [PATCH] kernel/softirq.c: EXPORT_UNUSED_SYMBOL This patch marks an unused export as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69c3a5b8fd8cfa67be22f6d7ae5c681c6777d817 Author: Adrian Bunk Date: Mon Jul 10 04:44:23 2006 -0700 [PATCH] fs/read_write.c: EXPORT_UNUSED_SYMBOL This patch marks an unused export as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0d85c5c3009d292fe195f666cbbec7da47dabf4 Author: Adrian Bunk Date: Mon Jul 10 04:44:23 2006 -0700 [PATCH] mm/mmzone.c: EXPORT_UNUSED_SYMBOL This patch marks three unused exports as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26fc52367af3774b123334bca409159ce37d2857 Author: Adrian Bunk Date: Mon Jul 10 04:44:22 2006 -0700 [PATCH] mm/memory.c: EXPORT_UNUSED_SYMBOL This patch marks an unused export as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d46cc6b9b04dc28a9c5db62db791aeec8ab2ea5 Author: Adrian Bunk Date: Mon Jul 10 04:44:21 2006 -0700 [PATCH] mm/bootmem.c: EXPORT_UNUSED_SYMBOL This patch marks an unused export as EXPORT_UNUSED_SYMBOL. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0fc84d2e5bb4a9e3ae470812a00cccba85a48b8 Author: Adrian Bunk Date: Mon Jul 10 04:44:21 2006 -0700 [PATCH] kernel/printk.c: EXPORT_SYMBOL_UNUSED This patch marks unused exports as EXPORT_SYMBOL_UNUSED. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0a0a5ee7a0094231a11cfe3f86d2d8f5f994e01 Author: Andrew Morton Date: Mon Jul 10 04:44:20 2006 -0700 [PATCH] md: fix oops in error-handling During early MD setup (superblock reading), we don't have a personality yet. But the error-handling code tries to dereference mddev->pers. Fix. Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d69504325978c461b51b03cca49626026970307b Author: NeilBrown Date: Mon Jul 10 04:44:20 2006 -0700 [PATCH] md: include sector number in messages about corrected read errors This is generally useful, but particularly helps see if it is the same sector that always needs correcting, or different ones. [akpm@osdl.org: fix printk warnings] Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67463acb646904d76a8e237cc31eaa87872f30cc Author: NeilBrown Date: Mon Jul 10 04:44:19 2006 -0700 [PATCH] md: require CAP_SYS_ADMIN for (re-)configuring md devices via sysfs The ioctl requires CAP_SYS_ADMIN, so sysfs should too. Note that we don't require CAP_SYS_ADMIN for reading attributes even though the ioctl does. There is no reason to limit the read access, and much of the information is already available via /proc/mdstat Cc: Chris Wright Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80ca3a44f563a763fa872390dcb393f2d82027bf Author: NeilBrown Date: Mon Jul 10 04:44:18 2006 -0700 [PATCH] md: unify usage of symbolic names for perms Some places we use number (0660) someplaces names (S_IRUGO). Change all numbers to be names, and change 0655 to be what it should be. Also make some formatting more consistent. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e3db645f890660ce8774a18bcd418570298937e Author: NeilBrown Date: Mon Jul 10 04:44:18 2006 -0700 [PATCH] md: fix usage of wrong variable in raid1 Though it rarely matters, we should be using 's' rather than r1_bio->sector here. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae3c20ccf84c88d45616f12122f781a900118f09 Author: NeilBrown Date: Mon Jul 10 04:44:17 2006 -0700 [PATCH] md: fix some small races in bitmap plugging in raid5 The comment gives more details, but I didn't quite have the sequencing write, so there was room for races to leave bits unset in the on-disk bitmap for short periods of time. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c785b7a18dc30572a49c6b75efd384269735d14 Author: NeilBrown Date: Mon Jul 10 04:44:16 2006 -0700 [PATCH] md: fix a plug/unplug race in raid5 When a device is unplugged, requests are moved from one or two (depending on whether a bitmap is in use) queues to the main request queue. So whenever requests are put on either of those queues, we should make sure the raid5 array is 'plugged'. However we don't. We currently plug the raid5 queue just before putting requests on queues, so there is room for a race. If something unplugs the queue at just the wrong time, requests will be left on the queue and nothing will want to unplug them. Normally something else will plug and unplug the queue fairly soon, but there is a risk that nothing will. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff4e8d9a9f46e3a7f89d14ade52fe5d53a82c022 Author: NeilBrown Date: Mon Jul 10 04:44:16 2006 -0700 [PATCH] md: fix resync speed calculation for restarted resyncs We introduced 'io_sectors' recently so we could count the sectors that causes io during resync separate from sectors which didn't cause IO - there can be a difference if a bitmap is being used to accelerate resync. However when a speed is reported, we find the number of sectors processed recently by subtracting an oldish io_sectors count from a current 'curr_resync' count. This is wrong because curr_resync counts all sectors, not just io sectors. So, add a field to mddev to store the curren io_sectors separately from curr_resync, and use that in the calculations. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b8c9de05c2a860fe6b02fedcb48763bcee648b3 Author: NeilBrown Date: Mon Jul 10 04:44:15 2006 -0700 [PATCH] md: delay starting md threads until array is completely setup When an array is started we start one or two threads (two if there is a reshape or recovery that needs to be completed). We currently start these *before* the array is completely set up and in particular before queue->queuedata is set. If the thread actually starts very quickly on another CPU, we can end up dereferencing queue->queuedata and oops. This patch also makes sure we don't try to start a recovery if a reshape is being restarted. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31b65a0d3894566191b91fbadd122c354a363b5d Author: NeilBrown Date: Mon Jul 10 04:44:14 2006 -0700 [PATCH] md: set desc_nr correctly for version-1 superblocks This has to be done in ->load_super, not ->validate_super Without this, hot-adding devices to an array doesn't always work right - though there is a work around in mdadm-2.5.2 to make this less of an issue. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4370781d83cd2e52eb515e4663155e8091e4d4e Author: NeilBrown Date: Mon Jul 10 04:44:14 2006 -0700 [PATCH] md: possible fix for unplug problem I have reports of a problem with raid5 which turns out to be because the raid5 device gets stuck in a 'plugged' state. This shouldn't be able to happen as 3msec after it gets plugged it should get unplugged. However it happens none-the-less. This patch fixes the problem and is a reasonable thing to do, though it might hurt performance slightly in some cases. Until I can find the real problem, we should probably have this workaround in place. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 894673ee6122a3ce1958e1fe096901ba5356a96b Author: Jon Smirl Date: Mon Jul 10 04:44:13 2006 -0700 [PATCH] tty: Remove include of screen_info.h from tty.h screen_info.h doesn't have anything to do with the tty layer and shouldn't be included by tty.h. This patches removes the include and modifies all users to directly include screen_info.h. struct screen_info is mainly used to communicate with the console drivers in drivers/video/console. Note that this patch touches every arch and I have no way of testing it. If there is a mistake the worst thing that will happen is a compile error. [akpm@osdl.org: fix arm build] [akpm@osdl.org: fix alpha build] Signed-off-by: Jon Smirl Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8f340e394ff30b79ab5b03c67ab4c94b2ac3646 Author: Jon Smirl Date: Mon Jul 10 04:44:12 2006 -0700 [PATCH] vt: Remove VT-specific declarations and definitions from tty.h MAX_NR_CONSOLES, fg_console, want_console and last_console are more of a function of the VT layer than the TTY one. Moving these to vt.h and vt_kern.h allows all of the framebuffer and VT console drivers to remove their dependency on tty.h. [akpm@osdl.org: fix alpha build] Signed-off-by: Jon Smirl Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67eb5db5874076db01febed5a1a9281628fa9fb4 Author: Karsten Keil Date: Mon Jul 10 04:44:11 2006 -0700 [PATCH] hisax: fix usage of __init* Fix the warnings about the section mismatches for __init* in the HiSax driver. Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acbf8bd738f1357e0e3b97b918bef5be272b176e Author: Luiz Fernando N. Capitulino Date: Mon Jul 10 04:44:11 2006 -0700 [PATCH] Updates CREDITS file Updates my personal entry in the CREDITS file. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73ca66b97b73257a7d832d502c36fc19fe847809 Author: Magnus Damm Date: Mon Jul 10 04:44:09 2006 -0700 [PATCH] release_firmware() fixes Use release_firmware() to free requested resources. According to Documentation/firmware_class/README the request_firmware() call should be followed by a release_firmware(). Some drivers do not however free the firmware previously allocated with request_firmware(). This patch tries to fix this by making sure that release_firmware() is used as expected. Signed-off-by: Magnus Damm Acked-by: Marcel Holtmann Cc: Mauro Carvalho Chehab Cc: "John W. Linville" Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 454d6fbc48374be8f53b9bafaa86530cf8eb3bc1 Author: Jens Axboe Date: Mon Jul 10 04:44:08 2006 -0700 [PATCH] cdrom: fix bad cgc.buflen assignment The code really means to mask off the high bits, not assign 0xff. Signed-off-by: Jens Axboe Cc: Marcus Meissner Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d8b2ebfa298ec4e6d9fa43e60fb013e8cd963aa Author: Jonathan Corbet Date: Mon Jul 10 04:44:07 2006 -0700 [PATCH] VFS documentation tweak As I was looking over the get_sb() changes, I stumbled across a little mistake in the documentation updates. Unless we're getting into an interesting new object-oriented realm, I doubt that get_sb() should really return "struct int"... Signed-off-by: Jonathan Corbet Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82a854ec4f46c5fbef11b06bb49078ecc5784a2d Author: Urs Thuermann Date: Mon Jul 10 04:44:06 2006 -0700 [PATCH] RCU Documentation fix Updater should use _rcu variant of list_del(). Signed-off-by: Urs Thuermann Acked-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1454aed92b6b89cb1fbe3cbecd8ceaa7a122f3b7 Author: Arjan van de Ven Date: Mon Jul 10 04:44:05 2006 -0700 [PATCH] put a comment at register_die_notifier that the export is used {un}register_die_notifier() is used by kdb... document this so that future "remove dead export" rounds can skip this export. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f86bf9b7bcc5d325687a8b80da8ee3eb56e02da7 Author: Ingo Molnar Date: Mon Jul 10 04:44:05 2006 -0700 [PATCH] lockdep: clean up completion initializer in smpboot.c Clean up lockdep on-stack-completion initializer. (This also removes the dependency on waitqueue_lock_key.) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6d897cec29252b8d0785198cfa6ca16d30c739d Author: Ingo Molnar Date: Mon Jul 10 04:44:04 2006 -0700 [PATCH] lockdep: core, reduce per-lock class-cache size lockdep_map is embedded into every lock, which blows up data structure sizes all around the kernel. Reduce the class-cache to be for the default class only - that is used in 99.9% of the cases and even if we dont have a class cached, the lookup in the class-hash is lockless. This change reduces the per-lock dep_map overhead by 56 bytes on 64-bit platforms and by 28 bytes on 32-bit platforms. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55794a412fdf9af1744800e5020a4ec6b21e3cdc Author: Arjan van de Ven Date: Mon Jul 10 04:44:03 2006 -0700 [PATCH] lockdep: improve debug output Make lockdep print which lock is held, in the "kfree() of a live lock" scenario. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fca80e8b4bf5d69b900115b14342133ce81d79e Author: Ingo Molnar Date: Mon Jul 10 04:44:02 2006 -0700 [PATCH] lockdep: add more rwsem.h documentation Add more documentation to rwsem.h. Signed-off-by: Ingo Molnar Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9829cceb686f3719215fe43c8593e5f3efe1710 Author: Andi Kleen Date: Mon Jul 10 04:44:01 2006 -0700 [PATCH] Minor cleanup to lockdep.c - Use printk formatting for indentation - Don't leave NTFS in the default event filter Signed-off-by: Andi Kleen Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f72e4028a1ff968000cec4a034f45619fbd7ec4 Author: Andrew Morton Date: Mon Jul 10 04:44:01 2006 -0700 [PATCH] fadvise: remove dead comments Cc: "Michael Kerrisk" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25e206b54b9a20e63b6f5194aeebfa13d37e015c Author: Peter Oberparleiter Date: Mon Jul 10 04:44:00 2006 -0700 [PATCH] partitions: let partitions inherit policy from disk Change the partition code in fs/partitions/check.c to initialize a newly detected partition's policy field with that of the containing block device (see patch below). My reasoning is that function set_disk_ro() in block/genhd.c modifies the policy field (read-only indicator) of a disk and all contained partitions. When a partition is detected after the call to set_disk_ro(), the policy field of this partition will currently not inherit the disk's policy field. This behavior poses a problem in cases where a block device can be 'logically de- and reactivated' like e.g. the s390 DASD driver because partition detection may run after the policy field has been modified. Signed-off-by: Peter Oberparleiter Acked-by: Al Viro Makes-sense-to: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7691030bc9732f7d535522dda78cfdd36716def1 Author: Chuck Short Date: Mon Jul 10 04:43:59 2006 -0700 [PATCH] Add Specialix IO8+ card support hotplug support Patch Description: Add "Specialix IO8+ card support" hotplug support patch location: http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=d795cfc591bb44f6b3d86d8f054a227cecb44bb4 [akpm@osdl.org: cleanup] Cc: Randy Dunlap Signed-off-by: Chuck Short Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb0e71c7f388bfcb3f74897f23d0cf09310fc05b Author: Chuck Short Date: Mon Jul 10 04:43:59 2006 -0700 [PATCH] Add Computone IntelliPort Plus serial hotplug support Patch Description: Add "Computone IntelliPort Plus serial" hotplug support patch location: http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=8c36723187c0fa5efe0e5c6a9b1e66ed4b824792 [akpm@osdl.org: cleanup] Cc: Randy Dunlap Signed-off-by: Chuck Short Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64552a50bc80fecb73617336bf197375868faf6e Author: Horms Date: Mon Jul 10 04:43:58 2006 -0700 [PATCH] nfs: Update Documentation/nfsroot.txt to include dhcp, syslinux and isolinux * Document the ip command a little differently to make the interaction between defaults and autoconfiguration a little clearer (I hope) * Update autoconfiguration the current set of options, including DHCP * Update the boot methods to add syslinux and isolinux, and remove dd of=/dev/fd0 which is no longer supported by linux * Add a referance to initramfs along side initrd. Should the latter and its document be removed some time soon? * Various cleanups to put the text consistently into the thrid person * Reformated a bit to fit into 80 columns a bit more nicely * Should the bootloaders documentation be removed or split into a separate documentation, it seems somewhat out of scope Signed-off-by: Horms Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73ce5934e2d855db436566297f12966eb507a435 Author: Hisashi Hifumi Date: Mon Jul 10 04:43:56 2006 -0700 [PATCH] reiserfs: fix journaling issue regarding fsync() When write() extends a file(i_size is increased) and fsync() is called, change of inode must be written to journaling area through fsync(). But,currently the i_trans_id is not correctly updated when i_size is increased. So fsync() does not kick the journal writer. Reiserfs_file_write() already updates the transaction when blocks are allocated, but the case when i_size increases and new blocks are not added is not correctly treated. Following patch fix this bug. Signed-off-by: Hisashi Hifumi Cc: Jeff Mahoney Cc: Chris Mason Cc: Hans Reiser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0808925ea5684a0ce25483b30e94d4f398804978 Author: Eric Paris Date: Mon Jul 10 04:43:55 2006 -0700 [PATCH] SELinux: add rootcontext= option to label root inode when mounting Introduce a new rootcontext= option to FS mounting. This option will allow you to explicitly label the root inode of an FS being mounted before that FS or inode because visible to userspace. This was found to be useful for things like stateless linux, see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=190001 Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c312feb2931ded0582378712727b7ea017a951bd Author: Eric Paris Date: Mon Jul 10 04:43:53 2006 -0700 [PATCH] SELinux: decouple fscontext/context mount options Remove the conflict between fscontext and context mount options. If context= is specified without fscontext it will operate just as before, if both are specified we will use mount point labeling and all inodes will get the label specified by context=. The superblock will be labeled with the label of fscontext=, thus affecting operations which check the superblock security context, such as associate permissions. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ed6e34f88a0d896a6f889b00693cae0fadacfd0 Author: Andreas Mohr Date: Mon Jul 10 04:43:52 2006 -0700 [PATCH] small kernel/sched.c cleanup - constify and optimize stat_nam (thanks to Michael Tokarev!) - spelling and comment fixes Signed-off-by: Andreas Mohr Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a565f7919cfb3d3df2c97d45751cbb83d858f97 Author: Peter Williams Date: Mon Jul 10 04:43:51 2006 -0700 [PATCH] sched: fix bug in __migrate_task() Problem: In the function __migrate_task(), deactivate_task() followed by activate_task() is used to move the task from one run queue to another. This has two undesirable effects: 1. The task's priority is recalculated. (Nowhere else in the scheduler code is the priority recalculated for a change of CPU.) 2. The task's time stamp is set to the current time. At the very least, this makes the adjustment of the time stamp before the call to deactivate_task() redundant but I believe the problem is more serious as the time stamp now holds the time of the queue change instead of the time at which the task was woken. In addition, unless dest_rq is the same queue as "current" is on the time stamp could be inaccurate due to inter CPU drift. Solution: Replace the call to activate_task() with one to __activate_task(). Signed-off-by: Peter Williams Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e45b3b6af09dab2a28a7c88b340d0bcdd173e068 Author: Andrew Morton Date: Mon Jul 10 04:43:50 2006 -0700 [PATCH] count_vm_events() fix Dopey bug. Causes hopelessly-wrong numbers from vmstat(8) and several other counters. Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a91023a9f172f820e292f2c5675fb9f8e2636f0 Author: Andrew Morton Date: Mon Jul 10 04:43:49 2006 -0700 [PATCH] x86_64: e820.c needs pgtable.h arch/x86_64/kernel/e820.c:42: error: 'MAXMEM' undeclared here (not in a function) Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 135c294fa3660b979d71bbce1611f9ca721077b5 Author: Andrew Morton Date: Mon Jul 10 04:43:48 2006 -0700 [PATCH] don't select CONFIG_HOTPLUG It's useful to be able to turn off CONFIG_HOTPLUG for compile-coverage testing and for section-checking coverage. But a few things go and select CONFIG_HOTPLUG, making it a royal PITA to turn the thing off. It's only turnable offable if CONFIG_EMBEDDED anyway. So let's make those things depend on HOTPLUG, not select it. Cc: Greg KH Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07a18684c92c0156f87ea158b5adc3022485f82a Author: Kristen Accardi Date: Mon Jul 10 14:19:15 2006 -0400 ACPI: ACPI_DOCK: Initialize the atomic notifier list Signed-off-by: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit b312d799b324e895745ffe148def234fc60d5b74 Author: Daniel Drake Date: Wed Jul 5 15:57:39 2006 +0100 [PATCH] zd1211rw: usb_clear_halt not allowed in IRQ context We will reimplement halt-clearing later, when we have periodic housekeeping routines in place. This will do as a temporary fix, the EPIPE case has not yet been seen. Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 522536f6b24e63ac946259af65224f107dff7857 Author: Larry Finger Date: Wed Jun 28 19:11:21 2006 -0500 [PATCH] bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise An assert statement near the start of handle_irq_noise in the softmac version of bcm43xx_main.c is there to protect against out of bound addressing using variable bcm->noisecalc.nr_samples. The arrays in question have a dimension of 8, thus the value must be < 8. Signed-Off-By: Larry.Finger Signed-off-by: John W. Linville commit aadd06e5c56b9ff5117ec77e59eada43dc46e2fc Author: Jens Axboe Date: Mon Jul 10 11:00:01 2006 +0200 [PATCH] splice: fix problems with sys_tee() Several issues noticed/fixed: - We cannot reliably block in link_pipe() while holding both input and output mutexes. So do preparatory checks before locking down both mutexes and doing the link. - The ipipe->nrbufs vs i check was bad, because we could have dropped the ipipe lock in-between. This causes us to potentially look at unknown buffers if we were racing with someone else reading this pipe. Signed-off-by: Jens Axboe commit e21c1ca3f98529921c829a792dfdbfc5a5dc393b Author: Len Brown Date: Mon Jul 10 01:35:51 2006 -0400 ACPI: acpi_os_allocate() fixes Replace acpi_in_resume with a more general hack to check irqs_disabled() on any kmalloc() from ACPI. While setting (system_state != SYSTEM_RUNNING) on resume seemed more general, Andrew Morton preferred this approach. http://bugzilla.kernel.org/show_bug.cgi?id=3469 Make acpi_os_allocate() into an inline function to allow /proc/slab_allocators to work. Delete some memset() that could fault on allocation failure. Signed-off-by: Len Brown commit 8970bfe706345223d39d33bfce5f8b29750ab716 Author: Andrew Morton Date: Mon Jul 10 02:34:45 2006 -0400 ACPI: SBS: fix initialization, sem2mutex cm_sbs_sem is being downed (via acpi_ac_init->acpi_lock_ac_dir) before it is initialised, with grave results. - Make it a mutex - Initialise it - Make it static - Clean other stuff up. Thanks to Paul Drynoff for reporting and testing. Cc: Rich Townsend Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit d75080328affb4b268da430b7074cc8139cc662a Author: Arjan van de Ven Date: Tue Jul 4 13:06:00 2006 -0400 ACPI: add 'const' to several ACPI file_operations Signed-off-by: Arjan van de Ven Signed-off-by: Len Brown commit e26a2b8f68dca28c734d857517788e3b40b8691d Author: Andi Kleen Date: Thu Jul 6 12:14:00 2006 -0400 ACPI: delete some defaults from ACPI Kconfig No need for video to be always in No need for ACPI dock driver to be always in No need for smart battery driver to be always in Signed-off-by: Andi Kleen Signed-off-by: Len Brown commit af4f949c6b4ffa5119aad980626e5b04daca961b Author: Len Brown Date: Sun Jul 9 16:33:26 2006 -0400 ACPI: "Device `[%s]' is not power manageable" make message debug only Signed-off-by: Len Brown commit 8d7bff6c0896feba2fbd5ce37062c212aee13870 Author: Len Brown Date: Sun Jul 9 22:09:57 2006 -0400 ACPI: ACPI_DOCK Kconfig HOTPLUG_PCI_ACPI depends on ACPI_DOCK ACPI_IBM_DOCK depends on ACPI_DOCK=n ACPI_DOCK is EXPERIMENTAL, though that doesn't seem to mean much Signed-off-by: Len Brown commit b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d Author: Stephane Eranian Date: Sun Jul 9 21:12:39 2006 -0400 [PATCH] i386: use thread_info flags for debug regs and IO bitmaps Use thread info flags to track use of debug registers and IO bitmaps. - add TIF_DEBUG to track when debug registers are active - add TIF_IO_BITMAP to track when I/O bitmap is used - modify __switch_to() to use the new TIF flags Performance tested on Pentium II, ten runs of LMbench context switch benchmark (smaller is better:) before after avg 3.65 3.39 min 3.55 3.33 Signed-off-by: Stephane Eranian Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit c8f7a62cdde461914c6457d5f4362538ed810bf4 Author: Len Brown Date: Sun Jul 9 17:22:28 2006 -0400 Revert "Revert "ACPI: dock driver"" This reverts 953969ddf5b049361ed1e8471cc43dc4134d2a6f commit. commit 68aa2c0d4a36b43ea9c6d77134c94b4501fd2eb4 Author: Andrew Morton Date: Fri Jun 30 02:29:59 2006 -0700 [SERIAL] 8250: sysrq deadlock fix Fix http://bugzilla.kernel.org/show_bug.cgi?id=6716 Doing a sysrq over a serial line into an SMP machine presently deadlocks. Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 3be91ec7388bae3cf1bfb4febcee5ab6c65f409f Author: Zang Roy-r61911 Date: Fri Jun 30 02:29:58 2006 -0700 [SERIAL] 8250: add tsi108 serial support The following patch gets rid of CONFIG_TSI108_BRIDGE. I add UPIO_TSI to handle IIR and IER register in serial_in and serial_out. (1) the reason to rewrite serial_in: TSI108 rev Z1 version ERRATA. Reading the UART's Interrupt Identification Register (IIR) clears the Transmit Holding Register Empty (THRE) and Transmit buffer Empty (TEMP) interrupts even if they are not enabled in the Interrupt Enable Register (IER). This leads to loss of the interrupts. Interrupts are not cleared when reading UART registers as 32-bit word. (2) the reason to rewrite serial_out: Check for UART_IER_UUE bit in the autoconfig routine. This section of autoconfig is excluded for Tsi108/109 because bits 7 and 6 are reserved for internal use. They are R/W bits. In addition to incorrect identification, changing these bits (from 00) will make Tsi108/109 UART non-functional. Signed-off-by: Roy Zang Signed-off-by: Andrew Morton Signed-off-by: Russell King commit c65b15cfd6b8b74c6f2b3635bf47ee661d351ef3 Author: Julien BLACHE Date: Sun Jul 9 20:40:17 2006 +0200 [SERIAL] IP22: fix serial console hangs The patch below fixes serial console hangs as seen on IP22 machines. Typically, while booting, the machine hangs for ~1 minute displaying "INIT: ", then the same thing happens again when init enters in the designated runlevel and finally the getty process on ttyS0 hangs indefinitely (though strace'ing it helps). strace (-e raw=ioctl, otherwise the ioctl() translation is utterly bogus) reveals that getty hangs on ioctl() 0x540f which happens to be TCSETSW (I saw it hang on another console ioctl() but couldn't reproduce that one). A diff between ip22zilog and sunzilog revealed the following differences: 1. the channel A flag being set on up.port.flags instead of up.flags 2. the channel A flag being set on what is marked as being channel B 3. sunzilog has a call to uart_update_timeout(port, termios->c_cflag, baud); at the end of sunzilog_set_termios(), which ip22zilog lacks (on purpose ?) The patch below addresses point 1 and fixes the serial console hangs just fine. However point 2 should be investigated by someone familiar with the IP22 Zilog; it's probably OK as is but even if it is, a comment in ip22zilog.c is badly needed. Point 3 is left as an exercise for whoever feels like digging into ip22zilog :) These are the main obvious differences between ip22zilog and sunzilog. Newer versions of sunzilog (Linus's git tree as of today) are more close to ip22zilog as the sbus_{write,read}b have been changed into simple {write,read}b, which shrinks the diff by a fair amount. Resyncing both drivers should be doable in a few hours time now for someone familiar with the IP22 Zilog hardware. Signed-off-by: Julien BLACHE Signed-off-by: Russell King commit d608ab9917fbe9926704c07b27df72ac78133870 Author: Martin Michlmayr Date: Mon Jun 26 18:18:11 2006 +0200 [SERIAL] dz: Fix compilation error Fix the following compilation error in the dz serial driver that got introduced with the "kernel console should send CRLF not LFCR" change. CC drivers/serial/dz.o drivers/serial/dz.c: In function 'dz_console_putchar': drivers/serial/dz.c:679: error: 'uport' undeclared (first use in this function) drivers/serial/dz.c:679: error: (Each undeclared identifier is reported only once drivers/serial/dz.c:679: error: for each function it appears in.) Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit ab8aa06a5c0b75974fb1949365cbb20a15cedf14 Author: Len Brown Date: Fri Jul 7 20:11:07 2006 -0400 ACPI: acpi_os_get_thread_id() returns current Linux mutexes and the debug code that that reference acpi_os_get_thread_id() are happy with 0. But the AML mutexes in exmutex.c expect a unique non-zero number for each thread - as they track this thread_id to permit the mutex re-entrancy defined by the ACPI spec. http://bugzilla.kernel.org/show_bug.cgi?id=6687 Signed-off-by: Len Brown commit f6dd9221dddb3550e60d32aee688588ec208312c Author: Bob Moore Date: Fri Jul 7 20:44:38 2006 -0400 ACPI: ACPICA 20060707 Added the ACPI_PACKED_POINTERS_NOT_SUPPORTED macro to support C compilers that do not allow the initialization of address pointers within packed structures - even though the hardware itself may support misaligned transfers. Some of the debug data structures are packed by default to minimize size. Added an error message for the case where acpi_os_get_thread_id() returns zero. A non-zero value is required by the core ACPICA code to ensure the proper operation of AML mutexes and recursive control methods. The DSDT is now the only ACPI table that determines whether the AML interpreter is in 32-bit or 64-bit mode. Not really a functional change, but the hooks for per-table 32/64 switching have been removed from the code. A clarification to the ACPI specification is forthcoming in ACPI 3.0B. Fixed a possible leak of an Owner ID in the error path of tbinstal.c acpi_tb_init_table_descriptor() and migrated all table OwnerID deletion to a single place in acpi_tb_uninstall_table() to correct possible leaks when using the acpi_tb_delete_tables_by_type() interface (with assistance from Lance Ortiz.) Fixed a problem with Serialized control methods where the semaphore associated with the method could be over-signaled after multiple method invocations. Fixed two issues with the locking of the internal namespace data structure. Both the Unload() operator and acpi_unload_table() interface now lock the namespace during the namespace deletion associated with the table unload (with assistance from Linn Crosetto.) Fixed problem reports (Valery Podrezov) integrated: - Eliminate unnecessary memory allocation for CreateXxxxField http://bugzilla.kernel.org/show_bug.cgi?id=5426 Fixed problem reports (Fiodor Suietov) integrated: - Incomplete cleanup branches in AcpiTbGetTableRsdt (BZ 369) - On Address Space handler deletion, needless deactivation call (BZ 374) - AcpiRemoveAddressSpaceHandler: validate Device handle parameter (BZ 375) - Possible memory leak, Notify sub-objects of Processor, Power, ThermalZone (BZ 376) - AcpiRemoveAddressSpaceHandler: validate Handler parameter (BZ 378) - Minimum Length of RSDT should be validated (BZ 379) - AcpiRemoveNotifyHandler: return AE_NOT_EXIST if Processor Obj has no Handler (BZ (380) - AcpiUnloadTable: return AE_NOT_EXIST if no table of specified type loaded (BZ 381) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 1b30dd359ebec22d035e8b145751319f63772ca1 Author: Ralf Baechle Date: Sun Jul 9 12:14:22 2006 -0700 [AX.25]: Use kzalloc Replace kzalloc instead of kmalloc + memset. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 24781734643ea2e9fd864f58000e47793e2dcb04 Author: Adrian Bunk Date: Sun Jul 9 12:13:18 2006 -0700 [ATM] net/atm/clip.c: fix PROC_FS=n compile This patch fixes the following compile error with CONFIG_PROC_FS=n by reverting commit dcdb02752ff13a64433c36f2937a58d93ae7a19e: <-- snip --> ... CC net/atm/clip.o net/atm/clip.c: In function ‘atm_clip_init’: net/atm/clip.c:975: error: ‘atm_proc_root’ undeclared (first use in this function) net/atm/clip.c:975: error: (Each undeclared identifier is reported only once net/atm/clip.c:975: error: for each function it appears in.) net/atm/clip.c:977: error: ‘arp_seq_fops’ undeclared (first use in this function) make[2]: *** [net/atm/clip.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit ebbaeab18b1c520054ea70e512ac0db7456ede01 Author: Thomas Graf Date: Sun Jul 9 11:36:23 2006 -0700 [PKT_SCHED]: act_api: Fix module leak while flushing actions Module reference needs to be given back if message header construction fails. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 953969ddf5b049361ed1e8471cc43dc4134d2a6f Author: Linus Torvalds Date: Sun Jul 9 08:47:46 2006 -0700 Revert "ACPI: dock driver" This reverts commit a5e1b94008f2a96abf4a0c0371a55a56b320c13e. Adrian Bunk points out that it has build errors, and apparently no maintenance. Throw it out. Signed-off-by: Linus Torvalds commit b862f3b099f3ea672c7438c0b282ce8201d39dfc Author: Linus Torvalds Date: Sat Jul 8 15:24:18 2006 -0700 i386: improve and correct inline asm memory constraints Use "+m" rather than a combination of "=m" and "m" for improved clarity and consistency. This also fixes some inlines that incorrectly didn't tell the compiler that they read the old value at all, potentially causing the compiler to generate bogus code. It appear that all of those potential bugs were hidden by the use of extra "volatile" specifiers on the data structures in question, though. Signed-off-by: Linus Torvalds commit e2a3d40258fe20d205f8ed592e1e2c0d5529c2e1 Author: Linus Torvalds Date: Sat Jul 8 15:00:28 2006 -0700 power: improve inline asm memory constraints Use "+m" rather than a combination of "=m" and "m" for improved clarity and consistency. Signed-off-by: Linus Torvalds commit 26e0fd1ce2418b10713b569a195bdb679233066b Author: Patrick McHardy Date: Sat Jul 8 13:38:55 2006 -0700 [NET]: Fix IPv4/DECnet routing rule dumping When more rules are present than fit in a single skb, the remaining rules are incorrectly skipped. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a430a43d087545c96542ee64573237919109d370 Author: Herbert Xu Date: Sat Jul 8 13:34:56 2006 -0700 [NET] gso: Fix up GSO packets with broken checksums Certain subsystems in the stack (e.g., netfilter) can break the partial checksum on GSO packets. Until they're fixed, this patch allows this to work by recomputing the partial checksums through the GSO mechanism. Once they've all been converted to update the partial checksum instead of clearing it, this workaround can be removed. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 89114afd435a486deb8583e89f490fc274444d18 Author: Herbert Xu Date: Sat Jul 8 13:34:32 2006 -0700 [NET] gso: Add skb_is_gso This patch adds the wrapper function skb_is_gso which can be used instead of directly testing skb_shinfo(skb)->gso_size. This makes things a little nicer and allows us to change the primary key for indicating whether an skb is GSO (if we ever want to do that). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9c6c6795eda34e4dc38ecac912a16b6314082beb Author: Adrian Bunk Date: Sat Jul 8 13:33:28 2006 -0700 [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init() The Coverity checker spotted, that from the changes from commit 898b1d16f8230fb912a0c2248df685735c6ceda3 the if (ret) platform_driver_unregister(&ali_ircc_driver); was dead code. This patch changes this function to what seems to have been the intention. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 1252ecf63f77ea147bd40f5462c7d9e3d3ae2815 Author: Arjan van de Ven Date: Sat Jul 8 13:30:52 2006 -0700 [ATM]: fix possible recursive locking in skb_migrate() ok this is a real potential deadlock in a way, it takes two locks of 2 skbuffs without doing any kind of lock ordering; I think the following patch should fix it. Just sort the lock taking order by address of the skb.. it's not pretty but it's the best this can do in a minimally invasive way. Signed-off-by: Arjan van de Ven Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 00181fc94648b4bb30d30ef95506055105316051 Author: Matt LaPlante Date: Sat Jul 8 13:30:09 2006 -0700 [ATM]: Typo in drivers/atm/Kconfig... From: Matt LaPlante Signed-off-by: Charles Williams Signed-off-by: David S. Miller commit c165b0040502ef0d2b5751eef3cd96ea8210ae4c Author: John W. Linville Date: Sat Jul 8 13:28:53 2006 -0700 [TG3]: add amd8131 to "write reorder" chipsets Add the AMD 8131 bridge to the list of chipsets that reorder writes. Signed-off-by: John W. Linville Acked-by: Michael Chan Signed-off-by: David S. Miller commit 8ba10ab128e88bfbe58f7164543827ef3c3a2c88 Author: Steve French Date: Sat Jul 8 02:17:40 2006 +0000 [CIFS] CIFS_DEBUG2 depends on CIFS Signed-off-by: Steve French commit 5a8da02ba59a9f978e2af4c5da9a029ea5f5ee3b Author: Stephen Hemminger Date: Fri Jul 7 16:54:05 2006 -0700 [NET]: Fix network device interface printk message priority The printk's in the network device interface code should all be tagged with severity. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a496e25dfb25493a57bcee5d66875d6ff80a9093 Author: Dave Jones Date: Fri Jul 7 12:31:27 2006 -0400 [PATCH] Fix cpufreq vs hotplug lockdep recursion. [ There's some not quite baked bits in cpufreq-git right now so sending this on as a patch instead ] On Thu, 2006-07-06 at 07:58 -0700, Tom London wrote: > After installing .2356 I get this each time I boot: > ======================================================= > [ INFO: possible circular locking dependency detected ] > ------------------------------------------------------- > S06cpuspeed/1620 is trying to acquire lock: > (dbs_mutex){--..}, at: [] mutex_lock+0x21/0x24 > > but task is already holding lock: > (cpucontrol){--..}, at: [] mutex_lock+0x21/0x24 > > which lock already depends on the new lock. > make sure the cpu hotplug recursive mutex (yuck) is taken early in the cpufreq codepaths to avoid a AB-BA deadlock. Signed-off-by: Arjan van de Ven Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 1959d21232931dfa686769a21161413f10d6652f Author: Jens Axboe Date: Thu Jul 6 10:18:05 2006 +0200 [PATCH] Only the first two bits in bio->bi_rw and rq->flags match Not three, as assumed. This causes the barrier bit to be needlessly set for some IO. Signed-off-by: Jens Axboe commit 40359ccb836866435b03a0cb57345002b587d875 Author: Nathan Scott Date: Thu Jul 6 10:03:28 2006 +0200 [PATCH] blktrace: readahead support Provide the needed kernel support for distinguishing readahead from regular read requests when tracing block devices. Signed-off-by: Nathan Scott Signed-off-by: Jens Axboe commit fc0a75ce4835187a3f76d6b35f0644d1b168eef5 Author: Nathan Scott Date: Thu Jul 6 09:56:30 2006 +0200 [PATCH] blktrace: fix barrier vs sync typo Signed-off-by: Nathan Scott Signed-off-by: Jens Axboe commit bce305f4fe779f29d99d414685243f5da0803254 Author: Arjan van de Ven Date: Wed Jul 5 15:00:40 2006 +0200 [PATCH] 8139too deadlock fix > stack backtrace: > [] rtl8139_start_xmit+0xd9/0xff [8139too] > [] netpoll_send_skb+0x98/0xea This seems to be a real deadlock... So netpoll_send_skb takes the _xmit_lock, which is all nitty gritty but then rtl8139_start_xmit comes around while that lock is taken, and does spin_unlock_irq(&tp->lock); which.. enables interrupts and softirqs; this is quite bad because the xmit lock is taken in softirq context for the watchdog like this: [] _spin_lock+0x23/0x32 [] dev_watchdog+0x14/0xb1 [] run_timer_softirq+0xf2/0x14a [] __do_softirq+0x55/0xb0 [] do_softirq+0x58/0xbd Which would deadlock now that the spin_unlock_irq() has enabled irqs/softirqs while the _xmit_lock is still held. The patch below turns this into a irqsave/irqrestore pair so that interrupts don't get enabled unconditionally. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Jeff Garzik commit 20ed7c094dfe33b0e15e8c60f60012b9278631d3 Author: Jeff Garzik Date: Wed Jul 5 14:28:34 2006 -0400 [netdrvr] 3c59x: snip changelog from source code Driver source code is not the preferred place to store change history. Acked-by: Andrew Morton Signed-off-by: Jeff Garzik commit e4ac9773be2ea01b707da0496ab1527ec6cdda4e Author: Auke Kok Date: Tue Jun 27 09:08:34 2006 -0700 e1000: increase version to 7.1.9-k2 Increment the version to 7.1.9-k2 Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ae2c3860eb18712b71861bb6fc8d7e11e0f79e6d Author: Auke Kok Date: Tue Jun 27 09:08:30 2006 -0700 e1000: add ich8lan device ID's Add the device ID's of the supported ICH8 LAN devices. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 1f9e7e3d32f7ff3fd3a936fc9ad59770b3d29774 Author: Auke Kok Date: Tue Jun 27 09:08:26 2006 -0700 e1000: allow user to disable ich8 lock loss workaround The workaround for the ich8 lock loss problem is only needed for a very small amount of systems. This adds an option for the user to disable the workaround. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit cd94dd0b648ceb64ca5e41d9ccfa99c1e30e92ef Author: Auke Kok Date: Tue Jun 27 09:08:22 2006 -0700 e1000: integrate ich8 support into driver This hooks up the ich8 structure into the driver itself. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit d37ea5d56293b7a883d2a993df5d8b9fb660ed3b Author: Auke Kok Date: Tue Jun 27 09:08:17 2006 -0700 e1000: add ich8lan core functions This implements the core new functions needed for ich8's internal NIC. This includes: * ich8 specific read/write code * flash/nvm access code * software semaphore flag functions * 10/100 PHY (fe - no gigabit speed) support for low-end versions * A workaround for a powerdown sequence problem discovered that affects a small number of motherboard. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ab7bc0ad72a12ef8eacc1560c9342aa567f3531d Author: Auke Kok Date: Tue Jun 27 09:08:13 2006 -0700 e1000: disable ERT Hardware is reported to have problems with ERT. We disable it for all hardware to make sure we are not seeing unexplainable user problems. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 592600a0536f0d5aab4dc95f19515a37d03430f8 Author: Auke Kok Date: Tue Jun 27 09:08:09 2006 -0700 e1000: check return value of _get_speed_and_duplex We were not checking the return value of get_speed_and_duplex properly, whih may contain an error value. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ee04022a21764a12e29eee144b72344ebfe0a55c Author: Auke Kok Date: Tue Jun 27 09:08:03 2006 -0700 e1000: M88 PHY workaround M88 rev 2 PHY needs a longer downshift to function properly. This adds a much longer downshift counter for this specific device. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit f1b3a85354d3877fae45ef448e7e49c2efd692d5 Author: Auke Kok Date: Tue Jun 27 09:07:56 2006 -0700 e1000: fix adapter led blinking inconsistency Several e1000 adapters were not blinking correctly or inconsistently. This patch cleans this up and makes them all behave the same as far as possible. Signed-off-by: Jeff Kirsher Signed-off-by: Auke Kok commit 7dfee0cb1d506897805b663dd95e9651619a4d4d Author: Auke Kok Date: Tue Jun 27 09:07:50 2006 -0700 e1000: disable CRC stripping workaround CRC stripping is breaking SMBUS-connected BMC's. We disable this feature to make it work. This fixes related bugs regarding SOL. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 4ca213a6957318219822c024c8e4c61b3e42a7dc Author: Auke Kok Date: Tue Jun 27 09:07:08 2006 -0700 e1000: force register write flushes to circumvent broken platforms A certain AMD64 bridge (8132) has an option to turn on write combining which breaks our adapter. To circumvent this we need to flush every write. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 17231712ab89fa085bc235ef19c1e6e0c163e4fc Author: Auke Kok Date: Tue Jun 27 09:06:59 2006 -0700 e1000: rework module param code with uninitialized values We can take uninitialized values into account which minimizes code and allows us to simplify the parameter checking code greatly. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 864c4e45ec6d1bfe16a14d887d5baad201419aba Author: Auke Kok Date: Tue Jun 27 09:06:53 2006 -0700 e1000: recycle skb Recycle an skb to improve performance a bit. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit a5eafce2ce2fd3a1956657d85908ca691b870e5d Author: Auke Kok Date: Tue Jun 27 09:06:49 2006 -0700 e1000: change printk into DPRINTK Changing a printk message to make clear that this message is originating from e1000. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 9a53a2029885e0088e9149679215b95d04deb57b Author: Auke Kok Date: Tue Jun 27 09:06:45 2006 -0700 e1000: add smart power down code Smart Power Down is a power saving feature in newer e1000 hardware. We disable it because it causes time to link to be long, but make it a user choice. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 0cbabbb0725fa34a37d6b7870b2d2fe17d1a0a94 Author: Auke Kok Date: Tue Jun 27 09:06:41 2006 -0700 e1000: small performance tweak by removing double code buffer_info is already filled at the end of this while() loop. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 6fdfef162426766611b1f640138e4720f56e45f8 Author: Auke Kok Date: Tue Jun 27 09:06:36 2006 -0700 e1000: fix CONFIG_PM blocks e1000_suspend is called even when !CONFIG_PM. The non-PM code inside of it is properly #ifdef'd. This fixes the compiler warnings when !CONFIG_PM. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 79f05bf0ba9b41561600f3cdfdf86b5184fc6675 Author: Auke Kok Date: Tue Jun 27 09:06:32 2006 -0700 e1000: Make PHY powerup/down a function In relation to the irq work done earlier we also move the PHY powerup and powerdown functions into separate functions and move the calls to _close and _open, making the PHY stay in it's power state as long as the device is _up. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 2db10a081c5c1082d58809a1bcf1a6073f4db160 Author: Auke Kok Date: Tue Jun 27 09:06:28 2006 -0700 e1000: rework driver hardware reset locking After studying the driver mac reset code it was found that there were multiple race conditions possible to reset the unit twice or bring it e1000_up() double. This fixes all occurences where the driver needs to reset the mac. We also remove irq requesting/releasing into _open and _close so that while the device is _up we will never touch the irq's. This fixes the double free irq bug that people saw. To make sure that the watchdog task doesn't cause another race we let it run as a non-scheduled task. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit acfbc9fde2ec7f304398f6ad7644002e07bf84bc Author: Auke Kok Date: Tue Jun 27 09:06:24 2006 -0700 e1000: fix loopback ethtool test Ethtool was reporting that loopback failed randomly on esb2 systems. Upon study it was found that the phy manual was changed with respect to the loopback mode bits. The new value fixes it. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit a487a8f7b6947f6445e5a1aa876522916785d5ec Author: Auke Kok Date: Fri Jun 9 11:29:03 2006 -0700 e1000: prevent statistics from garbling during bus resets If a PCI bus error/fault triggers a PCI bus reset, attempts to get the ethernet packet count statistics from the hardware will fail, returning garbage data upstream. This patch skips statistics data collection if the PCI device is not on the bus. Signed-off-by: Linas Vepstas Cc: Jesse Brandeburg Signed-off-by: Andrew Morton Acked-by: Auke Kok commit 48ce8b056c88920c8ac187781048f5dae33c81b9 Author: Evgeniy Dushistov Date: Mon Jun 5 08:21:03 2006 -0500 JFS: commit_mutex cleanups I look at code, and see that 1)locks wasn't release in the opposite order in which they were taken 2)in jfs_rename we lock new_ip, and in "error path" we didn't unlock it 3)I see strange expression: "! !" May be this worth to fix? Signed-off-by: Evgeniy Dushistov Signed-off-by: Dave Kleikamp