forked from mirrors/linux
		
	 57c8a661d9
			
		
	
	
		57c8a661d9
		
	
	
	
	
		
			
			Move remaining definitions and declarations from include/linux/bootmem.h into include/linux/memblock.h and remove the redundant header. The includes were replaced with the semantic patch below and then semi-automated removal of duplicated '#include <linux/memblock.h> @@ @@ - #include <linux/bootmem.h> + #include <linux/memblock.h> [sfr@canb.auug.org.au: dma-direct: fix up for the removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181002185342.133d1680@canb.auug.org.au [sfr@canb.auug.org.au: powerpc: fix up for removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181005161406.73ef8727@canb.auug.org.au [sfr@canb.auug.org.au: x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal] Link: http://lkml.kernel.org/r/20181008190341.5e396491@canb.auug.org.au Link: http://lkml.kernel.org/r/1536927045-23536-30-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			93 lines
		
	
	
	
		
			3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			93 lines
		
	
	
	
		
			3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Written by: Patricia Gaughen <gone@us.ibm.com>, IBM Corporation
 | |
|  * August 2002: added remote node KVA remap - Martin J. Bligh 
 | |
|  *
 | |
|  * Copyright (C) 2002, IBM Corp.
 | |
|  *
 | |
|  * All rights reserved.          
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify
 | |
|  * it under the terms of the GNU General Public License as published by
 | |
|  * the Free Software Foundation; either version 2 of the License, or
 | |
|  * (at your option) any later version.
 | |
|  *
 | |
|  * This program is distributed in the hope that it will be useful, but
 | |
|  * WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
 | |
|  * NON INFRINGEMENT.  See the GNU General Public License for more
 | |
|  * details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU General Public License
 | |
|  * along with this program; if not, write to the Free Software
 | |
|  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 | |
|  */
 | |
| 
 | |
| #include <linux/memblock.h>
 | |
| #include <linux/init.h>
 | |
| 
 | |
| #include "numa_internal.h"
 | |
| 
 | |
| #ifdef CONFIG_DISCONTIGMEM
 | |
| /*
 | |
|  * 4) physnode_map     - the mapping between a pfn and owning node
 | |
|  * physnode_map keeps track of the physical memory layout of a generic
 | |
|  * numa node on a 64Mb break (each element of the array will
 | |
|  * represent 64Mb of memory and will be marked by the node id.  so,
 | |
|  * if the first gig is on node 0, and the second gig is on node 1
 | |
|  * physnode_map will contain:
 | |
|  *
 | |
|  *     physnode_map[0-15] = 0;
 | |
|  *     physnode_map[16-31] = 1;
 | |
|  *     physnode_map[32- ] = -1;
 | |
|  */
 | |
| s8 physnode_map[MAX_SECTIONS] __read_mostly = { [0 ... (MAX_SECTIONS - 1)] = -1};
 | |
| EXPORT_SYMBOL(physnode_map);
 | |
| 
 | |
| void memory_present(int nid, unsigned long start, unsigned long end)
 | |
| {
 | |
| 	unsigned long pfn;
 | |
| 
 | |
| 	printk(KERN_INFO "Node: %d, start_pfn: %lx, end_pfn: %lx\n",
 | |
| 			nid, start, end);
 | |
| 	printk(KERN_DEBUG "  Setting physnode_map array to node %d for pfns:\n", nid);
 | |
| 	printk(KERN_DEBUG "  ");
 | |
| 	start = round_down(start, PAGES_PER_SECTION);
 | |
| 	end = round_up(end, PAGES_PER_SECTION);
 | |
| 	for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) {
 | |
| 		physnode_map[pfn / PAGES_PER_SECTION] = nid;
 | |
| 		printk(KERN_CONT "%lx ", pfn);
 | |
| 	}
 | |
| 	printk(KERN_CONT "\n");
 | |
| }
 | |
| #endif
 | |
| 
 | |
| extern unsigned long highend_pfn, highstart_pfn;
 | |
| 
 | |
| void __init initmem_init(void)
 | |
| {
 | |
| 	x86_numa_init();
 | |
| 
 | |
| #ifdef CONFIG_HIGHMEM
 | |
| 	highstart_pfn = highend_pfn = max_pfn;
 | |
| 	if (max_pfn > max_low_pfn)
 | |
| 		highstart_pfn = max_low_pfn;
 | |
| 	printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",
 | |
| 	       pages_to_mb(highend_pfn - highstart_pfn));
 | |
| 	high_memory = (void *) __va(highstart_pfn * PAGE_SIZE - 1) + 1;
 | |
| #else
 | |
| 	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1;
 | |
| #endif
 | |
| 	printk(KERN_NOTICE "%ldMB LOWMEM available.\n",
 | |
| 			pages_to_mb(max_low_pfn));
 | |
| 	printk(KERN_DEBUG "max_low_pfn = %lx, highstart_pfn = %lx\n",
 | |
| 			max_low_pfn, highstart_pfn);
 | |
| 
 | |
| 	printk(KERN_DEBUG "Low memory ends at vaddr %08lx\n",
 | |
| 			(ulong) pfn_to_kaddr(max_low_pfn));
 | |
| 
 | |
| 	printk(KERN_DEBUG "High memory starts at vaddr %08lx\n",
 | |
| 			(ulong) pfn_to_kaddr(highstart_pfn));
 | |
| 
 | |
| 	__vmalloc_start_set = true;
 | |
| 	setup_bootmem_allocator();
 | |
| }
 |