From 984e956b1477f74c083252265c887f39ea17bdd1 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Wed, 12 Jan 2011 02:51:20 -0500 Subject: [PATCH] --- yaml --- r: 230875 b: refs/heads/master c: 956d033fb2eb3f8818260cdf01644bf4dc1a9e33 h: refs/heads/master i: 230873: c17189cafaca6b0c893ec4c666e90ac9cd3eb1b7 230871: 451152726751f280f5a8ba3d29b39aaf8ff63675 v: v3 --- [refs] | 2 +- trunk/drivers/idle/intel_idle.c | 8 ++++++++ trunk/include/linux/cpuidle.h | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f104312d2036..2a3302d8520b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 642f11c53f17aee991d97d14e6922172849ef227 +refs/heads/master: 956d033fb2eb3f8818260cdf01644bf4dc1a9e33 diff --git a/trunk/drivers/idle/intel_idle.c b/trunk/drivers/idle/intel_idle.c index 21d387132dbc..8256309deaad 100644 --- a/trunk/drivers/idle/intel_idle.c +++ b/trunk/drivers/idle/intel_idle.c @@ -81,6 +81,14 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state); static struct cpuidle_state *cpuidle_state_table; +/* + * Set this flag for states where the HW flushes the TLB for us + * and so we don't need cross-calls to keep it consistent. + * If this flag is set, SW flushes the TLB, so even if the + * HW doesn't do the flushing, this flag is safe to use. + */ +#define CPUIDLE_FLAG_TLB_FLUSHED 0x10000 + /* * States are indexed by the cstate number, * which is also the index into the MWAIT hint array. diff --git a/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h index c25295337382..6be722c725d5 100644 --- a/trunk/include/linux/cpuidle.h +++ b/trunk/include/linux/cpuidle.h @@ -49,7 +49,6 @@ struct cpuidle_state { #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */ #define CPUIDLE_FLAG_CHECK_BM (0x02) /* BM activity will exit state */ #define CPUIDLE_FLAG_IGNORE (0x100) /* ignore during this idle period */ -#define CPUIDLE_FLAG_TLB_FLUSHED (0x200) /* tlb will be flushed */ #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)