From: Jiang Liu <liuj97@gmail.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Jiang Liu <jiang.liu@huawei.com>, David Rientjes <rientjes@google.com>, Wen Congyang <wency@cn.fujitsu.com>, Mel Gorman <mgorman@suse.de>, Minchan Kim <minchan@kernel.org>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Michal Hocko <mhocko@suse.cz>, James Bottomley <James.Bottomley@HansenPartnership.com>, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>, David Howells <dhowells@redhat.com>, Mark Salter <msalter@redhat.com>, Jianguo Wu <wujianguo@huawei.com>, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, "James E.J. Bottomley" <jejb@parisc-linux.org>, Helge Deller <deller@gmx.de>, Thomas Gleixner <tglx@linutronix.de>, linux-parisc@vger.kernel.org Subject: [PATCH v5, part4 30/41] mm/PARISC: prepare for removing num_physpages and simplify mem_init() Date: Wed, 8 May 2013 23:51:27 +0800 [thread overview] Message-ID: <1368028298-7401-31-git-send-email-jiang.liu@huawei.com> (raw) In-Reply-To: <1368028298-7401-1-git-send-email-jiang.liu@huawei.com> Prepare for removing num_physpages and simplify mem_init(). Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Helge Deller <deller@gmx.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Michal Hocko <mhocko@suse.cz> Cc: David Rientjes <rientjes@google.com> Cc: linux-parisc@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/parisc/mm/init.c | 46 +++------------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 1fe9d841..f80c175 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -214,7 +214,6 @@ static void __init setup_bootmem(void) mem_limit_func(); /* check for "mem=" argument */ mem_max = 0; - num_physpages = 0; for (i = 0; i < npmem_ranges; i++) { unsigned long rsize; @@ -229,10 +228,8 @@ static void __init setup_bootmem(void) npmem_ranges = i + 1; mem_max = mem_limit; } - num_physpages += pmem_ranges[i].pages; break; } - num_physpages += pmem_ranges[i].pages; mem_max += rsize; } @@ -532,7 +529,7 @@ void free_initmem(void) * pages are no-longer executable */ flush_icache_range(init_begin, init_end); - num_physpages += free_initmem_default(-1); + free_initmem_default(-1); /* set up a new led state on systems shipped LED State panel */ pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE); @@ -580,8 +577,6 @@ unsigned long pcxl_dma_start __read_mostly; void __init mem_init(void) { - int codesize, reservedpages, datasize, initsize; - /* Do sanity checks on page table constants */ BUILD_BUG_ON(PTE_ENTRY_SIZE != sizeof(pte_t)); BUILD_BUG_ON(PMD_ENTRY_SIZE != sizeof(pmd_t)); @@ -603,33 +598,6 @@ void __init mem_init(void) } #endif - codesize = (unsigned long)_etext - (unsigned long)_text; - datasize = (unsigned long)_edata - (unsigned long)_etext; - initsize = (unsigned long)__init_end - (unsigned long)__init_begin; - - reservedpages = 0; -{ - unsigned long pfn; -#ifdef CONFIG_DISCONTIGMEM - int i; - - for (i = 0; i < npmem_ranges; i++) { - for (pfn = node_start_pfn(i); pfn < node_end_pfn(i); pfn++) { - if (PageReserved(pfn_to_page(pfn))) - reservedpages++; - } - } -#else /* !CONFIG_DISCONTIGMEM */ - for (pfn = 0; pfn < max_pfn; pfn++) { - /* - * Only count reserved RAM pages - */ - if (PageReserved(pfn_to_page(pfn))) - reservedpages++; - } -#endif -} - #ifdef CONFIG_PA11 if (hppa_dma_ops == &pcxl_dma_ops) { pcxl_dma_start = (unsigned long)SET_MAP_OFFSET(MAP_START); @@ -643,15 +611,7 @@ void __init mem_init(void) parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START); #endif - printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n", - nr_free_pages() << (PAGE_SHIFT-10), - num_physpages << (PAGE_SHIFT-10), - codesize >> 10, - reservedpages << (PAGE_SHIFT-10), - datasize >> 10, - initsize >> 10 - ); - + mem_init_print_info(NULL); #ifdef CONFIG_DEBUG_KERNEL /* double-sanity-check paranoia */ printk("virtual kernel memory layout:\n" " vmalloc : 0x%p - 0x%p (%4ld MB)\n" @@ -1099,6 +1059,6 @@ void flush_tlb_all(void) #ifdef CONFIG_BLK_DEV_INITRD void free_initrd_mem(unsigned long start, unsigned long end) { - num_physpages += free_reserved_area(start, end, -1, "initrd"); + free_reserved_area(start, end, -1, "initrd"); } #endif -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Jiang Liu <liuj97@gmail.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Jiang Liu <jiang.liu@huawei.com>, David Rientjes <rientjes@google.com>, Wen Congyang <wency@cn.fujitsu.com>, Mel Gorman <mgorman@suse.de>, Minchan Kim <minchan@kernel.org>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Michal Hocko <mhocko@suse.cz>, James Bottomley <James.Bottomley@HansenPartnership.com>, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>, David Howells <dhowells@redhat.com>, Mark Salter <msalter@redhat.com>, Jianguo Wu <wujianguo@huawei.com>, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, "James E.J. Bottomley" <jejb@parisc-linux.org>, Helge Deller <deller@gmx.de>, Thomas Gleixner <tglx@linutronix.de>, linux-parisc@vger.kernel.org Subject: [PATCH v5, part4 30/41] mm/PARISC: prepare for removing num_physpages and simplify mem_init() Date: Wed, 8 May 2013 23:51:27 +0800 [thread overview] Message-ID: <1368028298-7401-31-git-send-email-jiang.liu@huawei.com> (raw) In-Reply-To: <1368028298-7401-1-git-send-email-jiang.liu@huawei.com> Prepare for removing num_physpages and simplify mem_init(). Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Helge Deller <deller@gmx.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Michal Hocko <mhocko@suse.cz> Cc: David Rientjes <rientjes@google.com> Cc: linux-parisc@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/parisc/mm/init.c | 46 +++------------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 1fe9d841..f80c175 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -214,7 +214,6 @@ static void __init setup_bootmem(void) mem_limit_func(); /* check for "mem=" argument */ mem_max = 0; - num_physpages = 0; for (i = 0; i < npmem_ranges; i++) { unsigned long rsize; @@ -229,10 +228,8 @@ static void __init setup_bootmem(void) npmem_ranges = i + 1; mem_max = mem_limit; } - num_physpages += pmem_ranges[i].pages; break; } - num_physpages += pmem_ranges[i].pages; mem_max += rsize; } @@ -532,7 +529,7 @@ void free_initmem(void) * pages are no-longer executable */ flush_icache_range(init_begin, init_end); - num_physpages += free_initmem_default(-1); + free_initmem_default(-1); /* set up a new led state on systems shipped LED State panel */ pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE); @@ -580,8 +577,6 @@ unsigned long pcxl_dma_start __read_mostly; void __init mem_init(void) { - int codesize, reservedpages, datasize, initsize; - /* Do sanity checks on page table constants */ BUILD_BUG_ON(PTE_ENTRY_SIZE != sizeof(pte_t)); BUILD_BUG_ON(PMD_ENTRY_SIZE != sizeof(pmd_t)); @@ -603,33 +598,6 @@ void __init mem_init(void) } #endif - codesize = (unsigned long)_etext - (unsigned long)_text; - datasize = (unsigned long)_edata - (unsigned long)_etext; - initsize = (unsigned long)__init_end - (unsigned long)__init_begin; - - reservedpages = 0; -{ - unsigned long pfn; -#ifdef CONFIG_DISCONTIGMEM - int i; - - for (i = 0; i < npmem_ranges; i++) { - for (pfn = node_start_pfn(i); pfn < node_end_pfn(i); pfn++) { - if (PageReserved(pfn_to_page(pfn))) - reservedpages++; - } - } -#else /* !CONFIG_DISCONTIGMEM */ - for (pfn = 0; pfn < max_pfn; pfn++) { - /* - * Only count reserved RAM pages - */ - if (PageReserved(pfn_to_page(pfn))) - reservedpages++; - } -#endif -} - #ifdef CONFIG_PA11 if (hppa_dma_ops == &pcxl_dma_ops) { pcxl_dma_start = (unsigned long)SET_MAP_OFFSET(MAP_START); @@ -643,15 +611,7 @@ void __init mem_init(void) parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START); #endif - printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n", - nr_free_pages() << (PAGE_SHIFT-10), - num_physpages << (PAGE_SHIFT-10), - codesize >> 10, - reservedpages << (PAGE_SHIFT-10), - datasize >> 10, - initsize >> 10 - ); - + mem_init_print_info(NULL); #ifdef CONFIG_DEBUG_KERNEL /* double-sanity-check paranoia */ printk("virtual kernel memory layout:\n" " vmalloc : 0x%p - 0x%p (%4ld MB)\n" @@ -1099,6 +1059,6 @@ void flush_tlb_all(void) #ifdef CONFIG_BLK_DEV_INITRD void free_initrd_mem(unsigned long start, unsigned long end) { - num_physpages += free_reserved_area(start, end, -1, "initrd"); + free_reserved_area(start, end, -1, "initrd"); } #endif -- 1.7.9.5
next prev parent reply other threads:[~2013-05-08 15:51 UTC|newest] Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-05-08 15:50 [PATCH v5, part4 00/41] Simplify mem_init() implementations and kill num_physpages Jiang Liu 2013-05-08 15:50 ` Jiang Liu 2013-05-08 15:50 ` [PATCH v5, part4 01/41] vmlinux.lds: add comments for global variables and clean up useless declarations Jiang Liu 2013-05-08 15:50 ` Jiang Liu 2013-05-08 15:50 ` [PATCH v5, part4 02/41] avr32: normalize global variables exported by vmlinux.lds Jiang Liu 2013-05-08 15:50 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 03/41] c6x: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 04/41] h8300: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 05/41] score: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 06/41] tile: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 07/41] UML: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 08/41] mm: introduce helper function mem_init_print_info() to simplify mem_init() Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 09/41] mm: use totalram_pages instead of num_physpages at runtime Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 10/41] mm/hotplug: prepare for removing num_physpages Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 11/41] mm/alpha: prepare for removing num_physpages and simplify mem_init() Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 12/41] mm/ARC: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-29 8:41 ` Vineet Gupta 2013-05-29 8:41 ` Vineet Gupta 2013-05-29 8:41 ` Vineet Gupta 2013-05-29 13:05 ` Liu Jiang 2013-05-29 13:05 ` Liu Jiang 2013-05-08 15:51 ` [PATCH v5, part4 13/41] mm/ARM: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 14/41] mm/ARM64: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 15/41] mm/AVR32: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 16/41] mm/blackfin: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-25 13:25 ` Sonic Zhang 2013-05-25 13:25 ` Sonic Zhang 2013-05-26 13:55 ` Liu Jiang 2013-05-26 13:55 ` Liu Jiang 2013-05-08 15:51 ` [PATCH v5, part4 17/41] mm/c6x: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 18/41] mm/cris: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 19/41] mm/frv: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 20/41] mm/h8300: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 16:26 ` Sergei Shtylyov 2013-05-08 16:26 ` Sergei Shtylyov 2013-05-08 19:29 ` Sergei Shtylyov 2013-05-08 19:29 ` Sergei Shtylyov 2013-05-08 23:35 ` Cody P Schafer 2013-05-08 23:35 ` Cody P Schafer 2013-05-12 15:17 ` Liu Jiang 2013-05-12 15:17 ` Liu Jiang 2013-05-08 15:51 ` [PATCH v5, part4 21/41] mm/hexagon: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 22/41] mm/IA64: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 23/41] mm/m32r: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 24/41] mm/m68k: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 25/41] mm/metag: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 26/41] mm/microblaze: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 27/41] mm/MIPS: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 28/41] mm/mn10300: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 29/41] mm/openrisc: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu [this message] 2013-05-08 15:51 ` [PATCH v5, part4 30/41] mm/PARISC: " Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 31/41] mm/ppc: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-15 0:32 ` Benjamin Herrenschmidt 2013-05-15 0:32 ` Benjamin Herrenschmidt 2013-05-15 0:32 ` Benjamin Herrenschmidt 2013-05-15 15:49 ` Liu Jiang 2013-05-15 15:49 ` Liu Jiang 2013-05-15 15:49 ` Liu Jiang 2013-05-08 15:51 ` [PATCH v5, part4 32/41] mm/s390: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 33/41] mm/score: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 34/41] mm/SH: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 35/41] mm/SPARC: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 19:02 ` Sam Ravnborg 2013-05-08 19:02 ` Sam Ravnborg 2013-05-08 19:02 ` Sam Ravnborg 2013-05-08 15:51 ` [PATCH v5, part4 36/41] mm/tile: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 37/41] mm/um: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 38/41] mm/unicore32: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 39/41] mm/x86: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 40/41] mm/xtensa: " Jiang Liu 2013-05-08 15:51 ` Jiang Liu 2013-05-08 15:51 ` [PATCH v5, part4 41/41] mm: kill global variable num_physpages Jiang Liu 2013-05-08 15:51 ` Jiang Liu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1368028298-7401-31-git-send-email-jiang.liu@huawei.com \ --to=liuj97@gmail.com \ --cc=James.Bottomley@HansenPartnership.com \ --cc=akpm@linux-foundation.org \ --cc=deller@gmx.de \ --cc=dhowells@redhat.com \ --cc=jejb@parisc-linux.org \ --cc=jiang.liu@huawei.com \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-parisc@vger.kernel.org \ --cc=mgorman@suse.de \ --cc=mhocko@suse.cz \ --cc=minchan@kernel.org \ --cc=msalter@redhat.com \ --cc=rientjes@google.com \ --cc=sergei.shtylyov@cogentembedded.com \ --cc=tglx@linutronix.de \ --cc=wency@cn.fujitsu.com \ --cc=wujianguo@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.