1. 27 Sep, 2006 32 commits
  2. 26 Sep, 2006 8 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 · b2782408
      Linus Torvalds authored
      * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (225 commits)
        [PATCH] Don't set calgary iommu as default y
        [PATCH] i386/x86-64: New Intel feature flags
        [PATCH] x86: Add a cumulative thermal throttle event counter.
        [PATCH] i386: Make the jiffies compares use the 64bit safe macros.
        [PATCH] x86: Refactor thermal throttle processing
        [PATCH] Add 64bit jiffies compares (for use with get_jiffies_64)
        [PATCH] Fix unwinder warning in traps.c
        [PATCH] x86: Allow disabling early pci scans with pci=noearly or disallowing conf1
        [PATCH] x86: Move direct PCI scanning functions out of line
        [PATCH] i386/x86-64: Make all early PCI scans dependent on CONFIG_PCI
        [PATCH] Don't leak NT bit into next task
        [PATCH] i386/x86-64: Work around gcc bug with noreturn functions in unwinder
        [PATCH] Fix some broken white space in ia32_signal.c
        [PATCH] Initialize argument registers for 32bit signal handlers.
        [PATCH] Remove all traces of signal number conversion
        [PATCH] Don't synchronize time reading on single core AMD systems
        [PATCH] Remove outdated comment in x86-64 mmconfig code
        [PATCH] Use string instructions for Core2 copy/clear
        [PATCH] x86: - restore i8259A eoi status on resume
        [PATCH] i386: Split multi-line printk in oops output.
        ...
      b2782408
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · dd77a4ee
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (47 commits)
        Driver core: Don't call put methods while holding a spinlock
        Driver core: Remove unneeded routines from driver core
        Driver core: Fix potential deadlock in driver core
        PCI: enable driver multi-threaded probe
        Driver Core: add ability for drivers to do a threaded probe
        sysfs: add proper sysfs_init() prototype
        drivers/base: check errors
        drivers/base: Platform notify needs to occur before drivers attach to the device
        v4l-dev2: handle __must_check
        add CONFIG_ENABLE_MUST_CHECK
        add __must_check to device management code
        Driver core: fixed add_bind_files() definition
        Driver core: fix comments in drivers/base/power/resume.c
        sysfs_remove_bin_file: no return value, dump_stack on error
        kobject: must_check fixes
        Driver core: add ability for devices to create and remove bin files
        Class: add support for class interfaces for devices
        Driver core: create devices/virtual/ tree
        Driver core: add device_rename function
        Driver core: add ability for classes to handle devices properly
        ...
      dd77a4ee
    • Heiko Carstens's avatar
      [PATCH] s390: fix cmm kernel thread handling · e8216dee
      Heiko Carstens authored
      Convert cmm's usage of kernel_thread to kthread_run.  Also create the
      cmmthread at module load time, so it is possible to check if creation of
      the thread fails.
      
      In addition the cmmthread now gets terminated when the module gets unloaded
      instead of leaving a stale kernel thread.  Also check the return values of
      other registration functions at module load and handle their return values
      appropriately.
      
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      e8216dee
    • Jeff Dike's avatar
      [PATCH] Make UML use ptrace-abi.h · e8df8c33
      Jeff Dike authored
      Include the host architecture's ptrace-abi.h instead of ptrace.h.
      
      There was some cpp mangling of names around the ptrace.h include to avoid
      symbol clashes between UML and the host architecture.  Most of these can go
      away.  The exception is struct pt_regs, which is convenient to have in
      userspace, but must be renamed in order that UML can define its own.
      
      ptrace-x86_64.h needed to have some now-obsolete cpp cruft and a declaration
      removed.
      Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      e8df8c33
    • Jeff Dike's avatar
      [PATCH] Split i386 and x86_64 ptrace.h · 70e0eb8e
      Jeff Dike authored
      The use of SEGMENT_RPL_MASK in the i386 ptrace.h introduced by
      x86-allow-a-kernel-to-not-be-in-ring-0.patch broke the UML build, as UML
      includes the underlying architecture's ptrace.h, but has no easy access to the
      x86 segment definitions.
      
      Rather than kludging around this, as in the past, this patch splits the
      userspace-usable parts, which are the bits that UML needs, of ptrace.h into
      ptrace-abi.h, which is included back into ptrace.h.  Thus, there is no net
      effect on i386.
      
      As a side-effect, this creates a ptrace header which is close to being usable
      in /usr/include.
      
      x86_64 is also treated in this way for consistency.  There was some trailing
      whitespace there, which is cleaned up.
      Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      70e0eb8e
    • Alan Cox's avatar
      [PATCH] UML: tty locking · b1fc0b1f
      Alan Cox authored
      Ensure current->signal->tty doesn't get freed during log_exec().
      Signed-off-by: default avatarAlan Cox <alan@redhat.com>
      Acked-by: default avatarJeff Dike <jdike@addtoit.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      b1fc0b1f
    • Jeff Dike's avatar
      [PATCH] uml: stack usage reduction · 75e29b18
      Jeff Dike authored
      The KSTK_* macros used an inordinate amount of stack.  In order to overcome
      an impedance mismatch between their interface, which just returns a single
      register value, and the interface of get_thread_regs, which took a full
      pt_regs, the implementation created an on-stack pt_regs, filled it in, and
      returned one field.  do_task_stat calls KSTK_* twice, resulting in two
      local pt_regs, blowing out the stack.
      
      This patch changes the interface (and name) of get_thread_regs to just
      return a single register from a jmp_buf.
      
      The include of archsetjmp.h" in registers.h to get the definition of
      jmp_buf exposed a bogus include of <setjmp.h> in start_up.c.  <setjmp.h>
      shouldn't be used anywhere any more since UML uses the klibc
      setjmp/longjmp.
      Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      75e29b18
    • Paolo 'Blaisorblade' Giarrusso's avatar
      [PATCH] uml: clean our set_ether_mac · bf61f50d
      Paolo 'Blaisorblade' Giarrusso authored
      Clean set_ether_mac usage.  Maybe could also be removed, but surely it can't
      be a global function taking a void* argument.
      Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
      Acked-by: default avatarJeff Dike <jdike@addtoit.com>
      Cc: Jeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      bf61f50d