Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3f29c33194d3b5fffdccc89665982a36b408b6f9

Authored by Jiang Liu
Committed by Linus Torvalds
1 parent dceccbe920
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

mm/tile: prepare for removing num_physpages and simplify mem_init() 

Prepare for removing num_physpages and simplify mem_init().

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 9 additions and 22 deletions Side-by-side Diff

arch/tile/kernel/setup.c
Diff comments   View file @ 3f29c33
... ... @@ -329,6 +329,7 @@
329 329 #if defined(CONFIG_HIGHMEM) || defined(__tilegx__)
330 330 long lowmem_pages;
331 331 #endif
  332 + unsigned long physpages = 0;
332 333  
333 334 /* We are using a char to hold the cpu_2_node[] mapping */
334 335 BUILD_BUG_ON(MAX_NUMNODES > 127);
... ... @@ -388,8 +389,8 @@
388 389 continue;
389 390 }
390 391 }
391   - if (num_physpages + PFN_DOWN(range.size) > maxmem_pfn) {
392   - int max_size = maxmem_pfn - num_physpages;
  392 + if (physpages + PFN_DOWN(range.size) > maxmem_pfn) {
  393 + int max_size = maxmem_pfn - physpages;
393 394 if (max_size > 0) {
394 395 pr_err("Maxmem reduced node %d to %d pages\n",
395 396 i, max_size);
... ... @@ -446,7 +447,7 @@
446 447 node_start_pfn[i] = start;
447 448 node_end_pfn[i] = end;
448 449 node_controller[i] = range.controller;
449   - num_physpages += size;
  450 + physpages += size;
450 451 max_pfn = end;
451 452  
452 453 /* Mark node as online */
... ... @@ -465,7 +466,7 @@
465 466 * we're willing to use at 8 million pages (32GB of 4KB pages).
466 467 */
467 468 cap = 8 * 1024 * 1024; /* 8 million pages */
468   - if (num_physpages > cap) {
  469 + if (physpages > cap) {
469 470 int num_nodes = num_online_nodes();
470 471 int cap_each = cap / num_nodes;
471 472 unsigned long dropped_pages = 0;
472 473  
... ... @@ -476,10 +477,10 @@
476 477 node_end_pfn[i] = node_start_pfn[i] + cap_each;
477 478 }
478 479 }
479   - num_physpages -= dropped_pages;
  480 + physpages -= dropped_pages;
480 481 pr_warning("Only using %ldMB memory;"
481 482 " ignoring %ldMB.\n",
482   - num_physpages >> (20 - PAGE_SHIFT),
  483 + physpages >> (20 - PAGE_SHIFT),
483 484 dropped_pages >> (20 - PAGE_SHIFT));
484 485 pr_warning("Consider using a larger page size.\n");
485 486 }
... ... @@ -497,7 +498,7 @@
497 498  
498 499 lowmem_pages = (mappable_physpages > MAXMEM_PFN) ?
499 500 MAXMEM_PFN : mappable_physpages;
500   - highmem_pages = (long) (num_physpages - lowmem_pages);
  501 + highmem_pages = (long) (physpages - lowmem_pages);
501 502  
502 503 pr_notice("%ldMB HIGHMEM available.\n",
503 504 pages_to_mb(highmem_pages > 0 ? highmem_pages : 0));
... ... @@ -514,7 +515,6 @@
514 515 pr_warning("Use a HIGHMEM enabled kernel.\n");
515 516 max_low_pfn = MAXMEM_PFN;
516 517 max_pfn = MAXMEM_PFN;
517   - num_physpages = MAXMEM_PFN;
518 518 node_end_pfn[0] = MAXMEM_PFN;
519 519 } else {
520 520 pr_notice("%ldMB memory available.\n",
... ... @@ -821,7 +821,6 @@
821 821  
822 822 void __init mem_init(void)
823 823 {
824   - int codesize, datasize, initsize;
825 824 int i;
826 825 #ifndef __tilegx__
827 826 void *last;
... ... @@ -853,19 +852,7 @@
853 852 set_non_bootmem_pages_init();
854 853 #endif
855 854  
856   - codesize = (unsigned long)&_etext - (unsigned long)&_text;
857   - datasize = (unsigned long)&_end - (unsigned long)&_sdata;
858   - initsize = (unsigned long)&_einittext - (unsigned long)&_sinittext;
859   - initsize += (unsigned long)&_einitdata - (unsigned long)&_sinitdata;
860   -
861   - pr_info("Memory: %luk/%luk available (%dk kernel code, %dk data, %dk init, %ldk highmem)\n",
862   - (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
863   - num_physpages << (PAGE_SHIFT-10),
864   - codesize >> 10,
865   - datasize >> 10,
866   - initsize >> 10,
867   - (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10))
868   - );
  855 + mem_init_print_info(NULL);
869 856  
870 857 /*
871 858 * In debug mode, dump some interesting memory mappings.