Commit ff1ea52f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: fix APIC related bootup crash on Athlon XP CPUs
  time: add ADJ_OFFSET_SS_READ
  x86: export the symbol empty_zero_page on the 32-bit x86 architecture
  x86: fix kprobes_64.c inlining borkage
  pci: use pci=bfsort for HP DL385 G2, DL585 G2
  x86: correctly set UTS_MACHINE for "make ARCH=x86"
  lockdep: annotate do_debug() trap handler
  x86: turn off iommu merge by default
  x86: fix ACPI compile for LOCAL_APIC=n
  x86: printk kernel version in WARN_ON and other dump_stack users
  ACPI: Set max_cstate to 1 for early Opterons.
  x86: fix NMI watchdog & 'stopped time' problem
parents b5faa4b8 f44d9efd

arch/x86/kernel/apic_32.c

+1 −1
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ void __init sync_Arb_IDs(void) 
	 * Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 And not

	 * needed on AMD.

	 */

	if (modern_apic())

	if (modern_apic() || boot_cpu_data.x86_vendor == X86_VENDOR_AMD)

		return;

	/*

	 * Wait for idle.

arch/x86/kernel/i386_ksyms_32.c

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <asm/semaphore.h>

#include <asm/checksum.h>

#include <asm/desc.h>

#include <asm/pgtable.h>



EXPORT_SYMBOL(__down_failed);

EXPORT_SYMBOL(__down_failed_interruptible);
@@ -29,3 +30,4 @@ EXPORT_SYMBOL(__read_lock_failed); 
#endif



EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(empty_zero_page);

arch/x86/kernel/io_apic_32.c

+10 −2
Original line number Diff line number Diff line
@@ -2166,6 +2166,10 @@ static inline void __init check_timer(void) 
{

	int apic1, pin1, apic2, pin2;

	int vector;

	unsigned int ver;



	ver = apic_read(APIC_LVR);

	ver = GET_APIC_VERSION(ver);



	/*

	 * get/set the timer IRQ vector:
@@ -2179,11 +2183,15 @@ static inline void __init check_timer(void) 
	 * mode for the 8259A whenever interrupts are routed

	 * through I/O APICs.  Also IRQ0 has to be enabled in

	 * the 8259A which implies the virtual wire has to be

	 * disabled in the local APIC.

	 * disabled in the local APIC.  Finally timer interrupts

	 * need to be acknowledged manually in the 8259A for

	 * timer_interrupt() and for the i82489DX when using

	 * the NMI watchdog.

	 */

	apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);

	init_8259A(1);

	timer_ack = 1;

	timer_ack = !cpu_has_tsc;

	timer_ack |= (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver));

	if (timer_over_8254 > 0)

		enable_8259A_irq(0);

arch/x86/kernel/kprobes_64.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ const int kretprobe_blacklist_size = ARRAY_SIZE(kretprobe_blacklist); 
/*

 * returns non-zero if opcode modifies the interrupt flag.

 */

static __always_inline int is_IF_modifier(kprobe_opcode_t *insn)

static int __kprobes is_IF_modifier(kprobe_opcode_t *insn)

{

	switch (*insn) {

	case 0xfa:		/* cli */

arch/x86/kernel/nmi_32.c

+7 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#include <asm/smp.h>

#include <asm/nmi.h>

#include <asm/timer.h>



#include "mach_traps.h"
@@ -83,7 +84,7 @@ static int __init check_nmi_watchdog(void) 


	prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL);

	if (!prev_nmi_count)

		return -1;

		goto error;



	printk(KERN_INFO "Testing NMI watchdog ... ");
@@ -117,7 +118,7 @@ static int __init check_nmi_watchdog(void) 
	if (!atomic_read(&nmi_active)) {

		kfree(prev_nmi_count);

		atomic_set(&nmi_active, -1);

		return -1;

		goto error;

	}

	printk("OK.\n");
@@ -128,6 +129,10 @@ static int __init check_nmi_watchdog(void) 


	kfree(prev_nmi_count);

	return 0;

error:

	timer_ack = !cpu_has_tsc;



	return -1;

}

/* This needs to happen later in boot so counters are working */

late_initcall(check_nmi_watchdog);

CRA Git | Maintained and supported by SUSTech CRA and CCSE