The patch titled
revert 'ACPI: Support Processor Native C-state using Intel "mwait" instruction.'
has been removed from the -mm tree. Its filename is
revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: revert 'ACPI: Support Processor Native C-state using Intel "mwait" instruction.'
From: Andrew Morton <akpm@xxxxxxxx>
Cc: "Pallipadi, Venkatesh" <venkatesh.pallipadi@xxxxxxxxx>
Cc: "Brown, Len" <len.brown@xxxxxxxxx>
Cc: "Benoit Boissinot" <bboissin@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/acpi/cstate.c | 129 ------------------
arch/i386/kernel/process.c | 18 --
arch/x86_64/kernel/process.c | 18 --
drivers/acpi/processor_idle.c | 218 +++++++++++++------------------
include/acpi/pdc_intel.h | 9 -
include/acpi/processor.h | 18 --
include/asm-i386/processor.h | 2
include/asm-x86_64/processor.h | 2
8 files changed, 110 insertions(+), 304 deletions(-)
diff -puN arch/i386/kernel/acpi/cstate.c~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction arch/i386/kernel/acpi/cstate.c
--- a/arch/i386/kernel/acpi/cstate.c~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction
+++ a/arch/i386/kernel/acpi/cstate.c
@@ -10,7 +10,6 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/acpi.h>
-#include <linux/cpu.h>
#include <acpi/processor.h>
#include <asm/acpi.h>
@@ -42,131 +41,5 @@ void acpi_processor_power_init_bm_check(
flags->bm_check = 1;
}
}
-EXPORT_SYMBOL(acpi_processor_power_init_bm_check);
-
-/* The code below handles the Native cstate entry (with monitor-mwait pair) */
-
-struct cstate_entry_s {
- struct {
- unsigned int eax;
- unsigned int ecx;
- } states[ACPI_PROCESSOR_MAX_POWER];
-};
-static struct cstate_entry_s *cpu_cstate_entry; /* per CPU ptr */
-
-#define MWAIT_SUBSTATE_MASK (0xf)
-#define MWAIT_SUBSTATE_SIZE (4)
-
-#define CPUID_MWAIT_LEAF (5)
-#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1)
-#define CPUID5_ECX_INTERRUPT_BREAK (0x2)
-
-#define MWAIT_ECX_INTERRUPT_BREAK (0x1)
-
-#define NATIVE_CSTATE_BEYOND_HALT (2)
-
-int acpi_processor_native_cstate_check(unsigned int cpu,
- struct acpi_processor_cx *cx, struct acpi_power_register *reg)
-{
- struct cstate_entry_s *percpu_entry;
- struct cpuinfo_x86 *c = cpu_data + cpu;
-
- cpumask_t saved_mask;
- int retval;
- unsigned int eax, ebx, ecx, edx;
- unsigned int edx_part;
- unsigned int cstate_type; /* C-state type and not ACPI C-state type */
- unsigned int num_cstate_subtype;
-
- if (!cpu_cstate_entry || c->cpuid_level < CPUID_MWAIT_LEAF )
- return -1;
-
- if (reg->bit_offset != NATIVE_CSTATE_BEYOND_HALT)
- return -1;
-
- percpu_entry = per_cpu_ptr(cpu_cstate_entry, cpu);
- percpu_entry->states[cx->index].eax = 0;
- percpu_entry->states[cx->index].ecx = 0;
-
- /* Make sure we are running on right CPU */
- saved_mask = current->cpus_allowed;
- retval = set_cpus_allowed(current, cpumask_of_cpu(cpu));
- if (retval)
- return -1;
-
- cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx);
-
- /* Check whether this particular cx_type (in CST) is supported or not */
- cstate_type = (cx->address >> MWAIT_SUBSTATE_SIZE) + 1;
- edx_part = edx >> (cstate_type * MWAIT_SUBSTATE_SIZE);
- num_cstate_subtype = edx_part & MWAIT_SUBSTATE_MASK;
-
- retval = 0;
- if (num_cstate_subtype < (cx->address & MWAIT_SUBSTATE_MASK)) {
- retval = -1;
- goto out;
- }
-
- /* Use the hint in CST */
- percpu_entry->states[cx->index].eax = cx->address;
-
- /* Check whether this CPU supports mwait ecx extensions */
- if (ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED &&
- ecx & CPUID5_ECX_INTERRUPT_BREAK) {
- percpu_entry->states[cx->index].ecx = MWAIT_ECX_INTERRUPT_BREAK;
- }
-
- printk(KERN_DEBUG "Monitor-Mwait will be used to enter C-%d state\n",
- cx->type);
-
-out:
- set_cpus_allowed(current, saved_mask);
- return retval;
-}
-EXPORT_SYMBOL(acpi_processor_native_cstate_check);
-
-int acpi_processor_native_cstate_enter(struct acpi_processor_cx *cx)
-{
- unsigned int cpu = smp_processor_id();
- struct cstate_entry_s *percpu_entry;
-
- percpu_entry = per_cpu_ptr(cpu_cstate_entry, cpu);
-
- /*
- * Native c-states with monitor-mwait and interrupt break support
- * will treat interrupts as break event, even with interrupts disabled.
- */
- if ((percpu_entry->states[cx->index].ecx & MWAIT_ECX_INTERRUPT_BREAK)) {
- mwait_idle_hints(percpu_entry->states[cx->index].eax,
- percpu_entry->states[cx->index].ecx);
- return 1;
- }
-
- local_irq_enable();
- mwait_idle_hints(percpu_entry->states[cx->index].eax,
- percpu_entry->states[cx->index].ecx);
- return 0;
-}
-EXPORT_SYMBOL(acpi_processor_native_cstate_enter);
-
-static int native_cstate_init(void)
-{
- struct cpuinfo_x86 *c = &boot_cpu_data;
- if (c->x86_vendor != X86_VENDOR_INTEL)
- return -1;
-
- cpu_cstate_entry = alloc_percpu(struct cstate_entry_s);
- return 0;
-}
-
-static void native_cstate_exit(void)
-{
- if (cpu_cstate_entry) {
- free_percpu(cpu_cstate_entry);
- cpu_cstate_entry = NULL;
- }
-}
-
-arch_initcall(native_cstate_init);
-__exitcall(native_cstate_exit);
+EXPORT_SYMBOL(acpi_processor_power_init_bm_check);
diff -puN arch/i386/kernel/process.c~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction arch/i386/kernel/process.c
--- a/arch/i386/kernel/process.c~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction
+++ a/arch/i386/kernel/process.c
@@ -236,23 +236,19 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait);
* through MWAIT. Whenever someone changes need_resched, we would be woken
* up from MWAIT (without an IPI).
*/
-void mwait_idle_hints(unsigned long eax, unsigned long ecx)
+static void mwait_idle(void)
{
- if (!need_resched()) {
+ local_irq_enable();
+
+ while (!need_resched()) {
__monitor((void *)¤t_thread_info()->flags, 0, 0);
smp_mb();
- if (!need_resched())
- __mwait(eax, ecx);
+ if (need_resched())
+ break;
+ __mwait(0, 0);
}
}
-static void mwait_idle(void)
-{
- local_irq_enable();
- while (!need_resched())
- mwait_idle_hints(0, 0);
-}
-
void __devinit select_idle_routine(const struct cpuinfo_x86 *c)
{
if (cpu_has(c, X86_FEATURE_MWAIT)) {
diff -puN arch/x86_64/kernel/process.c~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction arch/x86_64/kernel/process.c
--- a/arch/x86_64/kernel/process.c~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction
+++ a/arch/x86_64/kernel/process.c
@@ -236,23 +236,19 @@ void cpu_idle (void)
* through MWAIT. Whenever someone changes need_resched, we would be woken
* up from MWAIT (without an IPI).
*/
-void mwait_idle_hints(unsigned long eax, unsigned long ecx)
+static void mwait_idle(void)
{
- if (!need_resched()) {
+ local_irq_enable();
+
+ while (!need_resched()) {
__monitor((void *)¤t_thread_info()->flags, 0, 0);
smp_mb();
- if (!need_resched())
- __mwait(eax, ecx);
+ if (need_resched())
+ break;
+ __mwait(0, 0);
}
}
-static void mwait_idle(void)
-{
- local_irq_enable();
- while (!need_resched())
- mwait_idle_hints(0,0);
-}
-
void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
{
static int printed;
diff -puN drivers/acpi/processor_idle.c~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_idle.c~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction
+++ a/drivers/acpi/processor_idle.c
@@ -216,69 +216,6 @@ static void acpi_safe_halt(void)
current_thread_info()->status |= TS_POLLING;
}
-
-static int acpi_cstate_enter(struct acpi_processor_cx *cstate)
-{
- u32 t1, t2 = 0;
- u32 timing_valid = 0, retval = 0xffffffff;
-
- if (cstate->entry_type == ACPI_CSTATE_NATIVE) {
- /* Native C-state */
- /* Get start time (ticks) */
- t1 = inl(acpi_fadt.xpm_tmr_blk.address);
- /* Invoke C-state */
- timing_valid = acpi_processor_native_cstate_enter(cstate);
- if (timing_valid) {
- /* Get end time (ticks) */
- t2 = inl(acpi_fadt.xpm_tmr_blk.address);
- /* Re-enable interrupts */
- local_irq_enable();
- retval = ticks_elapsed(t1, t2);
- }
- return retval;
- } else if (cstate->type == ACPI_STATE_C1) {
- /*
- * Non-native C1-state handling is a special case
- * Invoke C1.
- * Use the appropriate idle routine, the one that would
- * be used without acpi C-states.
- */
- if (pm_idle_save)
- pm_idle_save();
- else
- acpi_safe_halt();
-
- /*
- * TBD: Can't get time duration while in C1, as resumes
- * go to an ISR rather than here. Need to
- * instrument base interrupt handler.
- */
- return retval;
- } else {
- /* Non-native C2, C3, ... states */
- current_thread_info()->status &= ~TS_POLLING;
- smp_mb__after_clear_bit();
- if (need_resched()) {
- current_thread_info()->status |= TS_POLLING;
- local_irq_enable();
- return 0;
- }
-
- /* Get start time (ticks) */
- t1 = inl(acpi_fadt.xpm_tmr_blk.address);
- /* Invoke C2 */
- inb(cstate->address);
- /* Dummy op - must do something useless after P_LVL2 read */
- t2 = inl(acpi_fadt.xpm_tmr_blk.address);
- /* Get end time (ticks) */
- t2 = inl(acpi_fadt.xpm_tmr_blk.address);
- /* Re-enable interrupts */
- local_irq_enable();
- current_thread_info()->status |= TS_POLLING;
- return ticks_elapsed(t1, t2);
- }
-}
-
static atomic_t c3_cpu_count;
static void acpi_processor_idle(void)
@@ -287,6 +224,7 @@ static void acpi_processor_idle(void)
struct acpi_processor_cx *cx = NULL;
struct acpi_processor_cx *next_state = NULL;
int sleep_ticks = 0;
+ u32 t1, t2 = 0;
pr = processors[smp_processor_id()];
if (!pr)
@@ -387,29 +325,59 @@ static void acpi_processor_idle(void)
* ------
* Invoke the current Cx state to put the processor to sleep.
*/
+ if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
+ current_thread_info()->status &= ~TS_POLLING;
+ smp_mb__after_clear_bit();
+ if (need_resched()) {
+ current_thread_info()->status |= TS_POLLING;
+ local_irq_enable();
+ return;
+ }
+ }
+
switch (cx->type) {
case ACPI_STATE_C1:
- /* Invoke C1 */
- sleep_ticks = acpi_cstate_enter(cx);
+ /*
+ * Invoke C1.
+ * Use the appropriate idle routine, the one that would
+ * be used without acpi C-states.
+ */
+ if (pm_idle_save)
+ pm_idle_save();
+ else
+ acpi_safe_halt();
+
+ /*
+ * TBD: Can't get time duration while in C1, as resumes
+ * go to an ISR rather than here. Need to instrument
+ * base interrupt handler.
+ */
+ sleep_ticks = 0xFFFFFFFF;
break;
case ACPI_STATE_C2:
+ /* Get start time (ticks) */
+ t1 = inl(acpi_fadt.xpm_tmr_blk.address);
/* Invoke C2 */
- sleep_ticks = acpi_cstate_enter(cx);
+ inb(cx->address);
+ /* Dummy wait op - must do something useless after P_LVL2 read
+ because chipsets cannot guarantee that STPCLK# signal
+ gets asserted in time to freeze execution properly. */
+ t2 = inl(acpi_fadt.xpm_tmr_blk.address);
+ /* Get end time (ticks) */
+ t2 = inl(acpi_fadt.xpm_tmr_blk.address);
#ifdef CONFIG_GENERIC_TIME
/* TSC halts in C2, so notify users */
mark_tsc_unstable();
#endif
-
- if (sleep_ticks != -1) {
- int overhead = (cx->latency_ticks + C2_OVERHEAD);
- if (sleep_ticks > overhead)
- sleep_ticks -= overhead;
- else
- sleep_ticks = 0;
- }
+ /* Re-enable interrupts */
+ local_irq_enable();
+ current_thread_info()->status |= TS_POLLING;
+ /* Compute time (ticks) that we were actually asleep */
+ sleep_ticks =
+ ticks_elapsed(t1, t2) - cx->latency_ticks - C2_OVERHEAD;
break;
case ACPI_STATE_C3:
@@ -429,29 +397,31 @@ static void acpi_processor_idle(void)
ACPI_FLUSH_CPU_CACHE();
}
+ /* Get start time (ticks) */
+ t1 = inl(acpi_fadt.xpm_tmr_blk.address);
/* Invoke C3 */
- sleep_ticks = acpi_cstate_enter(cx);
-
-#ifdef CONFIG_GENERIC_TIME
- /* TSC halts in C3, so notify users */
- mark_tsc_unstable();
-#endif
-
+ inb(cx->address);
+ /* Dummy wait op (see above) */
+ t2 = inl(acpi_fadt.xpm_tmr_blk.address);
+ /* Get end time (ticks) */
+ t2 = inl(acpi_fadt.xpm_tmr_blk.address);
if (pr->flags.bm_check) {
/* Enable bus master arbitration */
atomic_dec(&c3_cpu_count);
acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0,
- ACPI_MTX_DO_NOT_LOCK);
- }
-
- if (sleep_ticks != -1) {
- int overhead = (cx->latency_ticks + C3_OVERHEAD);
- if (sleep_ticks > overhead)
- sleep_ticks -= overhead;
- else
- sleep_ticks = 0;
+ ACPI_MTX_DO_NOT_LOCK);
}
+#ifdef CONFIG_GENERIC_TIME
+ /* TSC halts in C3, so notify users */
+ mark_tsc_unstable();
+#endif
+ /* Re-enable interrupts */
+ local_irq_enable();
+ current_thread_info()->status |= TS_POLLING;
+ /* Compute time (ticks) that we were actually asleep */
+ sleep_ticks =
+ ticks_elapsed(t1, t2) - cx->latency_ticks - C3_OVERHEAD;
break;
default:
@@ -654,16 +624,20 @@ static int acpi_processor_get_power_info
return 0;
}
-static int acpi_processor_get_power_info_default(struct acpi_processor *pr)
+static int acpi_processor_get_power_info_default_c1(struct acpi_processor *pr)
{
- if (!pr->power.states[ACPI_STATE_C1].valid) {
- /* set the first C-State to C1 */
- /* all processors need to support C1 */
- pr->power.states[ACPI_STATE_C1].type = ACPI_STATE_C1;
- pr->power.states[ACPI_STATE_C1].valid = 1;
- }
- /* the C0 state only exists as a filler in our array */
+
+ /* Zero initialize all the C-states info. */
+ memset(pr->power.states, 0, sizeof(pr->power.states));
+
+ /* set the first C-State to C1 */
+ pr->power.states[ACPI_STATE_C1].type = ACPI_STATE_C1;
+
+ /* the C0 state only exists as a filler in our array,
+ * and all processors need to support C1 */
pr->power.states[ACPI_STATE_C0].valid = 1;
+ pr->power.states[ACPI_STATE_C1].valid = 1;
+
return 0;
}
@@ -680,7 +654,12 @@ static int acpi_processor_get_power_info
if (nocst)
return -ENODEV;
- current_count = 0;
+ current_count = 1;
+
+ /* Zero initialize C2 onwards and prepare for fresh CST lookup */
+ for (i = 2; i < ACPI_PROCESSOR_MAX_POWER; i++)
+ memset(&(pr->power.states[i]), 0,
+ sizeof(struct acpi_processor_cx));
status = acpi_evaluate_object(pr->handle, "_CST", NULL, &buffer);
if (ACPI_FAILURE(status)) {
@@ -735,36 +714,22 @@ static int acpi_processor_get_power_info
(reg->space_id != ACPI_ADR_SPACE_FIXED_HARDWARE))
continue;
+ cx.address = (reg->space_id == ACPI_ADR_SPACE_FIXED_HARDWARE) ?
+ 0 : reg->address;
+
/* There should be an easy way to extract an integer... */
obj = (union acpi_object *)&(element->package.elements[1]);
if (obj->type != ACPI_TYPE_INTEGER)
continue;
cx.type = obj->integer.value;
- /*
- * Some buggy BIOSes won't list C1 in _CST -
- * Let acpi_processor_get_power_info_default() handle them later
- */
- if (i == 1 && cx.type != ACPI_STATE_C1)
- current_count++;
- cx.address = reg->address;
- cx.index = current_count + 1;
+ if ((cx.type != ACPI_STATE_C1) &&
+ (reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO))
+ continue;
- cx.entry_type = ACPI_CSTATE_NONNATIVE;
- if (reg->space_id == ACPI_ADR_SPACE_FIXED_HARDWARE) {
- if (acpi_processor_native_cstate_check
- (pr->id, &cx, reg) == 0) {
- cx.entry_type = ACPI_CSTATE_NATIVE;
- } else if (cx.type != ACPI_STATE_C1) {
- /*
- * C1 is a special case where FIXED_HARDWARE
- * is handled in non-native way.
- * Otherwise, ignore this info and continue.
- */
- continue;
- }
- }
+ if ((cx.type < ACPI_STATE_C2) || (cx.type > ACPI_STATE_C3))
+ continue;
obj = (union acpi_object *)&(element->package.elements[2]);
if (obj->type != ACPI_TYPE_INTEGER)
@@ -798,6 +763,10 @@ static int acpi_processor_get_power_info
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %d power states\n",
current_count));
+ /* Validate number of power states discovered */
+ if (current_count < 2)
+ status = -EFAULT;
+
end:
kfree(buffer.pointer);
@@ -965,15 +934,12 @@ static int acpi_processor_get_power_info
/* NOTE: the idle thread may not be running while calling
* this function */
- /* Zero initialize all the C-states info. */
- memset(pr->power.states, 0, sizeof(pr->power.states));
-
+ /* Adding C1 state */
+ acpi_processor_get_power_info_default_c1(pr);
result = acpi_processor_get_power_info_cst(pr);
if (result == -ENODEV)
acpi_processor_get_power_info_fadt(pr);
- acpi_processor_get_power_info_default(pr);
-
pr->power.count = acpi_processor_power_verify(pr);
/*
diff -puN include/acpi/pdc_intel.h~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction include/acpi/pdc_intel.h
--- a/include/acpi/pdc_intel.h~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction
+++ a/include/acpi/pdc_intel.h
@@ -13,7 +13,6 @@
#define ACPI_PDC_SMP_C_SWCOORD (0x0040)
#define ACPI_PDC_SMP_T_SWCOORD (0x0080)
#define ACPI_PDC_C_C1_FFH (0x0100)
-#define ACPI_PDC_C_C2C3_FFH (0x0200)
#define ACPI_PDC_EST_CAPABILITY_SMP (ACPI_PDC_SMP_C1PT | \
ACPI_PDC_C_C1_HALT | \
@@ -24,10 +23,8 @@
ACPI_PDC_SMP_P_SWCOORD | \
ACPI_PDC_P_FFH)
-#define ACPI_PDC_C_CAPABILITY_SMP (ACPI_PDC_SMP_C2C3 | \
- ACPI_PDC_SMP_C1PT | \
- ACPI_PDC_C_C1_HALT | \
- ACPI_PDC_C_C1_FFH | \
- ACPI_PDC_C_C2C3_FFH)
+#define ACPI_PDC_C_CAPABILITY_SMP (ACPI_PDC_SMP_C2C3 | \
+ ACPI_PDC_SMP_C1PT | \
+ ACPI_PDC_C_C1_HALT)
#endif /* __PDC_INTEL_H__ */
diff -puN include/acpi/processor.h~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction include/acpi/processor.h
--- a/include/acpi/processor.h~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction
+++ a/include/acpi/processor.h
@@ -29,9 +29,6 @@
#define DOMAIN_COORD_TYPE_SW_ANY 0xfd
#define DOMAIN_COORD_TYPE_HW_ALL 0xfe
-#define ACPI_CSTATE_NONNATIVE (0)
-#define ACPI_CSTATE_NATIVE (1)
-
/* Power Management */
struct acpi_processor_cx;
@@ -61,8 +58,6 @@ struct acpi_processor_cx {
u8 valid;
u8 type;
u32 address;
- u8 entry_type;
- u8 index;
u32 latency;
u32 latency_ticks;
u32 power;
@@ -211,9 +206,6 @@ void arch_acpi_processor_init_pdc(struct
#ifdef ARCH_HAS_POWER_INIT
void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
unsigned int cpu);
-int acpi_processor_native_cstate_check(unsigned int cpu,
- struct acpi_processor_cx *cx, struct acpi_power_register *reg);
-int acpi_processor_native_cstate_enter(struct acpi_processor_cx *cstate);
#else
static inline void acpi_processor_power_init_bm_check(struct
acpi_processor_flags
@@ -222,16 +214,6 @@ static inline void acpi_processor_power_
flags->bm_check = 1;
return;
}
-static inline int acpi_processor_native_cstate_check(unsigned int cpu,
- struct acpi_processor_cx *cx, struct acpi_power_register *reg)
-{
- return -1;
-}
-static inline int acpi_processor_native_cstate_enter(
- struct acpi_processor_cx *cstate)
-{
- return 0;
-}
#endif
/* in processor_perflib.c */
diff -puN include/asm-i386/processor.h~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction include/asm-i386/processor.h
--- a/include/asm-i386/processor.h~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction
+++ a/include/asm-i386/processor.h
@@ -312,8 +312,6 @@ static inline void __mwait(unsigned long
: :"a" (eax), "c" (ecx));
}
-extern void mwait_idle_hints(unsigned long eax, unsigned long ecx);
-
/* from system description table in BIOS. Mostly for MCA use, but
others may find it useful. */
extern unsigned int machine_id;
diff -puN include/asm-x86_64/processor.h~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction include/asm-x86_64/processor.h
--- a/include/asm-x86_64/processor.h~revert-acpi-support-processor-native-c-state-using-intel-mwait-instruction
+++ a/include/asm-x86_64/processor.h
@@ -469,8 +469,6 @@ static inline void __mwait(unsigned long
: :"a" (eax), "c" (ecx));
}
-extern void mwait_idle_hints(unsigned long eax, unsigned long ecx);
-
#define stack_current() \
({ \
struct thread_info *ti; \
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
zvc-scale-thresholds-depending-on-the-size-of-the-system.patch
x86-increase-max_mp_busses-on-default-arch.patch
git-acpi.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
git-alsa.patch
kauditd_thread-warning-fix.patch
git-block-fixup.patch
revert-gregkh-driver-class_device_rename-remove.patch
revert-gregkh-driver-network-class_device-to-device.patch
revert-gregkh-driver-tty-device.patch
revert-gregkh-driver-mem-devices.patch
drivers-base-check-errors.patch
scsi-device_reprobe-can-fail.patch
git-drm.patch
git-gfs2.patch
git-ia64.patch
git-ieee1394-fixup.patch
git-input.patch
git-intelfb-fixup.patch
git-kbuild.patch
git-libata-all.patch
asus-mv-device-ids.patch
1-of-2-jmicron-driver-fix.patch
via-pata-controller-xfer-fixes-fix.patch
git-netdev-all.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
git-net.patch
git-net-fixup.patch
git-nfs.patch
git-nfs-fixup.patch
git-pcmcia-fixup.patch
git-powerpc.patch
git-sas.patch
git-block-vs-git-sas.patch
tickle-nmi-watchdog-on-serial-output-fix.patch
serial-fix-uart_bug_txen-test.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-scsi-misc.patch
revert-scsi-improve-inquiry-printing.patch
fix-panic-when-reinserting-adaptec-pcmcia-scsi-card.patch
git-scsi-target-fixup.patch
git-scsi-target-vs-git-block.patch
usb-hub-driver-improve-use-of-ifdef-fix.patch
gregkh-usb-usb-storage-add-rio-karma-eject-support-fix.patch
pm-usb-hcds-use-pm_event_prethaw-fix.patch
rtl8150_disconnect-needs-tasklet_kill.patch
git-supertrak-fixup.patch
git-watchdog.patch
kthread-airoc.patch
mm-x86_64-mm-generic-getcpu-syscall-tweaks.patch
revert-x86_64-mm-i386-remove-lock-section.patch
revert-x86_64-mm-detect-cfi.patch
git-cryptodev-fixup.patch
git-cryptodev-fixup-2.patch
adix-tree-rcu-lockless-readside-update-tidy.patch
mm-tracking-shared-dirty-pages-checks.patch
mm-tracking-shared-dirty-pages-wimp.patch
convert-i386-numa-kva-space-to-bootmem-tidy.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem-tidy.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-cleanup.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-fix.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix.patch
out-of-memory-notifier-tidy.patch
mm-swap-write-failure-fixup-fix.patch
slab-optimize-kmalloc_node-the-same-way-as-kmalloc-fix.patch
slab-fix-lockdep-warnings-fix-2.patch
have-x86-use-add_active_range-and-free_area_init_nodes-fix.patch
zone_reclaim-dynamic-slab-reclaim-tidy.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
tiacx-build-fix.patch
selinux-2-3-change-isec-semaphore-to-a-mutex-vs-git-net.patch
binfmt_elf-consistently-use-loff_t.patch
convert-i386-summit-subarch-to-use-srat-info-for-apicid_to_node-calls-tidy.patch
i386-adds-smp_call_function_single-fix.patch
swsusp-write-timer.patch
swsusp-write-speedup.patch
swsusp-read-timer.patch
swsusp-read-speedup.patch
swsusp-read-speedup-fix.patch
swsusp-read-speedup-cleanup.patch
swsusp-read-speedup-cleanup-2.patch
swsusp-read-speedup-fix-fix-2.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
inode_diet-replace-inodeugeneric_ip-with-inodei_private-gfs-fix.patch
x86-microcode-microcode-driver-cleanup-tidy.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
add-address_space_operationsbatch_write-fix.patch
alloc_fdtable-cleanup.patch
sysctl-allow-proc-sys-without-sys_sysctl-fix.patch
add-probe_kernel_address.patch
x86-use-probe_kernel_address-in-handle_bug.patch
blockdevc-check-errors.patch
let-warn_on-warn_on_once-return-the-condition-fix.patch
let-warn_on-warn_on_once-return-the-condition-fix-2.patch
omap-add-watchdog-driver-support-tweaks.patch
move-valid_dma_direction-from-x86_64-to-generic-code-fix.patch
single-bit-flip-detector-tidy.patch
fix-unserialized-task-files-changing-fix.patch
tty-make-termios_sem-a-mutex-fix.patch
solaris-emulation-incorrect-tty-locking-fix.patch
solaris-emulation-incorrect-tty-locking-fix-2.patch
remove-sound-oss-copying.patch
maximum-latency-tracking-infrastructure-tidy.patch
fs-nameic-replace-multiple-current-fs-by-shortcut-variable-tidy.patch
ntp-move-all-the-ntp-related-code-to-ntpc-fix.patch
reiserfs-on-demand-bitmap-loading.patch
streamline-generic_file_-interfaces-and-filemap-gfs-fix.patch
add-vector-aio-support-fix.patch
csa-basic-accounting-over-taskstats-fix.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
nfs-use-local-caching-12-fix.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch
generic-ioremap_page_range-x86_64-conversion-fix.patch
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch
some-cleanup-in-the-pipe-code-tidy.patch
support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.patch
move-pidmap-to-pspaceh-fix.patch
isdn-work-around-excessive-udelay.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes-tidy.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes-fix.patch
knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-fix.patch
knfsd-have-ext2-reject-file-handles-with-bad-inode-numbers-early-tidy.patch
knfsd-make-ext3-reject-filehandles-referring-to-invalid-inode-numbers-tidy.patch
knfsd-drop-serv-option-to-svc_recv-and-svc_process-nfs-callback-fix-nfs-callback-fix.patch
knfsd-move-tempsock-aging-to-a-timer-tidy.patch
sched-remove-unnecessary-sched-group-allocations-fix.patch
swap_prefetch-vs-zoned-counters.patch
ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-get_sb_dev-fix.patch
make-kmem_cache_destroy-return-void-ecryptfs.patch
namespaces-add-nsproxy.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch
ipc-namespace-core.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
make-kmem_cache_destroy-return-void-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
reiser4-rename-generic_sounding_globalspatch-fix.patch
hpt3xx-rework-rate-filtering-tidy.patch
asus-mv-ide-device-ids.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-msi-only-build-msi-apicc-on-ia64-fix.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-fix.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-warning-fix.patch
add-hypertransport-capability-defines-fix.patch
initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch
srcu-report-out-of-memory-errors-fixlet.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
restore-rogue-readahead-printk.patch
input_register_device-debug.patch
put_bh-debug.patch
acpi_format_exception-debug.patch
jmicron-warning-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
