Commit 40c1fa52 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/cleanups' into x86/mm 



Merge recent cleanups to the x86 MM code to resolve a conflict.

Conflicts:
	arch/x86/mm/fault.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c46f5223 3228e1dc

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ config HPET_TIMER 


config HPET_EMULATE_RTC

	def_bool y

	depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)

	depends on HPET_TIMER && (RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)



config APB_TIMER

	def_bool y if X86_INTEL_MID

arch/x86/include/asm/irq.h

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ extern void native_init_IRQ(void); 


extern void __handle_irq(struct irq_desc *desc, struct pt_regs *regs);



extern __visible void do_IRQ(struct pt_regs *regs, unsigned long vector);



extern void init_ISA_irqs(void);



extern void __init init_IRQ(void);

arch/x86/include/asm/page_64_types.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 * On Intel CPUs, if a SYSCALL instruction is at the highest canonical

 * address, then that syscall will enter the kernel with a

 * non-canonical return address, and SYSRET will explode dangerously.

 * We avoid this particular problem by preventing anything executable

 * We avoid this particular problem by preventing anything

 * from being mapped at the maximum canonical address.

 *

 * On AMD CPUs in the Ryzen family, there's a nasty bug in which the

arch/x86/include/asm/pgtable_types.h

+0 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ enum page_cache_mode { 
#define __pgprot(x)		((pgprot_t) { (x) } )

#define __pg(x)			__pgprot(x)



#define _PAGE_PAT_LARGE		(_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)



#define PAGE_NONE	     __pg(   0|   0|   0|___A|   0|   0|   0|___G)

#define PAGE_SHARED	     __pg(__PP|__RW|_USR|___A|__NX|   0|   0|   0)

#define PAGE_SHARED_EXEC     __pg(__PP|__RW|_USR|___A|   0|   0|   0|   0)

arch/x86/include/asm/vm86.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct vm86 { 
	unsigned long saved_sp0;



	unsigned long flags;

	unsigned long screen_bitmap;

	unsigned long cpu_type;

	struct revectored_struct int_revectored;

	struct revectored_struct int21_revectored;