]> git.baikalelectronics.ru Git - kernel.git/commit
mm: arch: remove duplicate definitions of MADV_FREE
authorGuenter Roeck <linux@roeck-us.net>
Wed, 20 Jan 2016 22:58:15 +0000 (14:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2016 01:09:18 +0000 (17:09 -0800)
commitc443e79003bedf30fe4f00d4f6929fb79892cbd0
tree60cdc076fc7195a2153e8fec01b507575ca7dbd5
parent75d1b4a1a1bdd19e9fb03ad5c29393acc08839bd
mm: arch: remove duplicate definitions of MADV_FREE

Commits acf5b70be7f5 ("arch/*/include/uapi/asm/mman.h: : let MADV_FREE
have same value for all architectures") and 3806294f2931 ("mm: define
MADV_FREE for some arches") both defined MADV_FREE, but did not use the
same values.  This results in build errors such as

  ./arch/alpha/include/uapi/asm/mman.h:53:0: error: "MADV_FREE" redefined
  ./arch/alpha/include/uapi/asm/mman.h:50:0: note: this is the location of the previous definition

for the affected architectures.

Fixes: acf5b70be7f5 ("arch/*/include/uapi/asm/mman.h: : let MADV_FREE have same value for all architectures")
Fixes: 3806294f2931 ("mm: define MADV_FREE for some arches")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Cc: Chen Gang <gang.chen.5i5j@gmail.com>
Cc: Minchan Kim <minchan@kernel.org>
Acked-by: Helge Deller <deller@gmx.de> [parisc]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/alpha/include/uapi/asm/mman.h
arch/mips/include/uapi/asm/mman.h
arch/parisc/include/uapi/asm/mman.h
arch/xtensa/include/uapi/asm/mman.h