diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-12-04 22:48:30 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-12-04 22:48:30 +0100 |
| commit | fc284d631894d8673d229fad92762b66c9875cab (patch) | |
| tree | 7b530667b9f7c5c4899c024abda518283abf80b4 /arch/parisc/include/uapi/asm/mman.h | |
| parent | 444f9e99a840c4050c0530cfef81801a21a59f4c (diff) | |
| parent | e0224418516b4d8a6c2160574bac18447c354ef0 (diff) | |
| download | kernel_replicant_linux-fc284d631894d8673d229fad92762b66c9875cab.tar.gz kernel_replicant_linux-fc284d631894d8673d229fad92762b66c9875cab.tar.bz2 kernel_replicant_linux-fc284d631894d8673d229fad92762b66c9875cab.zip | |
Merge branch 'from-rusty/modules-next' into for-4.5/core
As agreed with Rusty, we're taking a current module-next pile through
livepatching.git, as it contains solely patches that are pre-requisity
for module page protection cleanups in livepatching. Rusty will be
restarting module-next from scratch.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'arch/parisc/include/uapi/asm/mman.h')
| -rw-r--r-- | arch/parisc/include/uapi/asm/mman.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h index ecc3ae1ca28e..dd4d1876a020 100644 --- a/arch/parisc/include/uapi/asm/mman.h +++ b/arch/parisc/include/uapi/asm/mman.h @@ -49,16 +49,6 @@ #define MADV_DONTFORK 10 /* don't inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */ -/* The range 12-64 is reserved for page size specification. */ -#define MADV_4K_PAGES 12 /* Use 4K pages */ -#define MADV_16K_PAGES 14 /* Use 16K pages */ -#define MADV_64K_PAGES 16 /* Use 64K pages */ -#define MADV_256K_PAGES 18 /* Use 256K pages */ -#define MADV_1M_PAGES 20 /* Use 1 Megabyte pages */ -#define MADV_4M_PAGES 22 /* Use 4 Megabyte pages */ -#define MADV_16M_PAGES 24 /* Use 16 Megabyte pages */ -#define MADV_64M_PAGES 26 /* Use 64 Megabyte pages */ - #define MADV_MERGEABLE 65 /* KSM may merge identical pages */ #define MADV_UNMERGEABLE 66 /* KSM may not merge identical pages */ |