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

Commit 5c8eec50 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

x86: unify include/asm/mman_32/64.h 



Same file, except for the extra 64bit MAP_32BIT define, which does not hurt
for 32 bit compiles.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c4ac82a8

include/asm-x86/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ unifdef-y += byteorder_64.h 
unifdef-y += elf_32.h

unifdef-y += elf_64.h

unifdef-y += mce.h

unifdef-y += mman_32.h

unifdef-y += mman_64.h

unifdef-y += msgbuf_32.h

unifdef-y += msgbuf_64.h

unifdef-y += msr_32.h

include/asm-x86/mman.h

+19 −13
Original line number Diff line number Diff line 
#ifdef __KERNEL__

# ifdef CONFIG_X86_32

#  include "mman_32.h"

# else

#  include "mman_64.h"

# endif

#else

# ifdef __i386__

#  include "mman_32.h"

# else

#  include "mman_64.h"

# endif

#endif
 
#ifndef _ASM_X86_MMAN_H

#define _ASM_X86_MMAN_H



#include <asm-generic/mman.h>



#define MAP_32BIT	0x40		/* only give out 32bit addresses */



#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 MCL_CURRENT	1		/* lock all current mappings */

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



#endif /* _ASM_X86_MMAN_H */

include/asm-x86/mman_32.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
#ifndef __I386_MMAN_H__

#define __I386_MMAN_H__



#include <asm-generic/mman.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 MCL_CURRENT	1		/* lock all current mappings */

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



#endif /* __I386_MMAN_H__ */

include/asm-x86/mman_64.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
#ifndef __X8664_MMAN_H__

#define __X8664_MMAN_H__



#include <asm-generic/mman.h>



#define MAP_32BIT	0x40		/* only give out 32bit addresses */



#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 MCL_CURRENT	1		/* lock all current mappings */

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



#endif