1. 07 Sep, 2010 6 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 6300d6d7
      Linus Torvalds authored
      * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: Do not force 1024x768 modes on unknown connectors
        drm/kms: Add a module parameter to disable polling
        drm/radeon/kms: fix tv-out on avivo asics
        drm/radeon/kms/evergreen: fix gpu hangs in userspace accel code
        drm/nv50: initialize ramht_refs list for faked 0 channel
        drm/nouveau: Don't take struct_mutex around the pushbuf IOCTL.
        drm/nouveau: Take fence spinlock before reading the last sequence.
        drm/radeon/kms/evergreen: work around bad data in some i2c tables
        drm/radeon/kms: properly set crtc high base on r7xx
        drm/radeon/kms: fix tv module parameter
        drm/radeon/kms: force legacy pll algo for RV515 LVDS
        drm/radeon/kms: remove useless clock code
        drm/radeon/kms: fix a regression on r7xx AGP due to the HDP flush fix
        drm/radeon/kms: use tracked values for sclk and mclk
      6300d6d7
    • Greg Ungerer's avatar
      m68knommu: fix missing linker segments · e6ba59bc
      Greg Ungerer authored
      Recent changes to linker segments that hold per-cpu data broke linking
      for m68knommu targets:
      
        LD      vmlinux
      /usr/local/bin/m68k-uclinux-ld.real: error: no memory region specified for loadable section `.data..shared_aligned'
      
      Add missing segments into the m68knommu linker script.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e6ba59bc
    • David Howells's avatar
      h8300: Fix missing consts in kernel_execve() · 1e72910e
      David Howells authored
      Fix missing consts in h8300's kernel_execve():
      
        arch/h8300/kernel/sys_h8300.c: In function 'kernel_execve':
        arch/h8300/kernel/sys_h8300.c:59: warning: initialization from incompatible pointer type
        arch/h8300/kernel/sys_h8300.c:60: warning: initialization from incompatible pointer type
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1e72910e
    • David Howells's avatar
      h8300: Fix die() · b857189d
      David Howells authored
      Fix h8300's die() to take care of a number of problems:
      
          CC      arch/h8300/kernel/traps.o
        In file included from arch/h8300/include/asm/bitops.h:10,
                         from include/linux/bitops.h:22,
                         from include/linux/kernel.h:17,
                         from include/linux/sched.h:54,
                         from arch/h8300/kernel/traps.c:18:
        arch/h8300/include/asm/system.h:136: warning: 'struct pt_regs' declared inside parameter list
        arch/h8300/include/asm/system.h:136: warning: its scope is only this definition or declaration, which is probably not what you want
        arch/h8300/kernel/traps.c:100: error: conflicting types for 'die'
        arch/h8300/include/asm/system.h:136: error: previous declaration of 'die' was here
        make[2]: *** [arch/h8300/kernel/traps.o] Error 1
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b857189d
    • David Howells's avatar
      h8300: IRQ flags should be stored in an unsigned long · 3ab61eb9
      David Howells authored
      Fix h8300's asm/atomic.h to store the IRQ flags in an unsigned long to deal
      with warnings of the following type:
      
        arch/h8300/include/asm/atomic.h: In function 'atomic_add_return':
        arch/h8300/include/asm/atomic.h:22: warning: comparison of distinct pointer types lacks a cast
        arch/h8300/include/asm/atomic.h:24: warning: comparison of distinct pointer types lacks a cast
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3ab61eb9
    • Valerie Aurora's avatar
      VFS: Sanity check mount flags passed to change_mnt_propagation() · 7a2e8a8f
      Valerie Aurora authored
      Sanity check the flags passed to change_mnt_propagation().  Exactly
      one flag should be set.  Return EINVAL otherwise.
      
      Userspace can pass in arbitrary combinations of MS_* flags to mount().
      do_change_type() is called if any of MS_SHARED, MS_PRIVATE, MS_SLAVE,
      or MS_UNBINDABLE is set.  do_change_type() clears MS_REC and then
      calls change_mnt_propagation() with the rest of the user-supplied
      flags.  change_mnt_propagation() clearly assumes only one flag is set
      but do_change_type() does not check that this is true.  For example,
      mount() with flags MS_SHARED | MS_RDONLY does not actually make the
      mount shared or read-only but does clear MNT_UNBINDABLE.
      Signed-off-by: default avatarValerie Aurora <vaurora@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7a2e8a8f
  2. 06 Sep, 2010 4 commits
  3. 03 Sep, 2010 1 commit
  4. 02 Sep, 2010 8 commits
  5. 29 Aug, 2010 5 commits
  6. 28 Aug, 2010 16 commits