diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 08:08:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 08:08:57 -0800 |
commit | a377d181e65241344dd95aa4a42c477477be03f1 (patch) | |
tree | bb624d0d33a95c9894899a22ea3d896ede66ce1e /arch/score/mm/init.c | |
parent | 22a80593598736e33080c6877be6ae99ec091e02 (diff) | |
parent | ef8355c3a3c7a4d7f1d49881937337ea78ed306a (diff) | |
download | kernel_samsung_espresso10-a377d181e65241344dd95aa4a42c477477be03f1.tar.gz kernel_samsung_espresso10-a377d181e65241344dd95aa4a42c477477be03f1.tar.bz2 kernel_samsung_espresso10-a377d181e65241344dd95aa4a42c477477be03f1.zip |
Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score
* 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score:
score: include asm-generic/param.h in asm/delay.h.
score: fixed pfn_valid define.
score: add flush_dcahce_page and PG_dcache_dirty define
Diffstat (limited to 'arch/score/mm/init.c')
-rw-r--r-- | arch/score/mm/init.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c index 4e3dcd0c471..8c15b2c85d5 100644 --- a/arch/score/mm/init.c +++ b/arch/score/mm/init.c @@ -83,7 +83,6 @@ void __init mem_init(void) unsigned long codesize, reservedpages, datasize, initsize; unsigned long tmp, ram = 0; - max_mapnr = max_low_pfn; high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT); totalram_pages += free_all_bootmem(); totalram_pages -= setup_zero_page(); /* Setup zeroed pages. */ @@ -101,10 +100,6 @@ void __init mem_init(void) datasize = (unsigned long) &_edata - (unsigned long) &_etext; initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; - kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT); - kclist_add(&kcore_vmalloc, (void *) VMALLOC_START, - VMALLOC_END - VMALLOC_START); - printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, " "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n", (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), |