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

Commit d88f48e1 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 

Pull x86 fixes from Ingo Molnar:
 "Misc fixes:

   - fix hotplug bugs
   - fix irq live lock
   - fix various topology handling bugs
   - fix APIC ACK ordering
   - fix PV iopl handling
   - fix speling
   - fix/tweak memcpy_mcsafe() return value
   - fix fbcon bug
   - remove stray prototypes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/msr: Remove unused native_read_tscp()
  x86/apic: Remove declaration of unused hw_nmi_is_cpu_stuck
  x86/oprofile/nmi: Add missing hotplug FROZEN handling
  x86/hpet: Use proper mask to modify hotplug action
  x86/apic/uv: Fix the hotplug notifier
  x86/apb/timer: Use proper mask to modify hotplug action
  x86/topology: Use total_cpus not nr_cpu_ids for logical packages
  x86/topology: Fix Intel HT disable
  x86/topology: Fix logical package mapping
  x86/irq: Cure live lock in fixup_irqs()
  x86/tsc: Prevent NULL pointer deref in calibrate_delay_is_known()
  x86/apic: Fix suspicious RCU usage in smp_trace_call_function_interrupt()
  x86/iopl: Fix iopl capability check on Xen PV
  x86/iopl/64: Properly context-switch IOPL on Xen PV
  selftests/x86: Add an iopl test
  x86/mm, x86/mce: Fix return type/value for memcpy_mcsafe()
  x86/video: Don't assume all FB devices are PCI devices
  arch/x86/irq: Purge useless handler declarations from hw_irq.h
  x86: Fix misspellings in comments
parents be53f58f 9da77666

arch/x86/entry/vdso/vclock_gettime.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ notrace static cycle_t vread_tsc(void) 


	/*

	 * GCC likes to generate cmov here, but this branch is extremely

	 * predictable (it's just a funciton of time and the likely is

	 * predictable (it's just a function of time and the likely is

	 * very likely) and there's a data dependence, so force GCC

	 * to generate a branch instead.  I don't barrier() because

	 * we don't actually need a barrier, and if this function

arch/x86/events/intel/lbr.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ int intel_pmu_setup_lbr_filter(struct perf_event *event) 


/*

 * return the type of control flow change at address "from"

 * intruction is not necessarily a branch (in case of interrupt).

 * instruction is not necessarily a branch (in case of interrupt).

 *

 * The branch type returned also includes the priv level of the

 * target of the control flow change (X86_BR_USER, X86_BR_KERNEL).

arch/x86/events/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ struct cpu_hw_events { 
 * events to select for counter rescheduling.

 *

 * Care must be taken as the rescheduling algorithm is O(n!) which

 * will increase scheduling cycles for an over-commited system

 * will increase scheduling cycles for an over-committed system

 * dramatically.  The number of such EVENT_CONSTRAINT_OVERLAP() macros

 * and its counter masks must be kept at a minimum.

 */

arch/x86/include/asm/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -643,8 +643,8 @@ static inline void entering_irq(void) 


static inline void entering_ack_irq(void)

{

	ack_APIC_irq();

	entering_irq();

	ack_APIC_irq();

}



static inline void ipi_entering_ack_irq(void)

arch/x86/include/asm/ftrace.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ int ftrace_int3_handler(struct pt_regs *regs); 
 * this screws up the trace output when tracing a ia32 task.

 * Instead of reporting bogus syscalls, just do not trace them.

 *

 * If the user realy wants these, then they should use the

 * If the user really wants these, then they should use the

 * raw syscall tracepoints with filtering.

 */

#define ARCH_TRACE_IGNORE_COMPAT_SYSCALLS 1