| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20090427143737.079735707@arndb.de> Date: Mon, 27 Apr 2009 10:42:17 -0400 From: <arnd@...db.de> To: unlisted-recipients:; (no To-header on input) >From arnd@...db.de Mon Apr 27 16:28:40 2009 References: <20090427142010.587518220@...db.de> User-Agent: quilt/0.46-1 Date: Mon, 27 Apr 2009 16:20:13 +0200 From: arnd@...db.de To: linux-kernel@...r.kernel.org Cc: john.williams@...alogix.com, monstr@...str.eu, linux-api@...r.kernel.org, linux-arch@...r.kernel.org, liqin.chen@...plusct.com, Sam Ravnborg <sam@...nborg.org>, Remis Lima Baima <remis.developer@...glemail.com> Subject: [RFC 03/17] asm-generic: rename mman.h to mman-common.h Content-Disposition: inline; filename=0018-asm-generic-make-generic-mman.h-header-generic.patch X-Provags-ID: V01U2FsdGVkX18Xnuysx4P/H1PKB8mb4S4lLJMdyLe5LlF6OUh uTtfXAZra+pmP0gOZM6rzVh4tacTrkmdtFLejvlgSM/Qgihyd6 qGAlBbr5jRJrP5qkXAUFA== The existing asm-generic/mman.h is incomplete and included by some architectures. New architectures should be able to use a generic version, so rename the existing file and change all users, which lets us add the new file. Signed-off-by: Arnd Bergmann <arnd@...db.de> Signed-off-by: Remis Lima Baima <remis.developer@...glemail.com> --- arch/arm/include/asm/mman.h | 2 1 + 1 - 0 ! arch/avr32/include/asm/mman.h | 2 1 + 1 - 0 ! arch/cris/include/asm/mman.h | 2 1 + 1 - 0 ! arch/frv/include/asm/mman.h | 2 1 + 1 - 0 ! arch/h8300/include/asm/mman.h | 2 1 + 1 - 0 ! arch/ia64/include/asm/mman.h | 2 1 + 1 - 0 ! arch/m32r/include/asm/mman.h | 2 1 + 1 - 0 ! arch/m68k/include/asm/mman.h | 2 1 + 1 - 0 ! arch/mn10300/include/asm/mman.h | 2 1 + 1 - 0 ! arch/powerpc/include/asm/mman.h | 2 1 + 1 - 0 ! arch/s390/include/asm/mman.h | 2 1 + 1 - 0 ! arch/sh/include/asm/mman.h | 2 1 + 1 - 0 ! arch/sparc/include/asm/mman.h | 2 1 + 1 - 0 ! arch/x86/include/asm/mman.h | 2 1 + 1 - 0 ! include/asm-generic/Kbuild | 2 1 + 1 - 0 ! include/asm-generic/mman-common.h | 41 41 + 0 - 0 ! include/asm-generic/mman.h | 41 0 + 41 - 0 ! 17 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 include/asm-generic/mman-common.h Index: linux-2.6/arch/arm/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/arm/include/asm/mman.h +++ linux-2.6/arch/arm/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef __ARM_MMAN_H__ #define __ARM_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/arch/avr32/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/avr32/include/asm/mman.h +++ linux-2.6/arch/avr32/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef __ASM_AVR32_MMAN_H__ #define __ASM_AVR32_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/arch/cris/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/cris/include/asm/mman.h +++ linux-2.6/arch/cris/include/asm/mman.h @@ -3,7 +3,7 @@ /* verbatim copy of asm-i386/ version */ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/arch/frv/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/frv/include/asm/mman.h +++ linux-2.6/arch/frv/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef __ASM_MMAN_H__ #define __ASM_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/arch/h8300/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/h8300/include/asm/mman.h +++ linux-2.6/arch/h8300/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef __H8300_MMAN_H__ #define __H8300_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/arch/ia64/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/ia64/include/asm/mman.h +++ linux-2.6/arch/ia64/include/asm/mman.h @@ -8,7 +8,7 @@ * David Mosberger-Tang <davidm@....hp.com>, Hewlett-Packard Co */ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x00100 /* stack-like segment */ #define MAP_GROWSUP 0x00200 /* register stack-like segment */ Index: linux-2.6/arch/m68k/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/m68k/include/asm/mman.h +++ linux-2.6/arch/m68k/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef __M68K_MMAN_H__ #define __M68K_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/arch/mn10300/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/mn10300/include/asm/mman.h +++ linux-2.6/arch/mn10300/include/asm/mman.h @@ -12,7 +12,7 @@ #ifndef _ASM_MMAN_H #define _ASM_MMAN_H -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/arch/powerpc/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/powerpc/include/asm/mman.h +++ linux-2.6/arch/powerpc/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef _ASM_POWERPC_MMAN_H #define _ASM_POWERPC_MMAN_H -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> /* * This program is free software; you can redistribute it and/or Index: linux-2.6/arch/s390/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/s390/include/asm/mman.h +++ linux-2.6/arch/s390/include/asm/mman.h @@ -9,7 +9,7 @@ #ifndef __S390_MMAN_H__ #define __S390_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/arch/sh/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/sh/include/asm/mman.h +++ linux-2.6/arch/sh/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef __ASM_SH_MMAN_H #define __ASM_SH_MMAN_H -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/arch/sparc/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/sparc/include/asm/mman.h +++ linux-2.6/arch/sparc/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef __SPARC_MMAN_H__ #define __SPARC_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> /* SunOS'ified... */ Index: linux-2.6/arch/x86/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/x86/include/asm/mman.h +++ linux-2.6/arch/x86/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef _ASM_X86_MMAN_H #define _ASM_X86_MMAN_H -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_32BIT 0x40 /* only give out 32bit addresses */ Index: linux-2.6/include/asm-generic/mman-common.h =================================================================== --- /dev/null +++ linux-2.6/include/asm-generic/mman-common.h @@ -0,0 +1,41 @@ +#ifndef __ASM_GENERIC_MMAN_COMMON_H +#define __ASM_GENERIC_MMAN_COMMON_H + +/* + Author: Michael S. Tsirkin <mst@...lanox.co.il>, Mellanox Technologies Ltd. + Based on: asm-xxx/mman.h +*/ + +#define PROT_READ 0x1 /* page can be read */ +#define PROT_WRITE 0x2 /* page can be written */ +#define PROT_EXEC 0x4 /* page can be executed */ +#define PROT_SEM 0x8 /* page may be used for atomic ops */ +#define PROT_NONE 0x0 /* page can not be accessed */ +#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */ +#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */ + +#define MAP_SHARED 0x01 /* Share changes */ +#define MAP_PRIVATE 0x02 /* Changes are private */ +#define MAP_TYPE 0x0f /* Mask for type of mapping */ +#define MAP_FIXED 0x10 /* Interpret addr exactly */ +#define MAP_ANONYMOUS 0x20 /* don't use a file */ + +#define MS_ASYNC 1 /* sync memory asynchronously */ +#define MS_INVALIDATE 2 /* invalidate the caches */ +#define MS_SYNC 4 /* synchronous memory sync */ + +#define MADV_NORMAL 0 /* no further special treatment */ +#define MADV_RANDOM 1 /* expect random page references */ +#define MADV_SEQUENTIAL 2 /* expect sequential page references */ +#define MADV_WILLNEED 3 /* will need these pages */ +#define MADV_DONTNEED 4 /* don't need these pages */ + +/* common parameters: try to keep these consistent across architectures */ +#define MADV_REMOVE 9 /* remove these pages & resources */ +#define MADV_DONTFORK 10 /* don't inherit across fork */ +#define MADV_DOFORK 11 /* do inherit across fork */ + +/* compatibility flags */ +#define MAP_FILE 0 + +#endif /* __ASM_GENERIC_MMAN_COMMON_H */ Index: linux-2.6/include/asm-generic/mman.h =================================================================== --- linux-2.6.orig/include/asm-generic/mman.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef _ASM_GENERIC_MMAN_H -#define _ASM_GENERIC_MMAN_H - -/* - Author: Michael S. Tsirkin <mst@...lanox.co.il>, Mellanox Technologies Ltd. - Based on: asm-xxx/mman.h -*/ - -#define PROT_READ 0x1 /* page can be read */ -#define PROT_WRITE 0x2 /* page can be written */ -#define PROT_EXEC 0x4 /* page can be executed */ -#define PROT_SEM 0x8 /* page may be used for atomic ops */ -#define PROT_NONE 0x0 /* page can not be accessed */ -#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */ -#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */ - -#define MAP_SHARED 0x01 /* Share changes */ -#define MAP_PRIVATE 0x02 /* Changes are private */ -#define MAP_TYPE 0x0f /* Mask for type of mapping */ -#define MAP_FIXED 0x10 /* Interpret addr exactly */ -#define MAP_ANONYMOUS 0x20 /* don't use a file */ - -#define MS_ASYNC 1 /* sync memory asynchronously */ -#define MS_INVALIDATE 2 /* invalidate the caches */ -#define MS_SYNC 4 /* synchronous memory sync */ - -#define MADV_NORMAL 0 /* no further special treatment */ -#define MADV_RANDOM 1 /* expect random page references */ -#define MADV_SEQUENTIAL 2 /* expect sequential page references */ -#define MADV_WILLNEED 3 /* will need these pages */ -#define MADV_DONTNEED 4 /* don't need these pages */ - -/* common parameters: try to keep these consistent across architectures */ -#define MADV_REMOVE 9 /* remove these pages & resources */ -#define MADV_DONTFORK 10 /* don't inherit across fork */ -#define MADV_DOFORK 11 /* do inherit across fork */ - -/* compatibility flags */ -#define MAP_FILE 0 - -#endif Index: linux-2.6/arch/m32r/include/asm/mman.h =================================================================== --- linux-2.6.orig/arch/m32r/include/asm/mman.h +++ linux-2.6/arch/m32r/include/asm/mman.h @@ -1,7 +1,7 @@ #ifndef __M32R_MMAN_H__ #define __M32R_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ Index: linux-2.6/include/asm-generic/Kbuild =================================================================== --- linux-2.6.orig/include/asm-generic/Kbuild +++ linux-2.6/include/asm-generic/Kbuild @@ -2,7 +2,7 @@ header-y += errno-base.h header-y += errno.h header-y += fcntl.h header-y += ioctl.h -header-y += mman.h +header-y += mman-common.h header-y += poll.h header-y += signal-defs.h header-y += statfs.h -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists