1. 06 Jul, 2009 37 commits
  2. 04 Jul, 2009 3 commits
    • Linus Torvalds's avatar
      Linux 2.6.31-rc2 · 8e4a718f
      Linus Torvalds authored
      8e4a718f
    • Paul Mundt's avatar
      video: sm501fb: Early initialization of mm_lock mutex. · f50bf2b2
      Paul Mundt authored
      Commit 537a1bf0 (fbdev: add mutex for
      fb_mmap locking) introduces a ->mm_lock mutex for protecting smem
      assignments. Unfortunately in the case of sm501fb these happen quite
      early in the initialization code, well before the mutex_init() that takes
      place in register_framebuffer(), leading to:
      
         Badness at kernel/mutex.c:207
      
         Pid : 1, Comm:          swapper
         CPU : 0                 Not tainted  (2.6.31-rc1-00284-g529ba0d9-dirty #2273)
      
         PC is at __mutex_lock_slowpath+0x72/0x1bc
         PR is at __mutex_lock_slowpath+0x66/0x1bc
         ...
      
      matroxfb appears to have the same issue and has solved it with an early
      mutex_init(), so we do the same for sm501fb.
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f50bf2b2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 · de481ba9
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: (27 commits)
        parisc: use generic atomic64 on 32-bit
        parisc: superio: fix build breakage
        parisc: Fix PCI resource allocation on non-PAT SBA machines
        parisc: perf: wire up sys_perf_counter_open
        parisc: add task_pt_regs macro
        parisc: wire sys_perf_counter_open to sys_ni_syscall
        parisc: inventory.c, fix bloated stack frame
        parisc: processor.c, fix bloated stack frame
        parisc: fix compile warning in mm/init.c
        parisc: remove dead code from sys_parisc32.c
        parisc: wire up rt_tgsigqueueinfo
        parisc: ensure broadcast tlb purge runs single threaded
        parisc: fix "delay!" timer handling
        parisc: fix mismatched parenthesis in memcpy.c
        parisc: Fix gcc 4.4 warning in lba_pci.c
        parisc: add parameter to read_cr16()
        parisc: decode_exc.c should include kernel.h
        parisc: remove obsolete hw_interrupt_type
        parisc: fix irq compile bugs in arch/parisc/kernel/irq.c
        parisc: advertise PCI devs after "assign_resources"
        ...
      
      Manually fixed up trivial conflicts in tools/perf/perf.h due to addition
      of SH vs HPPA perf-counter support.
      de481ba9