diff options
author | Mark Brown <broonie@kernel.org> | 2018-08-16 15:59:39 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-16 15:59:39 +0100 |
commit | 15b787de81dab9cbbd79764ad4474f1dc214539c (patch) | |
tree | a3fb8d341d31a3b488a528fe10833a8bdf5dfec5 /drivers/base | |
parent | fc4b20b00e122748c61629a0a0d21530ff1ccba8 (diff) | |
parent | 30a97c1e2dc39f45d9deeeccc2733278fc285d5e (diff) |
Merge tag 'v4.4.148' into linux-linaro-lsk-v4.4
This is the 4.4.148 stable release
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/cpu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 143edea1076f..41090ef5facb 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -524,16 +524,24 @@ ssize_t __weak cpu_show_spec_store_bypass(struct device *dev, return sprintf(buf, "Not affected\n"); } +ssize_t __weak cpu_show_l1tf(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "Not affected\n"); +} + static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL); static DEVICE_ATTR(spectre_v2, 0444, cpu_show_spectre_v2, NULL); static DEVICE_ATTR(spec_store_bypass, 0444, cpu_show_spec_store_bypass, NULL); +static DEVICE_ATTR(l1tf, 0444, cpu_show_l1tf, NULL); static struct attribute *cpu_root_vulnerabilities_attrs[] = { &dev_attr_meltdown.attr, &dev_attr_spectre_v1.attr, &dev_attr_spectre_v2.attr, &dev_attr_spec_store_bypass.attr, + &dev_attr_l1tf.attr, NULL }; |