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

Commit 5c6b4e84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  random: Fix handing of arch_get_random_long in get_random_bytes()
  x86: Call stop_machine_text_poke() on all CPUs
  x86, ioapic: Only print ioapic debug information for IRQs belonging to an ioapic chip
  x86/mrst: Avoid reporting wrong nmi status
  x86/mrst: Add support for Penwell clock calibration
  x86/apic: Allow use of lapic timer early calibration result
  x86/apic: Do not clear nr_irqs_gsi if no legacy irqs
  x86/platform: Add a wallclock_init func to x86_platforms ops
  x86/mce: Make mce_chrdev_ops 'static const'
parents ddddefa9 0d2f096b

arch/x86/include/asm/apic.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ extern unsigned int apic_verbosity; 
extern int local_apic_timer_c2_ok;



extern int disable_apic;

extern unsigned int lapic_timer_frequency;



#ifdef CONFIG_SMP

extern void __inquire_remote_apic(int apicid);

arch/x86/include/asm/mach_traps.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define NMI_REASON_CLEAR_IOCHK	0x08

#define NMI_REASON_CLEAR_MASK	0x0f



static inline unsigned char get_nmi_reason(void)

static inline unsigned char default_get_nmi_reason(void)

{

	return inb(NMI_REASON_PORT);

}

arch/x86/include/asm/mce.h

+4 −1
Original line number Diff line number Diff line
@@ -201,7 +201,10 @@ int mce_notify_irq(void); 
void mce_notify_process(void);



DECLARE_PER_CPU(struct mce, injectm);

extern struct file_operations mce_chrdev_ops;



extern void register_mce_write_callback(ssize_t (*)(struct file *filp,

				    const char __user *ubuf,

				    size_t usize, loff_t *off));



/*

 * Exception handler

arch/x86/include/asm/mrst.h

+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,13 @@ enum mrst_timer_options { 


extern enum mrst_timer_options mrst_timer_options;



/*

 * Penwell uses spread spectrum clock, so the freq number is not exactly

 * the same as reported by MSR based on SDM.

 */

#define PENWELL_FSB_FREQ_83SKU         83200

#define PENWELL_FSB_FREQ_100SKU        99840



#define SFI_MTMR_MAX_NUM 8

#define SFI_MRTC_MAX	8

arch/x86/include/asm/x86_init.h

+3 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ struct x86_cpuinit_ops { 
/**

 * struct x86_platform_ops - platform specific runtime functions

 * @calibrate_tsc:		calibrate TSC

 * @wallclock_init:		init the wallclock device

 * @get_wallclock:		get time from HW clock like RTC etc.

 * @set_wallclock:		set time back to HW clock

 * @is_untracked_pat_range	exclude from PAT logic
@@ -160,11 +161,13 @@ struct x86_cpuinit_ops { 
 */

struct x86_platform_ops {

	unsigned long (*calibrate_tsc)(void);

	void (*wallclock_init)(void);

	unsigned long (*get_wallclock)(void);

	int (*set_wallclock)(unsigned long nowtime);

	void (*iommu_shutdown)(void);

	bool (*is_untracked_pat_range)(u64 start, u64 end);

	void (*nmi_init)(void);

	unsigned char (*get_nmi_reason)(void);

	int (*i8042_detect)(void);

};