Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 15, 2006
  1. Linux 2.6.18-rc2

    Linus Torvalds authored
    Finishing up for the kernel summit. Ottawa, here I come.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    Linus Torvalds authored
    …/git/shaggy/jfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
      JFS: commit_mutex cleanups
  3. [PATCH] UML - fix utsname build breakage

    Jeff Dike authored Linus Torvalds committed
    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 <jdike@addtoit.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  4. Don't allow chmod() on the /proc/<pid>/ files

    Linus Torvalds authored
    This just turns off chmod() on the /proc/<pid>/ 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 <eteo@redhat.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  5. Mark /proc MS_NOSUID and MS_NOEXEC

    Linus Torvalds authored
    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 <torvalds@osdl.org>
  6. @kernelslacker

    [PATCH] sch_htb compile fix.

    kernelslacker authored Linus Torvalds committed
    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 <davej@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  7. Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      [CRYPTO] padlock: Fix alignment after aes_ctx rearrange
  8. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
      [SPARC64] Fix PSYCHO PCI controler init.
      [SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources()
      [SERIAL] sunsab: Fix significant typo in sab_probe()
      [SERIAL] sunsu: Report keyboard and mouse ports in kernel log.
      [SPARC64]: Make sure IRQs are disabled properly during early boot.
  9. Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [VLAN]: __vlan_hwaccel_rx can use the faster ether_compare_addr
      [PKT_SCHED] HTB: initialize upper bound properly
      [IPV4]: Clear skb cb on IP input
      [NET]: Update frag_list in pskb_trim
  10. @rostedt

    [PATCH] remove set_wmb - arch removal

    rostedt authored Linus Torvalds committed
    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 <rostedt@goodmis.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  11. @rostedt

    [PATCH] remove set_wmb - doc update

    rostedt authored Linus Torvalds committed
    This patch removes the reference to set_wmb from memory-barriers.txt
    since it shouldn't be used.
    
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  12. [PATCH] Remove down_write() from taskstats code invoked on the exit()…

    Shailabh Nagar authored Linus Torvalds committed
    … 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 <sekharan@us.ibm.com>
    Signed-off-by: Shailabh Nagar <nagar@watson.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  13. [PATCH] per-task delay accounting taskstats interface: control exit d…

    Shailabh Nagar authored Linus Torvalds committed
    …ata 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 <nagar@watson.ibm.com>
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  14. [PATCH] per-task delay accounting: avoid send without listeners

    Shailabh Nagar authored Linus Torvalds committed
    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 <balbir@in.ibm.com>
    Signed-off-by: Shailabh Nagar <nagar@watson.ibm.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  15. [PATCH] per task delay accounting taskstats interface: documentation fix

    Shailabh Nagar authored Linus Torvalds committed
    Change documentation and example program to reflect the flow control issues
    being addressed by the cpumask changes.
    
    Signed-off-by: Shailabh Nagar <nagar@watson.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  16. [PATCH] delay accounting taskstats interface send tgid once

    Shailabh Nagar authored Linus Torvalds committed
    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 <nagar@watson.ibm.com>
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  17. [PATCH] per-task-delay-accounting: /proc export of aggregated block I…

    Shailabh Nagar authored Linus Torvalds committed
    …/O delays
    
    Export I/O delays seen by a task through /proc/<tgid>/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 <nagar@watson.ibm.com>
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Cc: Jes Sorensen <jes@sgi.com>
    Cc: Peter Chubb <peterc@gelato.unsw.edu.au>
    Cc: Erich Focht <efocht@ess.nec.de>
    Cc: Levent Serinol <lserinol@gmail.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  18. [PATCH] per-task-delay-accounting: documentation

    Shailabh Nagar authored Linus Torvalds committed
    Some documentation for delay accounting.
    
    Signed-off-by: Shailabh Nagar <nagar@watson.ibm.com>
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Cc: Jes Sorensen <jes@sgi.com>
    Cc: Peter Chubb <peterc@gelato.unsw.edu.au>
    Cc: Erich Focht <efocht@ess.nec.de>
    Cc: Levent Serinol <lserinol@gmail.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  19. [PATCH] per-task-delay-accounting: delay accounting usage of taskstat…

    Shailabh Nagar authored Linus Torvalds committed
    …s interface
    
    Usage of taskstats interface by delay accounting.
    
    Signed-off-by: Shailabh Nagar <nagar@us.ibm.com>
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Cc: Jes Sorensen <jes@sgi.com>
    Cc: Peter Chubb <peterc@gelato.unsw.edu.au>
    Cc: Erich Focht <efocht@ess.nec.de>
    Cc: Levent Serinol <lserinol@gmail.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  20. [PATCH] per-task-delay-accounting: taskstats interface

    Shailabh Nagar authored Linus Torvalds committed
    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 <nagar@us.ibm.com>
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Cc: Jes Sorensen <jes@sgi.com>
    Cc: Peter Chubb <peterc@gelato.unsw.edu.au>
    Cc: Erich Focht <efocht@ess.nec.de>
    Cc: Levent Serinol <lserinol@gmail.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  21. [PATCH] per-task-delay-accounting: utilities for genetlink usage

    Balbir Singh authored Linus Torvalds committed
    Two utilities for simplifying usage of NETLINK_GENERIC interface.
    
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Signed-off-by: Shailabh Nagar <nagar@watson.ibm.com>
    Cc: Jes Sorensen <jes@sgi.com>
    Cc: Peter Chubb <peterc@gelato.unsw.edu.au>
    Cc: Erich Focht <efocht@ess.nec.de>
    Cc: Levent Serinol <lserinol@gmail.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  22. @chandra2

    [PATCH] per-task-delay-accounting: cpu delay collection via schedstats

    chandra2 authored Linus Torvalds committed
    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 <sekharan@us.ibm.com>
    Signed-off-by: Shailabh Nagar <nagar@watson.ibm.com>
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Cc: Jes Sorensen <jes@sgi.com>
    Cc: Peter Chubb <peterc@gelato.unsw.edu.au>
    Cc: Erich Focht <efocht@ess.nec.de>
    Cc: Levent Serinol <lserinol@gmail.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  23. [PATCH] per-task-delay-accounting: sync block I/O and swapin delay co…

    Shailabh Nagar authored Linus Torvalds committed
    …llection
    
    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 <nagar@watson.ibm.com>
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Cc: Jes Sorensen <jes@sgi.com>
    Cc: Peter Chubb <peterc@gelato.unsw.edu.au>
    Cc: Erich Focht <efocht@ess.nec.de>
    Cc: Levent Serinol <lserinol@gmail.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  24. [PATCH] per-task-delay-accounting: setup

    Shailabh Nagar authored Linus Torvalds committed
    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 <nagar@watson.ibm.com>
    Signed-off-by: Balbir Singh <balbir@in.ibm.com>
    Cc: Jes Sorensen <jes@sgi.com>
    Cc: Peter Chubb <peterc@gelato.unsw.edu.au>
    Cc: Erich Focht <efocht@ess.nec.de>
    Cc: Levent Serinol <lserinol@gmail.com>
    Cc: Jay Lan <jlan@engr.sgi.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  25. [PATCH] list_is_last utility

    Shailabh Nagar authored Linus Torvalds committed
    Add another list utility function to check for last element in a list.
    
    Signed-off-by: Shailabh Nagar <nagar@watson.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  26. [PATCH] mbxfb: Add framebuffer driver for the Intel 2700G

    Mike Rapoport authored Linus Torvalds committed
    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 <mike@compulab.co.il>
    Signed-off-by: Antonino Daplas <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  27. @eparis

    [PATCH] Fix security check for joint context= and fscontext= mount op…

    eparis authored Linus Torvalds committed
    …tions
    
    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 <eparis@redhat.com>
    Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
    Acked-by: James Morris <jmorris@namei.org>
    Cc: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  28. @AdrianBunk

    [PATCH] let the the lockdep options depend on DEBUG_KERNEL

    AdrianBunk authored Linus Torvalds committed
    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 <bunk@stusta.de>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  29. [PATCH] tpm_tis: use resource_size_t

    Kylene Jo Hall authored Linus Torvalds committed
    Fix the start and len variables that should be using the new
    resource_size_t.
    
    Signed_off_by: Kylene Hall <kjhall@us.ibm.com>
    
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  30. [PATCH] tpm: Add force device probe option

    Kylene Jo Hall authored Linus Torvalds committed
    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 <kjhall@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  31. [PATCH] tpm: interrupt clear fix

    Kylene Jo Hall authored Linus Torvalds committed
    Under stress testing I found that the interrupt is not always cleared.
    
    Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  32. [PATCH] symlink nesting level change

    Al Viro authored Linus Torvalds committed
    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 <viro@zeniv.linux.org.uk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  33. [PATCH] actual mailing list in MAINTAINERS

    Randy Dunlap authored Linus Torvalds committed
    Add actual mailing list email addresses for the 4 that were only listing a
    web page.
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  34. [PATCH] TPM: fix failure path leak

    Randy Dunlap authored Linus Torvalds committed
    kfree(devname) on the misc_register() failure path.  Otherwise it is lost
    forever.
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Cc: Kylene Jo Hall <kjhall@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  35. [PATCH] lockdep: core, fix rq-lock handling on __ARCH_WANT_UNLOCKED_C…

    Ingo Molnar authored Linus Torvalds committed
    …TXSW
    
    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 <mingo@elte.hu>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Something went wrong with that request. Please try again.