diff options
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/include/asm/mman.h | 20 | ||||
-rw-r--r-- | arch/cris/mm/init.c | 2 |
2 files changed, 2 insertions, 20 deletions
diff --git a/arch/cris/include/asm/mman.h b/arch/cris/include/asm/mman.h index b7f0afba3ce0..8eebf89f5ab1 100644 --- a/arch/cris/include/asm/mman.h +++ b/arch/cris/include/asm/mman.h | |||
@@ -1,19 +1 @@ | |||
1 | #ifndef __CRIS_MMAN_H__ | #include <asm-generic/mman.h> | |
2 | #define __CRIS_MMAN_H__ | ||
3 | |||
4 | /* verbatim copy of asm-i386/ version */ | ||
5 | |||
6 | #include <asm-generic/mman-common.h> | ||
7 | |||
8 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | ||
9 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | ||
10 | #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ | ||
11 | #define MAP_LOCKED 0x2000 /* pages are locked */ | ||
12 | #define MAP_NORESERVE 0x4000 /* don't check for reservations */ | ||
13 | #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ | ||
14 | #define MAP_NONBLOCK 0x10000 /* do not block on IO */ | ||
15 | |||
16 | #define MCL_CURRENT 1 /* lock all current mappings */ | ||
17 | #define MCL_FUTURE 2 /* lock all future mappings */ | ||
18 | |||
19 | #endif /* __CRIS_MMAN_H__ */ | ||
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c index 514f46a4b230..ff68b9f516a1 100644 --- a/arch/cris/mm/init.c +++ b/arch/cris/mm/init.c | |||
@@ -54,7 +54,7 @@ mem_init(void) | |||
54 | printk(KERN_INFO | 54 | printk(KERN_INFO |
55 | "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, " | 55 | "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, " |
56 | "%dk init)\n" , | 56 | "%dk init)\n" , |
57 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 57 | nr_free_pages() << (PAGE_SHIFT-10), |
58 | max_mapnr << (PAGE_SHIFT-10), | 58 | max_mapnr << (PAGE_SHIFT-10), |
59 | codesize >> 10, | 59 | codesize >> 10, |
60 | reservedpages << (PAGE_SHIFT-10), | 60 | reservedpages << (PAGE_SHIFT-10), |