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: