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

Commit 8897c185 authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and... 

Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and 'bjorn.notify' into release
parents 18b2646f db954b58 fdbdc7fc 13614e37 33b57150 f61bb939

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 
 * CPUID levels like 0x6, 0xA etc

 */

#define X86_FEATURE_IDA		(7*32+ 0) /* Intel Dynamic Acceleration */

#define X86_FEATURE_ARAT	(7*32+ 1) /* Always Running APIC Timer */



/* Virtualization flags: Linux defined */

#define X86_FEATURE_TPR_SHADOW  (8*32+ 0) /* Intel TPR Shadow */

arch/x86/kernel/apic/apic.c

+6 −0
Original line number Diff line number Diff line
@@ -431,6 +431,12 @@ static void __cpuinit setup_APIC_timer(void) 
{

	struct clock_event_device *levt = &__get_cpu_var(lapic_events);



	if (cpu_has(&current_cpu_data, X86_FEATURE_ARAT)) {

		lapic_clockevent.features &= ~CLOCK_EVT_FEAT_C3STOP;

		/* Make LAPIC timer preferrable over percpu HPET */

		lapic_clockevent.rating = 150;

	}



	memcpy(levt, &lapic_clockevent, sizeof(*levt));

	levt->cpumask = cpumask_of(smp_processor_id());

arch/x86/kernel/cpu/addon_cpuid_features.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) 


	static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {

		{ X86_FEATURE_IDA, CR_EAX, 1, 0x00000006 },

		{ X86_FEATURE_ARAT, CR_EAX, 2, 0x00000006 },

		{ 0, 0, 0, 0 }

	};

arch/x86/kernel/cpu/cpufreq/longhaul.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/timex.h>

#include <linux/io.h>

#include <linux/acpi.h>

#include <linux/kernel.h>



#include <asm/msr.h>

#include <acpi/processor.h>

drivers/acpi/acpica/hwvalid.c

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static const struct acpi_port_info acpi_protected_ports[] = { 
	{"PIT2", 0x0048, 0x004B, ACPI_OSI_WIN_XP},

	{"RTC", 0x0070, 0x0071, ACPI_OSI_WIN_XP},

	{"CMOS", 0x0074, 0x0076, ACPI_OSI_WIN_XP},

	{"DMA1", 0x0081, 0x0083, ACPI_OSI_WIN_XP},

	{"DMA1L", 0x0087, 0x0087, ACPI_OSI_WIN_XP},

	{"DMA2", 0x0089, 0x008B, ACPI_OSI_WIN_XP},

	{"DMA2L", 0x008F, 0x008F, ACPI_OSI_WIN_XP},