summaryrefslogtreecommitdiff
path: root/include/linux/cpu.h
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-11-22 03:06:46 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-11-22 03:06:45 -0800
commitee5ed64f739b51590ac586f8386f90f75b4777d3 (patch)
tree0f27b4f5b70cb27205462de34562beb627597847 /include/linux/cpu.h
parentee4cdc8d6314c7fbcc487a9901c550f1beb82da3 (diff)
parentacd0aacb7e54796116ea6964c17e8874376dbe34 (diff)
Merge "Merge android-4.4-p.202 (a4d443b7) into msm-4.4"
Diffstat (limited to 'include/linux/cpu.h')
-rw-r--r--include/linux/cpu.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 960f2750bc42..1945aa03a52a 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -65,6 +65,11 @@ 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 ssize_t cpu_show_tsx_async_abort(struct device *dev,
+ struct device_attribute *attr,
+ char *buf);
+extern ssize_t cpu_show_itlb_multihit(struct device *dev,
+ struct device_attribute *attr, char *buf);
extern __printf(4, 5)
struct device *cpu_device_create(struct device *parent, void *drvdata,