Skip to content
  1. Apr 09, 2009
  2. Apr 08, 2009
    • Linus Torvalds's avatar
      Linux 2.6.30-rc1 · 577c9c45
      Linus Torvalds authored
      v2.6.30-rc1
      577c9c45
    • Linus Torvalds's avatar
      Merge branch 'core/softlockup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 1551260d
      Linus Torvalds authored
      * 'core/softlockup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        softlockup: make DETECT_HUNG_TASK default depend on DETECT_SOFTLOCKUP
        softlockup: move 'one' to the softlockup section in sysctl.c
        softlockup: ensure the task has been switched out once
        softlockup: remove timestamp checking from hung_task
        softlockup: convert read_lock in hung_task to rcu_read_lock
        softlockup: check all tasks in hung_task
        softlockup: remove unused definition for spawn_softlockup_task
        softlockup: fix potential race in hung_task when resetting timeout
        softlockup: fix to allow compiling with !DETECT_HUNG_TASK
        softlockup: decouple hung tasks check from softlockup detection
      1551260d
    • Linus Torvalds's avatar
      Merge branch 'tracing-fixes-for-linus' of... · c93f216b
      Linus Torvalds authored
      Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y
        branch tracer: Fix for enabling branch profiling makes sparse unusable
        ftrace: Correct a text align for event format output
        Update /debug/tracing/README
        tracing/ftrace: alloc the started cpumask for the trace file
        tracing, x86: remove duplicated #include
        ftrace: Add check of sched_stopped for probe_sched_wakeup
        function-graph: add proper initialization for init task
        tracing/ftrace: fix missing include string.h
        tracing: fix incorrect return type of ns2usecs()
        tracing: remove CALLER_ADDR2 from wakeup tracer
        blktrace: fix pdu_len when tracing packet command requests
        blktrace: small cleanup in blk_msg_write()
        blktrace: NUL-terminate user space messages
        tracing: move scripts/trace/power.pl to scripts/tracing/power.pl
      c93f216b
    • Linus Torvalds's avatar
      Merge branch 'irq/threaded' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · c61b79b6
      Linus Torvalds authored
      * 'irq/threaded' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: fix devres.o build for GENERIC_HARDIRQS=n
        genirq: provide old request_irq() for CONFIG_GENERIC_HARDIRQ=n
        genirq: threaded irq handlers review fixups
        genirq: add support for threaded interrupts to devres
        genirq: add threaded interrupt handler support
      c61b79b6
    • Trond Myklebust's avatar
      NFS: Fix the return value in nfs_page_mkwrite() · 2b2ec755
      Trond Myklebust authored
      Commit c2ec175c
      
       ("mm: page_mkwrite
      change prototype to match fault") exposed a bug in the NFS
      implementation of page_mkwrite.  We should be returning 0 on success...
      
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2b2ec755
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 8e2c4f28
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
        PCI: pci_slot: grab refcount on slot's bus
        PCI Hotplug: acpiphp: grab refcount on p2p subordinate bus
        PCI: allow PCI core hotplug to remove PCI root bus
        PCI: Fix oops in pci_vpd_truncate
        PCI: don't corrupt enable_cnt when doing manual resource alignment
        PCI: annotate pci_rescan_bus as __ref, not __devinit
        PCI-IOV: fix missing kernel-doc
        PCI: Setup disabled bridges even if buses are added
        PCI: SR-IOV quirk for Intel 82576 NIC
      8e2c4f28
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 6a5d2638
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        loop: mutex already unlocked in loop_clr_fd()
        cfq-iosched: don't let idling interfere with plugging
        block: remove unused REQ_UNPLUG
        cfq-iosched: kill two unused cfqq flags
        cfq-iosched: change dispatch logic to deal with single requests at the time
        mflash: initial support
        cciss: change to discover first memory BAR
        cciss: kernel scan thread for MSA2012
        cciss: fix residual count for block pc requests
        block: fix inconsistency in I/O stat accounting code
        block: elevator quiescing helpers
      6a5d2638
    • Linus Torvalds's avatar
      Fix build errors due to CONFIG_BRANCH_TRACER=y · aeeae868
      Linus Torvalds authored
      
      
      The code that enables branch tracing for all (non-constant) branches
      plays games with the preprocessor and #define's the C 'if ()' construct
      to do tracing.
      
      That's all fine, but it fails for some unusual but valid C code that is
      sometimes used in macros, notably by the intel-iommu code:
      
      	if (i=drhd->iommu, drhd->ignored) ..
      
      because now the preprocessor complains about multiple arguments to the
      'if' macro.
      
      So make the macro expansion of this particularly horrid trick use
      varargs, and handle the case of comma-expressions in if-statements.  Use
      another macro to do it cleanly in just one place.
      
      This replaces a patch by David (and acked by Steven) that did this all
      inside that one already-too-horrid macro.
      
      Tested-by: default avatarIngo Molnar <mingo@elte.hu>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      aeeae868
  3. Apr 07, 2009