Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164486
b: refs/heads/master
c: 6e17b17
h: refs/heads/master
v: v3
  • Loading branch information
Arnd Bergmann authored and Linus Torvalds committed Sep 22, 2009
1 parent 651629e commit 370c763
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 195 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 94bf5ceac095c7d4cb5e4d40fa7e2dd81d722b75
refs/heads/master: 6e17b17f1fc7b2f24383a693d63550d9e1460081
20 changes: 1 addition & 19 deletions trunk/arch/arm/include/asm/mman.h
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
#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>
20 changes: 1 addition & 19 deletions trunk/arch/avr32/include/asm/mman.h
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
#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>
22 changes: 1 addition & 21 deletions trunk/arch/cris/include/asm/mman.h
Original file line number Diff line number Diff line change
@@ -1,21 +1 @@
#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>
21 changes: 1 addition & 20 deletions trunk/arch/frv/include/asm/mman.h
Original file line number Diff line number Diff line change
@@ -1,20 +1 @@
#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>
20 changes: 1 addition & 19 deletions trunk/arch/h8300/include/asm/mman.h
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
#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>
16 changes: 2 additions & 14 deletions trunk/arch/ia64/include/asm/mman.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,9 @@
* 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 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 */
#define MAP_GROWSUP 0x0200 /* register stack-like segment */

#ifdef __KERNEL__
#ifndef __ASSEMBLY__
Expand Down
20 changes: 1 addition & 19 deletions trunk/arch/m32r/include/asm/mman.h
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
#ifndef __M32R_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__ */
#include <asm-generic/mman.h>
20 changes: 1 addition & 19 deletions trunk/arch/m68k/include/asm/mman.h
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
#ifndef __M68K_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__ */
#include <asm-generic/mman.h>
31 changes: 1 addition & 30 deletions trunk/arch/mn10300/include/asm/mman.h
Original file line number Diff line number Diff line change
@@ -1,30 +1 @@
/* MN10300 Constants for mmap and co.
*
* 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 */
#include <asm-generic/mman.h>
15 changes: 1 addition & 14 deletions trunk/arch/s390/include/asm/mman.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,7 @@
#ifndef __S390_MMAN_H__
#define __S390_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 */
#include <asm-generic/mman.h>

#if defined(__KERNEL__) && !defined(__ASSEMBLY__) && defined(CONFIG_64BIT)
int s390_mmap_check(unsigned long addr, unsigned long len);
Expand Down

0 comments on commit 370c763

Please sign in to comment.