summaryrefslogtreecommitdiff
path: root/include/linux/cpu.h
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-05-28 08:37:19 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-05-28 08:37:19 -0700
commit24cedeb24492e76bb8f75c8532c76fe700ff4775 (patch)
treee829dbbc4aa9acfb18713d6bf90de86ccd6a6a10 /include/linux/cpu.h
parent2f6ef8a30b780f020b67bf1be17e1949881f8b02 (diff)
parent780ec0d562724e68ed866498dedc7c2ef229609f (diff)
Merge "Merge android-4.4.180 (71cb827) into msm-4.4"
Diffstat (limited to 'include/linux/cpu.h')
-rw-r--r--include/linux/cpu.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index ec088f5729fb..960f2750bc42 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -63,6 +63,8 @@ extern ssize_t cpu_show_spec_store_bypass(struct device *dev,
struct device_attribute *attr, char *buf);
extern ssize_t cpu_show_l1tf(struct device *dev,
struct device_attribute *attr, char *buf);
+extern ssize_t cpu_show_mds(struct device *dev,
+ struct device_attribute *attr, char *buf);
extern __printf(4, 5)
struct device *cpu_device_create(struct device *parent, void *drvdata,
@@ -312,6 +314,23 @@ bool cpu_wait_death(unsigned int cpu, int seconds);
bool cpu_report_death(void);
#endif /* #ifdef CONFIG_HOTPLUG_CPU */
+/*
+ * These are used for a global "mitigations=" cmdline option for toggling
+ * optional CPU mitigations.
+ */
+enum cpu_mitigations {
+ CPU_MITIGATIONS_OFF,
+ CPU_MITIGATIONS_AUTO,
+};
+
+extern enum cpu_mitigations cpu_mitigations;
+
+/* mitigations=off */
+static inline bool cpu_mitigations_off(void)
+{
+ return cpu_mitigations == CPU_MITIGATIONS_OFF;
+}
+
#define IDLE_START 1
#define IDLE_END 2