Commit 4a5675820436e4ad738dd442c1cc8a165101509b
Committed by
Linus Torvalds
Linus Torvalds
1 parent
4c182ae781
Exists in
master
and in
7 other branches
arch/um/kernel/mem.c: remove arch_validate()
- Remove arch_validate(), because no one uses it. - Remove useless macro HAVE_ARCH_VALIDATE. - Make the variable 'empty_bad_page' static. Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: WANG Cong <wangcong@zeuux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 3 changed files with 1 additions and 36 deletions Side-by-side Diff
arch/um/kernel/ksyms.c
arch/um/kernel/mem.c
| ... | ... | @@ -21,7 +21,7 @@ |
| 21 | 21 | /* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */ |
| 22 | 22 | unsigned long *empty_zero_page = NULL; |
| 23 | 23 | /* allocated in paging_init and unchanged thereafter */ |
| 24 | -unsigned long *empty_bad_page = NULL; | |
| 24 | +static unsigned long *empty_bad_page = NULL; | |
| 25 | 25 | |
| 26 | 26 | /* |
| 27 | 27 | * Initialized during boot, and readonly for initializing page tables |
| ... | ... | @@ -238,37 +238,6 @@ |
| 238 | 238 | #ifdef CONFIG_HIGHMEM |
| 239 | 239 | init_highmem(); |
| 240 | 240 | #endif |
| 241 | -} | |
| 242 | - | |
| 243 | -struct page *arch_validate(struct page *page, gfp_t mask, int order) | |
| 244 | -{ | |
| 245 | - unsigned long addr, zero = 0; | |
| 246 | - int i; | |
| 247 | - | |
| 248 | - again: | |
| 249 | - if (page == NULL) | |
| 250 | - return page; | |
| 251 | - if (PageHighMem(page)) | |
| 252 | - return page; | |
| 253 | - | |
| 254 | - addr = (unsigned long) page_address(page); | |
| 255 | - for (i = 0; i < (1 << order); i++) { | |
| 256 | - current->thread.fault_addr = (void *) addr; | |
| 257 | - if (__do_copy_to_user((void __user *) addr, &zero, | |
| 258 | - sizeof(zero), | |
| 259 | - ¤t->thread.fault_addr, | |
| 260 | - ¤t->thread.fault_catcher)) { | |
| 261 | - if (!(mask & __GFP_WAIT)) | |
| 262 | - return NULL; | |
| 263 | - else break; | |
| 264 | - } | |
| 265 | - addr += PAGE_SIZE; | |
| 266 | - } | |
| 267 | - | |
| 268 | - if (i == (1 << order)) | |
| 269 | - return page; | |
| 270 | - page = alloc_pages(mask, order); | |
| 271 | - goto again; | |
| 272 | 241 | } |
| 273 | 242 | |
| 274 | 243 | /* |
include/asm-um/page.h
| ... | ... | @@ -115,9 +115,6 @@ |
| 115 | 115 | #define pfn_valid(pfn) ((pfn) < max_mapnr) |
| 116 | 116 | #define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v))) |
| 117 | 117 | |
| 118 | -extern struct page *arch_validate(struct page *page, gfp_t mask, int order); | |
| 119 | -#define HAVE_ARCH_VALIDATE | |
| 120 | - | |
| 121 | 118 | #include <asm-generic/memory_model.h> |
| 122 | 119 | #include <asm-generic/page.h> |
| 123 | 120 |