Hello, On 09/04/2014 11:21 PM, Brian Norris wrote: > From: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx> > > [Upstream commit 43e8317b0bba1d6eb85f38a4a233d82d7c20d732] > > Use the observation that, for platform-dependent sleep states > (PM_SUSPEND_STANDBY, PM_SUSPEND_MEM), a given state is either > always supported or always unsupported and store that information > in pm_states[] instead of calling valid_state() every time we > need to check it. > > Also do not use valid_state() for PM_SUSPEND_FREEZE, which is always > valid, and move the pm_test_level validity check for PM_SUSPEND_FREEZE > directly into enter_state(). > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> > Cc: <stable@xxxxxxxxxxxxxxx> # 3.10+: 27ddcc6596e5: PM / sleep: Add state field to pm_states[] entries > Cc: <stable@xxxxxxxxxxxxxxx> # 3.10+ > --- > This is a backport request for these two commits upstream: > > 27ddcc6596e5 PM / sleep: Add state field to pm_states[] entries > 43e8317b0bba PM / sleep: Use valid_state() for platform-dependent sleep states only > Wouldn't it be cleaner to have 2 separate backports then ? Thanks for the backport anyways. -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html