diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-10-28 12:38:26 +0100 |
commit | 65133033ee6ee34724ea3d82d5d1cfc6839ffdae (patch) | |
tree | 2fca9fd5630bbfd503a75e3cc69f30056a629c92 /drivers/base/core.c | |
parent | 27a0a90d6301dd883a748538e4db692a5fb923e1 (diff) | |
parent | 652521d460cbfa24ef27717b4b28acfac4281be6 (diff) |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r-- | drivers/base/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 2db62d98e395..7bd9cd366d41 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -9,6 +9,7 @@ */ #include <linux/acpi.h> +#include <linux/cpufreq.h> #include <linux/device.h> #include <linux/err.h> #include <linux/fwnode.h> @@ -3179,6 +3180,8 @@ void device_shutdown(void) wait_for_device_probe(); device_block_probing(); + cpufreq_suspend(); + spin_lock(&devices_kset->list_lock); /* * Walk the devices list backward, shutting down each in turn. |