From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Dec 2009 20:23:29 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap
X-Git-Tag: v2.6.33-rc1~320
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=aad3bf04dca5a2147a8406f7aef5703ee5259a52;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap

* git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap:
  Add missing alignment check in arch/score sys_mmap()
  fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh
  Get rid of open-coding in ia64_brk()
  sparc_brk() is not needed anymore
  switch do_brk() to get_unmapped_area()
  Take arch_mmap_check() into get_unmapped_area()
  fix a struct file leak in do_mmap_pgoff()
  Unify sys_mmap*
  Cut hugetlb case early for 32bit on ia64
  arch_mmap_check() on mn10300
  Kill ancient crap in s390 compat mmap
  arm: add arch_mmap_check(), get rid of sys_arm_mremap()
  file ->get_unmapped_area() shouldn't duplicate work of get_unmapped_area()
  kill useless checks in sparc mremap variants
  fix pgoff in "have to relocate" case of mremap()
  fix the arch checks in MREMAP_FIXED case
  fix checks for expand-in-place mremap
  do_mremap() untangling, part 3
  do_mremap() untangling, part 2
  untangling do_mremap(), part 1
---

aad3bf04dca5a2147a8406f7aef5703ee5259a52