diff options
Diffstat (limited to 'arch/um/kernel')
-rw-r--r-- | arch/um/kernel/mem.c | 4 | ||||
-rw-r--r-- | arch/um/kernel/physmem.c | 2 | ||||
-rw-r--r-- | arch/um/kernel/um_arch.c | 12 |
3 files changed, 14 insertions, 4 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index fa4f915be5c5..92cce96b5e24 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
@@ -57,7 +57,7 @@ static void setup_highmem(unsigned long highmem_start, | |||
57 | for(i = 0; i < highmem_len >> PAGE_SHIFT; i++){ | 57 | for(i = 0; i < highmem_len >> PAGE_SHIFT; i++){ |
58 | page = &mem_map[highmem_pfn + i]; | 58 | page = &mem_map[highmem_pfn + i]; |
59 | ClearPageReserved(page); | 59 | ClearPageReserved(page); |
60 | set_page_count(page, 1); | 60 | init_page_count(page); |
61 | __free_page(page); | 61 | __free_page(page); |
62 | } | 62 | } |
63 | } | 63 | } |
@@ -296,7 +296,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
296 | (end - start) >> 10); | 296 | (end - start) >> 10); |
297 | for (; start < end; start += PAGE_SIZE) { | 297 | for (; start < end; start += PAGE_SIZE) { |
298 | ClearPageReserved(virt_to_page(start)); | 298 | ClearPageReserved(virt_to_page(start)); |
299 | set_page_count(virt_to_page(start), 1); | 299 | init_page_count(virt_to_page(start)); |
300 | free_page(start); | 300 | free_page(start); |
301 | totalram_pages++; | 301 | totalram_pages++; |
302 | } | 302 | } |
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index 544665e04513..0e65340eee33 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c | |||
@@ -279,7 +279,7 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem) | |||
279 | 279 | ||
280 | for(i = 0; i < total_pages; i++){ | 280 | for(i = 0; i < total_pages; i++){ |
281 | p = &map[i]; | 281 | p = &map[i]; |
282 | set_page_count(p, 0); | 282 | memset(p, 0, sizeof(struct page)); |
283 | SetPageReserved(p); | 283 | SetPageReserved(p); |
284 | INIT_LIST_HEAD(&p->lru); | 284 | INIT_LIST_HEAD(&p->lru); |
285 | } | 285 | } |
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 27cdf9164422..80c9c18aae94 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c | |||
@@ -491,6 +491,16 @@ void __init check_bugs(void) | |||
491 | check_devanon(); | 491 | check_devanon(); |
492 | } | 492 | } |
493 | 493 | ||
494 | void apply_alternatives(void *start, void *end) | 494 | void apply_alternatives(struct alt_instr *start, struct alt_instr *end) |
495 | { | ||
496 | } | ||
497 | |||
498 | void alternatives_smp_module_add(struct module *mod, char *name, | ||
499 | void *locks, void *locks_end, | ||
500 | void *text, void *text_end) | ||
501 | { | ||
502 | } | ||
503 | |||
504 | void alternatives_smp_module_del(struct module *mod) | ||
495 | { | 505 | { |
496 | } | 506 | } |