Skip to content
  1. Jul 25, 2009
  2. Jul 23, 2009
    • Linus Torvalds's avatar
      Linux 2.6.31-rc4 · 4be3bd78
      Linus Torvalds authored
      4be3bd78
    • Linus Torvalds's avatar
      Merge branch 'irq-fixes-for-linus' of... · b600ffae
      Linus Torvalds authored
      Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Fix UP compile failure caused by irq_thread_check_affinity
      b600ffae
    • Linus Torvalds's avatar
      Merge branch 'lockdep-for-linus' of... · 81cbf6d0
      Linus Torvalds authored
      Merge branch 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep
      
      * 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
        lockdep: Fix lockdep annotation for pipe_double_lock()
      81cbf6d0
    • Bruno Premont's avatar
      genirq: Fix UP compile failure caused by irq_thread_check_affinity · 61f38261
      Bruno Premont authored
      Since genirq: Delegate irq affinity setting to the irq thread
      (591d2fb0
      
      ) compilation with
      CONFIG_SMP=n fails with following error:
      
      /usr/src/linux-2.6/kernel/irq/manage.c:
         In function 'irq_thread_check_affinity':
      /usr/src/linux-2.6/kernel/irq/manage.c:475:
         error: 'struct irq_desc' has no member named 'affinity'
      make[4]: *** [kernel/irq/manage.o] Error 1
      
      That commit adds a new function irq_thread_check_affinity() which
      uses struct irq_desc.affinity which is only available for CONFIG_SMP=y.
      Move that function under #ifdef CONFIG_SMP.
      
      [ tglx@brownpaperbag: compile and boot tested on UP and SMP ]
      
      Signed-off-by: default avatarBruno Premont <bonbons@linux-vserver.org>
      LKML-Reference: <20090722222232.2eb3e1c4@neptune.home>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      61f38261
    • Peter Zijlstra's avatar
      lockdep: Fix lockdep annotation for pipe_double_lock() · 023d43c7
      Peter Zijlstra authored
      
      
      The presumed use of the pipe_double_lock() routine is to lock 2 locks in
      a deadlock free way by ordering the locks by their address. However it
      fails to keep the specified lock classes in order and explicitly
      annotates a deadlock.
      
      Rectify this.
      
      Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Acked-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      LKML-Reference: <1248163763.15751.11098.camel@twins>
      023d43c7
    • Linus Torvalds's avatar
      Merge branch 'perf-counters-for-linus' of... · 3c330108
      Linus Torvalds authored
      Merge branch 'perf-counters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf
      
      * 'perf-counters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf: (31 commits)
        perf_counter tools: Give perf top inherit option
        perf_counter tools: Fix vmlinux symbol generation breakage
        perf_counter: Detect debugfs location
        perf_counter: Add tracepoint support to perf list, perf stat
        perf symbol: C++ demangling
        perf: avoid structure size confusion by using a fixed size
        perf_counter: Fix throttle/unthrottle event logging
        perf_counter: Improve perf stat and perf record option parsing
        perf_counter: PERF_SAMPLE_ID and inherited counters
        perf_counter: Plug more stack leaks
        perf: Fix stack data leak
        perf_counter: Remove unused variables
        perf_counter: Make call graph option consistent
        perf_counter: Add perf record option to log addresses
        perf_counter: Log vfork as a fork event
        perf_counter: Synthesize VDSO mmap event
        perf_counter: Make sure we dont leak kernel memory to userspace
        perf_counter tools: Fix index boundary check
        perf_counter: Fix the tracepoint channel to perfcounters
        perf_counter, x86: Extend perf_counter Pentium M support
        ...
      3c330108
    • Linus Torvalds's avatar
      Merge branch 'core-fixes-for-linus-2' of... · 612e900c
      Linus Torvalds authored
      Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        softirq: introduce tasklet_hrtimer infrastructure
      612e900c