Skip to content
  1. Aug 03, 2010
  2. Aug 02, 2010
  3. Jul 31, 2010
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · a63ecd83
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        cyber2000fb: fix console in truecolor modes
        cyber2000fb: fix machine hang on module load
        SA1111: Eliminate use after free
        ARM: Fix Versatile/Realview/VExpress MMC card detection sense
        ARM: 6279/1: highmem: fix SMP preemption bug in kmap_high_l1_vipt
        ARM: Add barriers to io{read,write}{8,16,32} accessors as well
        ARM: 6273/1: Add barriers to the I/O accessors if ARM_DMA_MEM_BUFFERABLE
        ARM: 6272/1: Convert L2x0 to use the IO relaxed operations
        ARM: 6271/1: Introduce *_relaxed() I/O accessors
        ARM: 6275/1: ux500: don't use writeb() in uncompress.h
        ARM: 6270/1: clean files in arch/arm/boot/compressed/
        ARM: Fix csum_partial_copy_from_user()
      a63ecd83
    • Linus Torvalds's avatar
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · fc71ff8a
      Linus Torvalds authored
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFS: Ensure that writepage respects the nonblock flag
        NFS: kswapd must not block in nfs_release_page
        nfs: include space for the NUL in root path
      fc71ff8a
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 1cf66e16
      Linus Torvalds authored
      * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/edid: Fix the HDTV hack sync adjustment
        drm/radeon/kms: fix radeon mid power profile reporting
      1cf66e16
    • Hugh Dickins's avatar
      mm: fix ia64 crash when gcore reads gate area · de51257a
      Hugh Dickins authored
      Debian's ia64 autobuilders have been seeing kernel freeze or reboot
      when running the gdb testsuite (Debian bug 588574): dannf bisected to
      2.6.32 62eede62
      
       "mm: ZERO_PAGE without
      PTE_SPECIAL"; and reproduced it with gdb's gcore on a simple target.
      
      I'd missed updating the gate_vma handling in __get_user_pages(): that
      happens to use vm_normal_page() (nowadays failing on the zero page),
      yet reported success even when it failed to get a page - boom when
      access_process_vm() tried to copy that to its intermediate buffer.
      
      Fix this, resisting cleanups: in particular, leave it for now reporting
      success when not asked to get any pages - very probably safe to change,
      but let's not risk it without testing exposure.
      
      Why did ia64 crash with 16kB pages, but succeed with 64kB pages?
      Because setup_gate() pads each 64kB of its gate area with zero pages.
      
      Reported-by: default avatarAndreas Barth <aba@not.so.argh.org>
      Bisected-by: default avatardann frazier <dannf@debian.org>
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Tested-by: default avatardann frazier <dannf@dannf.org>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      de51257a