Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e17b17f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

mm: remove duplicate asm/mman.h files 



A number of architectures have identical asm/mman.h files so they can all
be merged by using the new generic file.

The remaining asm/mman.h files are substantially different from each
other.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 94bf5cea

arch/arm/include/asm/mman.h

+1 −19
Original line number Diff line number Diff line 
#ifndef __ARM_MMAN_H__

#define __ARM_MMAN_H__



#include <asm-generic/mman-common.h>



#define MAP_GROWSDOWN	0x0100		/* stack-like segment */

#define MAP_DENYWRITE	0x0800		/* ETXTBSY */

#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */

#define MAP_LOCKED	0x2000		/* pages are locked */

#define MAP_NORESERVE	0x4000		/* don't check for reservations */

#define MAP_POPULATE	0x8000		/* populate (prefault) page tables */

#define MAP_NONBLOCK	0x10000		/* do not block on IO */

#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB	0x40000		/* create a huge page mapping */



#define MCL_CURRENT	1		/* lock all current mappings */

#define MCL_FUTURE	2		/* lock all future mappings */



#endif /* __ARM_MMAN_H__ */
 
#include <asm-generic/mman.h>

arch/avr32/include/asm/mman.h

+1 −19
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_MMAN_H__

#define __ASM_AVR32_MMAN_H__



#include <asm-generic/mman-common.h>



#define MAP_GROWSDOWN	0x0100		/* stack-like segment */

#define MAP_DENYWRITE	0x0800		/* ETXTBSY */

#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */

#define MAP_LOCKED	0x2000		/* pages are locked */

#define MAP_NORESERVE	0x4000		/* don't check for reservations */

#define MAP_POPULATE	0x8000		/* populate (prefault) page tables */

#define MAP_NONBLOCK	0x10000		/* do not block on IO */

#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB	0x40000		/* create a huge page mapping */



#define MCL_CURRENT	1		/* lock all current mappings */

#define MCL_FUTURE	2		/* lock all future mappings */



#endif /* __ASM_AVR32_MMAN_H__ */
 
#include <asm-generic/mman.h>

arch/cris/include/asm/mman.h

+1 −21
Original line number Diff line number Diff line 
#ifndef __CRIS_MMAN_H__

#define __CRIS_MMAN_H__



/* verbatim copy of asm-i386/ version */



#include <asm-generic/mman-common.h>



#define MAP_GROWSDOWN	0x0100		/* stack-like segment */

#define MAP_DENYWRITE	0x0800		/* ETXTBSY */

#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */

#define MAP_LOCKED	0x2000		/* pages are locked */

#define MAP_NORESERVE	0x4000		/* don't check for reservations */

#define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */

#define MAP_NONBLOCK	0x10000		/* do not block on IO */

#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB	0x40000		/* create a huge page mapping */



#define MCL_CURRENT	1		/* lock all current mappings */

#define MCL_FUTURE	2		/* lock all future mappings */



#endif /* __CRIS_MMAN_H__ */
 
#include <asm-generic/mman.h>

arch/frv/include/asm/mman.h

+1 −20
Original line number Diff line number Diff line 
#ifndef __ASM_MMAN_H__

#define __ASM_MMAN_H__



#include <asm-generic/mman-common.h>



#define MAP_GROWSDOWN	0x0100		/* stack-like segment */

#define MAP_DENYWRITE	0x0800		/* ETXTBSY */

#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */

#define MAP_LOCKED	0x2000		/* pages are locked */

#define MAP_NORESERVE	0x4000		/* don't check for reservations */

#define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */

#define MAP_NONBLOCK	0x10000		/* do not block on IO */

#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB	0x40000		/* create a huge page mapping */



#define MCL_CURRENT	1		/* lock all current mappings */

#define MCL_FUTURE	2		/* lock all future mappings */



#endif /* __ASM_MMAN_H__ */

#include <asm-generic/mman.h>

arch/h8300/include/asm/mman.h

+1 −19
Original line number Diff line number Diff line 
#ifndef __H8300_MMAN_H__

#define __H8300_MMAN_H__



#include <asm-generic/mman-common.h>



#define MAP_GROWSDOWN	0x0100		/* stack-like segment */

#define MAP_DENYWRITE	0x0800		/* ETXTBSY */

#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */

#define MAP_LOCKED	0x2000		/* pages are locked */

#define MAP_NORESERVE	0x4000		/* don't check for reservations */

#define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */

#define MAP_NONBLOCK	0x10000		/* do not block on IO */

#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB	0x40000		/* create a huge page mapping */



#define MCL_CURRENT	1		/* lock all current mappings */

#define MCL_FUTURE	2		/* lock all future mappings */



#endif /* __H8300_MMAN_H__ */
 
#include <asm-generic/mman.h>