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

Commit 67422598 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.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, kvm: Call restore_sched_clock_state() only after %gs is initialized
  x86: Use -mno-avx when available
  x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
  x86: Preserve lazy irq disable semantics in fixup_irqs()
parents 20d9d9a0 dba69d10

Documentation/feature-removal-schedule.txt

+0 −8
Original line number Diff line number Diff line
@@ -6,14 +6,6 @@ be removed from this file. 


---------------------------



What:	x86 floppy disable_hlt

When:	2012

Why:	ancient workaround of dubious utility clutters the

	code used by everybody else.

Who:	Len Brown <len.brown@intel.com>



---------------------------



What:	CONFIG_APM_CPU_IDLE, and its ability to call APM BIOS in idle

When:	2012

Why:	This optional sub-feature of APM is of dubious reliability,

arch/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ KBUILD_CFLAGS += -Wno-sign-compare 
KBUILD_CFLAGS += -fno-asynchronous-unwind-tables

# prevent gcc from generating any FP code by mistake

KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)

KBUILD_CFLAGS += $(call cc-option,-mno-avx,)



KBUILD_CFLAGS += $(mflags-y)

KBUILD_AFLAGS += $(mflags-y)

arch/x86/include/asm/processor.h

+0 −10
Original line number Diff line number Diff line
@@ -974,16 +974,6 @@ extern bool cpu_has_amd_erratum(const int *); 
#define cpu_has_amd_erratum(x)	(false)

#endif /* CONFIG_CPU_SUP_AMD */



#ifdef CONFIG_X86_32

/*

 * disable hlt during certain critical i/o operations

 */

#define HAVE_DISABLE_HLT

#endif



void disable_hlt(void);

void enable_hlt(void);



void cpu_idle_wait(void);



extern unsigned long arch_align_stack(unsigned long sp);

arch/x86/kernel/irq.c

+6 −1
Original line number Diff line number Diff line
@@ -282,8 +282,13 @@ void fixup_irqs(void) 
		else if (!(warned++))

			set_affinity = 0;



		/*

		 * We unmask if the irq was not marked masked by the

		 * core code. That respects the lazy irq disable

		 * behaviour.

		 */

		if (!irqd_can_move_in_process_context(data) &&

		    !irqd_irq_disabled(data) && chip->irq_unmask)

		    !irqd_irq_masked(data) && chip->irq_unmask)

			chip->irq_unmask(data);



		raw_spin_unlock(&desc->lock);

arch/x86/kernel/process.c

+0 −24
Original line number Diff line number Diff line
@@ -362,34 +362,10 @@ void (*pm_idle)(void); 
EXPORT_SYMBOL(pm_idle);

#endif



#ifdef CONFIG_X86_32

/*

 * This halt magic was a workaround for ancient floppy DMA

 * wreckage. It should be safe to remove.

 */

static int hlt_counter;

void disable_hlt(void)

{

	hlt_counter++;

}

EXPORT_SYMBOL(disable_hlt);



void enable_hlt(void)

{

	hlt_counter--;

}

EXPORT_SYMBOL(enable_hlt);



static inline int hlt_use_halt(void)

{

	return (!hlt_counter && boot_cpu_data.hlt_works_ok);

}

#else

static inline int hlt_use_halt(void)

{

	return 1;

}

#endif



#ifndef CONFIG_SMP

static inline void play_dead(void)