Commit 2b3061c7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/mm' into x86/asm, to unify the two branches for simplicity 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 01175255 25dfe478

arch/x86/include/asm/desc.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in 


extern struct desc_ptr idt_descr;

extern gate_desc idt_table[];

extern struct desc_ptr debug_idt_descr;

extern const struct desc_ptr debug_idt_descr;

extern gate_desc debug_idt_table[];



struct gdt_page {

arch/x86/include/asm/fpu/xstate.h

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ 
extern u64 xfeatures_mask;

extern u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];



extern void update_regset_xstate_info(unsigned int size, u64 xstate_mask);

extern void __init update_regset_xstate_info(unsigned int size,

					     u64 xstate_mask);



void fpu__xstate_clear_all_cpu_caps(void);

void *get_xsave_addr(struct xregs_state *xsave, int xstate);

arch/x86/include/asm/kaslr.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ unsigned long kaslr_get_random_long(const char *purpose); 
#ifdef CONFIG_RANDOMIZE_MEMORY

extern unsigned long page_offset_base;

extern unsigned long vmalloc_base;

extern unsigned long vmemmap_base;



void kernel_randomize_memory(void);

#else

arch/x86/include/asm/pgtable_64_types.h

+3 −1
Original line number Diff line number Diff line
@@ -57,11 +57,13 @@ typedef struct { pteval_t pte; } pte_t; 
#define MAXMEM		_AC(__AC(1, UL) << MAX_PHYSMEM_BITS, UL)

#define VMALLOC_SIZE_TB	_AC(32, UL)

#define __VMALLOC_BASE	_AC(0xffffc90000000000, UL)

#define VMEMMAP_START	_AC(0xffffea0000000000, UL)

#define __VMEMMAP_BASE	_AC(0xffffea0000000000, UL)

#ifdef CONFIG_RANDOMIZE_MEMORY

#define VMALLOC_START	vmalloc_base

#define VMEMMAP_START	vmemmap_base

#else

#define VMALLOC_START	__VMALLOC_BASE

#define VMEMMAP_START	__VMEMMAP_BASE

#endif /* CONFIG_RANDOMIZE_MEMORY */

#define VMALLOC_END	(VMALLOC_START + _AC((VMALLOC_SIZE_TB << 40) - 1, UL))

#define MODULES_VADDR    (__START_KERNEL_map + KERNEL_IMAGE_SIZE)

arch/x86/kernel/apic/apic_flat_64.c

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
static struct apic apic_physflat;

static struct apic apic_flat;



struct apic __read_mostly *apic = &apic_flat;

struct apic *apic __ro_after_init = &apic_flat;

EXPORT_SYMBOL_GPL(apic);



static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
@@ -154,7 +154,7 @@ static int flat_probe(void) 
	return 1;

}



static struct apic apic_flat =  {

static struct apic apic_flat __ro_after_init = {

	.name				= "flat",

	.probe				= flat_probe,

	.acpi_madt_oem_check		= flat_acpi_madt_oem_check,
@@ -248,7 +248,7 @@ static int physflat_probe(void) 
	return 0;

}



static struct apic apic_physflat =  {

static struct apic apic_physflat __ro_after_init = {



	.name				= "physical flat",

	.probe				= physflat_probe,