mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 21:38:32 +08:00
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: Arnd Bergmann <arnd@arndb.de> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Arnd Bergmann
Linus Torvalds
parent
94bf5ceac0
commit
6e17b17f1f
@ -1,19 +1 @@
|
|||||||
#ifndef __ARM_MMAN_H__
|
#include <asm-generic/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__ */
|
|
||||||
|
|||||||
@ -1,19 +1 @@
|
|||||||
#ifndef __ASM_AVR32_MMAN_H__
|
#include <asm-generic/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__ */
|
|
||||||
|
|||||||
@ -1,21 +1 @@
|
|||||||
#ifndef __CRIS_MMAN_H__
|
#include <asm-generic/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__ */
|
|
||||||
|
|||||||
@ -1,20 +1 @@
|
|||||||
#ifndef __ASM_MMAN_H__
|
#include <asm-generic/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__ */
|
|
||||||
|
|
||||||
|
|||||||
@ -1,19 +1 @@
|
|||||||
#ifndef __H8300_MMAN_H__
|
#include <asm-generic/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__ */
|
|
||||||
|
|||||||
@ -8,21 +8,9 @@
|
|||||||
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
|
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <asm-generic/mman-common.h>
|
#include <asm-generic/mman.h>
|
||||||
|
|
||||||
#define MAP_GROWSDOWN 0x00100 /* stack-like segment */
|
#define MAP_GROWSUP 0x0200 /* register stack-like segment */
|
||||||
#define MAP_GROWSUP 0x00200 /* register stack-like segment */
|
|
||||||
#define MAP_DENYWRITE 0x00800 /* ETXTBSY */
|
|
||||||
#define MAP_EXECUTABLE 0x01000 /* mark it as an executable */
|
|
||||||
#define MAP_LOCKED 0x02000 /* pages are locked */
|
|
||||||
#define MAP_NORESERVE 0x04000 /* don't check for reservations */
|
|
||||||
#define MAP_POPULATE 0x08000 /* 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 */
|
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
|||||||
@ -1,19 +1 @@
|
|||||||
#ifndef __M32R_MMAN_H__
|
#include <asm-generic/mman.h>
|
||||||
#define __M32R_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 /* __M32R_MMAN_H__ */
|
|
||||||
|
|||||||
@ -1,19 +1 @@
|
|||||||
#ifndef __M68K_MMAN_H__
|
#include <asm-generic/mman.h>
|
||||||
#define __M68K_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 /* __M68K_MMAN_H__ */
|
|
||||||
|
|||||||
@ -1,30 +1 @@
|
|||||||
/* MN10300 Constants for mmap and co.
|
#include <asm-generic/mman.h>
|
||||||
*
|
|
||||||
* Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
|
|
||||||
* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
|
|
||||||
* - Derived from asm-x86/mman.h
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public Licence
|
|
||||||
* as published by the Free Software Foundation; either version
|
|
||||||
* 2 of the Licence, or (at your option) any later version.
|
|
||||||
*/
|
|
||||||
#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 */
|
|
||||||
|
|||||||
@ -9,20 +9,7 @@
|
|||||||
#ifndef __S390_MMAN_H__
|
#ifndef __S390_MMAN_H__
|
||||||
#define __S390_MMAN_H__
|
#define __S390_MMAN_H__
|
||||||
|
|
||||||
#include <asm-generic/mman-common.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 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 */
|
|
||||||
|
|
||||||
#if defined(__KERNEL__) && !defined(__ASSEMBLY__) && defined(CONFIG_64BIT)
|
#if defined(__KERNEL__) && !defined(__ASSEMBLY__) && defined(CONFIG_64BIT)
|
||||||
int s390_mmap_check(unsigned long addr, unsigned long len);
|
int s390_mmap_check(unsigned long addr, unsigned long len);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user