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

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

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
  "make namespacecheck" fixes
  x86: fix compilation error in VisWS
  x86: voyager fix
  x86: Drop duplicate from setup.c
  intel-iommu.c: dma ops fix
parents 57675e6e a4928cff

arch/x86/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ config X86 
	select HAVE_KPROBES

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_KRETPROBES

	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)

	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_KGDB if !X86_VOYAGER









config GENERIC_LOCKBREAK

config GENERIC_LOCKBREAK

arch/x86/kernel/apic_32.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -902,7 +902,7 @@ void __init init_bsp_APIC(void) 
	apic_write_around(APIC_LVT1, value);

	apic_write_around(APIC_LVT1, value);

}

}





void __cpuinit lapic_setup_esr(void)

static void __cpuinit lapic_setup_esr(void)

{

{

	unsigned long oldvalue, value, maxlvt;

	unsigned long oldvalue, value, maxlvt;

	if (lapic_is_integrated() && !esr_disable) {

	if (lapic_is_integrated() && !esr_disable) {

arch/x86/kernel/apic_64.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -429,7 +429,7 @@ void __init setup_boot_APIC_clock(void) 
 * set the DUMMY flag again and force the broadcast mode in the

 * set the DUMMY flag again and force the broadcast mode in the

 * clockevents layer.

 * clockevents layer.

 */

 */

void __cpuinit check_boot_apic_timer_broadcast(void)

static void __cpuinit check_boot_apic_timer_broadcast(void)

{

{

	if (!disable_apic_timer ||

	if (!disable_apic_timer ||

	    (lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY))

	    (lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY))
@@ -834,7 +834,7 @@ void __cpuinit setup_local_APIC(void) 
	preempt_enable();

	preempt_enable();

}

}





void __cpuinit lapic_setup_esr(void)

static void __cpuinit lapic_setup_esr(void)

{

{

	unsigned maxlvt = lapic_get_maxlvt();

	unsigned maxlvt = lapic_get_maxlvt();

arch/x86/kernel/process_32.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -550,7 +550,7 @@ static void hard_enable_TSC(void) 
	write_cr4(read_cr4() & ~X86_CR4_TSD);

	write_cr4(read_cr4() & ~X86_CR4_TSD);

}

}





void enable_TSC(void)

static void enable_TSC(void)

{

{

	preempt_disable();

	preempt_disable();

	if (test_and_clear_thread_flag(TIF_NOTSC))

	if (test_and_clear_thread_flag(TIF_NOTSC))

arch/x86/kernel/process_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -562,7 +562,7 @@ static void hard_enable_TSC(void) 
	write_cr4(read_cr4() & ~X86_CR4_TSD);

	write_cr4(read_cr4() & ~X86_CR4_TSD);

}

}





void enable_TSC(void)

static void enable_TSC(void)

{

{

	preempt_disable();

	preempt_disable();

	if (test_and_clear_thread_flag(TIF_NOTSC))

	if (test_and_clear_thread_flag(TIF_NOTSC))