Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68d00bbe authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge remote-tracking branch 'origin/x86/mm' into x86/mm2 



Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.

Resolved Conflicts:
	arch/x86/kernel/head32.c
	arch/x86/kernel/head64.c
	arch/x86/mm/init_64.c
	arch/x86/realmode/init.c

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents ac2cbab2 07f4207a

arch/x86/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -1253,10 +1253,6 @@ config NODES_SHIFT 
	  Specify the maximum number of NUMA Nodes available on the target

	  system.  Increases memory reserved to accommodate various tables.



config HAVE_ARCH_ALLOC_REMAP

	def_bool y

	depends on X86_32 && NUMA



config ARCH_HAVE_MEMORY_PRESENT

	def_bool y

	depends on X86_32 && DISCONTIGMEM

arch/x86/include/asm/mmzone_32.h

+0 −6
Original line number Diff line number Diff line
@@ -14,12 +14,6 @@ extern struct pglist_data *node_data[]; 


#include <asm/numaq.h>



extern void resume_map_numa_kva(pgd_t *pgd);



#else /* !CONFIG_NUMA */



static inline void resume_map_numa_kva(pgd_t *pgd) {}



#endif /* CONFIG_NUMA */



#ifdef CONFIG_DISCONTIGMEM

arch/x86/include/asm/page.h

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, 
 * case properly. Once all supported versions of gcc understand it, we can

 * remove this Voodoo magic stuff. (i.e. once gcc3.x is deprecated)

 */

#define __pa_symbol(x)	__pa(__phys_reloc_hide((unsigned long)(x)))

#define __pa_symbol(x) \

	__phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))



#define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))

arch/x86/include/asm/page_32.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ extern unsigned long __phys_addr(unsigned long); 
#else

#define __phys_addr(x)		__phys_addr_nodebug(x)

#endif

#define __phys_addr_symbol(x)	__phys_addr(x)

#define __phys_reloc_hide(x)	RELOC_HIDE((x), 0)



#ifdef CONFIG_FLATMEM

arch/x86/include/asm/page_64.h

+36 −0
Original line number Diff line number Diff line
@@ -3,4 +3,40 @@ 


#include <asm/page_64_types.h>



#ifndef __ASSEMBLY__



/* duplicated to the one in bootmem.h */

extern unsigned long max_pfn;

extern unsigned long phys_base;



static inline unsigned long __phys_addr_nodebug(unsigned long x)

{

	unsigned long y = x - __START_KERNEL_map;



	/* use the carry flag to determine if x was < __START_KERNEL_map */

	x = y + ((x > y) ? phys_base : (__START_KERNEL_map - PAGE_OFFSET));



	return x;

}



#ifdef CONFIG_DEBUG_VIRTUAL

extern unsigned long __phys_addr(unsigned long);

extern unsigned long __phys_addr_symbol(unsigned long);

#else

#define __phys_addr(x)		__phys_addr_nodebug(x)

#define __phys_addr_symbol(x) \

	((unsigned long)(x) - __START_KERNEL_map + phys_base)

#endif



#define __phys_reloc_hide(x)	(x)



#ifdef CONFIG_FLATMEM

#define pfn_valid(pfn)          ((pfn) < max_pfn)

#endif



void clear_page(void *page);

void copy_page(void *to, void *from);



#endif	/* !__ASSEMBLY__ */



#endif /* _ASM_X86_PAGE_64_H */