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>
		
			
				
	
	
		
			99 lines
		
	
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			99 lines
		
	
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0
 | |
| #include <linux/memblock.h>
 | |
| #include <linux/mmdebug.h>
 | |
| #include <linux/export.h>
 | |
| #include <linux/mm.h>
 | |
| 
 | |
| #include <asm/page.h>
 | |
| 
 | |
| #include "physaddr.h"
 | |
| 
 | |
| #ifdef CONFIG_X86_64
 | |
| 
 | |
| #ifdef CONFIG_DEBUG_VIRTUAL
 | |
| unsigned long __phys_addr(unsigned long x)
 | |
| {
 | |
| 	unsigned long y = x - __START_KERNEL_map;
 | |
| 
 | |
| 	/* use the carry flag to determine if x was < __START_KERNEL_map */
 | |
| 	if (unlikely(x > y)) {
 | |
| 		x = y + phys_base;
 | |
| 
 | |
| 		VIRTUAL_BUG_ON(y >= KERNEL_IMAGE_SIZE);
 | |
| 	} else {
 | |
| 		x = y + (__START_KERNEL_map - PAGE_OFFSET);
 | |
| 
 | |
| 		/* carry flag will be set if starting x was >= PAGE_OFFSET */
 | |
| 		VIRTUAL_BUG_ON((x > y) || !phys_addr_valid(x));
 | |
| 	}
 | |
| 
 | |
| 	return x;
 | |
| }
 | |
| EXPORT_SYMBOL(__phys_addr);
 | |
| 
 | |
| unsigned long __phys_addr_symbol(unsigned long x)
 | |
| {
 | |
| 	unsigned long y = x - __START_KERNEL_map;
 | |
| 
 | |
| 	/* only check upper bounds since lower bounds will trigger carry */
 | |
| 	VIRTUAL_BUG_ON(y >= KERNEL_IMAGE_SIZE);
 | |
| 
 | |
| 	return y + phys_base;
 | |
| }
 | |
| EXPORT_SYMBOL(__phys_addr_symbol);
 | |
| #endif
 | |
| 
 | |
| bool __virt_addr_valid(unsigned long x)
 | |
| {
 | |
| 	unsigned long y = x - __START_KERNEL_map;
 | |
| 
 | |
| 	/* use the carry flag to determine if x was < __START_KERNEL_map */
 | |
| 	if (unlikely(x > y)) {
 | |
| 		x = y + phys_base;
 | |
| 
 | |
| 		if (y >= KERNEL_IMAGE_SIZE)
 | |
| 			return false;
 | |
| 	} else {
 | |
| 		x = y + (__START_KERNEL_map - PAGE_OFFSET);
 | |
| 
 | |
| 		/* carry flag will be set if starting x was >= PAGE_OFFSET */
 | |
| 		if ((x > y) || !phys_addr_valid(x))
 | |
| 			return false;
 | |
| 	}
 | |
| 
 | |
| 	return pfn_valid(x >> PAGE_SHIFT);
 | |
| }
 | |
| EXPORT_SYMBOL(__virt_addr_valid);
 | |
| 
 | |
| #else
 | |
| 
 | |
| #ifdef CONFIG_DEBUG_VIRTUAL
 | |
| unsigned long __phys_addr(unsigned long x)
 | |
| {
 | |
| 	unsigned long phys_addr = x - PAGE_OFFSET;
 | |
| 	/* VMALLOC_* aren't constants  */
 | |
| 	VIRTUAL_BUG_ON(x < PAGE_OFFSET);
 | |
| 	VIRTUAL_BUG_ON(__vmalloc_start_set && is_vmalloc_addr((void *) x));
 | |
| 	/* max_low_pfn is set early, but not _that_ early */
 | |
| 	if (max_low_pfn) {
 | |
| 		VIRTUAL_BUG_ON((phys_addr >> PAGE_SHIFT) > max_low_pfn);
 | |
| 		BUG_ON(slow_virt_to_phys((void *)x) != phys_addr);
 | |
| 	}
 | |
| 	return phys_addr;
 | |
| }
 | |
| EXPORT_SYMBOL(__phys_addr);
 | |
| #endif
 | |
| 
 | |
| bool __virt_addr_valid(unsigned long x)
 | |
| {
 | |
| 	if (x < PAGE_OFFSET)
 | |
| 		return false;
 | |
| 	if (__vmalloc_start_set && is_vmalloc_addr((void *) x))
 | |
| 		return false;
 | |
| 	if (x >= FIXADDR_START)
 | |
| 		return false;
 | |
| 	return pfn_valid((x - PAGE_OFFSET) >> PAGE_SHIFT);
 | |
| }
 | |
| EXPORT_SYMBOL(__virt_addr_valid);
 | |
| 
 | |
| #endif	/* CONFIG_X86_64 */
 |