diff options
| author | Jean-Francois Deverge <jean-francoisx.deverge@intel.com> | 2017-05-31 15:41:35 +0200 |
|---|---|---|
| committer | Bertolin, PierreX <pierrex.bertolin@intel.com> | 2017-06-27 01:44:29 -0700 |
| commit | 3b640c4aa09f040078d5fbb83fee5095092056a0 (patch) | |
| tree | de206265d3202169d5457a333bc99e3c5860241a | |
| parent | ea16806372ba026c928e56151abf218a091b9577 (diff) | |
| download | x86-3b640c4aa09f040078d5fbb83fee5095092056a0.tar.gz | |
power: enable SUSPEND_TIME to i386_mrfl_defconfig
Change-Id: I91b625a01dbde594422e065b0d570e0057eb147a
Tracked-On: https://jira01.devtools.intel.com/browse/AW-5794
Signed-off-by: Jean-Francois Deverge <jean-francoisx.deverge@intel.com>
Reviewed-on: https://android.intel.com/585597
Reviewed-by: Chaumette, HubertX <hubertx.chaumette@intel.com>
Reviewed-by: Dubray, SimonX <simonx.dubray@intel.com>
Reviewed-by: Wyper, AndrewX <andrewx.wyper@intel.com>
Reviewed-by: Jacquet, CyrilX <cyrilx.jacquet@intel.com>
Reviewed-by: Lachaud, EtienneX <etiennex.lachaud@intel.com>
Reviewed-by: Tasayco Loarte, VictorX <victorx.tasayco.loarte@intel.com>
| -rw-r--r-- | arch/x86/configs/i386_mrfl_defconfig | 1 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_mrfl_defconfig | 1 | ||||
| -rw-r--r-- | kernel/power/suspend_time.c | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/configs/i386_mrfl_defconfig b/arch/x86/configs/i386_mrfl_defconfig index 80da93348015..2d5bf94dd9d1 100644 --- a/arch/x86/configs/i386_mrfl_defconfig +++ b/arch/x86/configs/i386_mrfl_defconfig @@ -548,6 +548,7 @@ CONFIG_PM_SLEEP_DEBUG=y # CONFIG_DPM_WATCHDOG is not set # CONFIG_PM_TRACE_RTC is not set CONFIG_PM_CLK=y +CONFIG_SUSPEND_TIME=y # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set # CONFIG_ACPI is not set CONFIG_SFI=y diff --git a/arch/x86/configs/x86_64_mrfl_defconfig b/arch/x86/configs/x86_64_mrfl_defconfig index 0d0471b075b9..44f014de6c63 100644 --- a/arch/x86/configs/x86_64_mrfl_defconfig +++ b/arch/x86/configs/x86_64_mrfl_defconfig @@ -540,6 +540,7 @@ CONFIG_PM_SLEEP_DEBUG=y # CONFIG_DPM_WATCHDOG is not set # CONFIG_PM_TRACE_RTC is not set CONFIG_PM_CLK=y +CONFIG_SUSPEND_TIME=y # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set # CONFIG_ACPI is not set CONFIG_SFI=y diff --git a/kernel/power/suspend_time.c b/kernel/power/suspend_time.c index d2a65da9f22c..9d65929bd114 100644 --- a/kernel/power/suspend_time.c +++ b/kernel/power/suspend_time.c @@ -21,6 +21,7 @@ #include <linux/seq_file.h> #include <linux/syscore_ops.h> #include <linux/time.h> +#include <linux/module.h> static struct timespec suspend_time_before; static unsigned int time_in_suspend_bins[32]; @@ -57,7 +58,7 @@ static int __init suspend_time_debug_init(void) { struct dentry *d; - d = debugfs_create_file("suspend_time", 0755, NULL, NULL, + d = debugfs_create_file("suspend_time", 0444, NULL, NULL, &suspend_time_debug_fops); if (!d) { pr_err("Failed to create suspend_time debug file\n"); |