fix up weak symbol issue with queue-5.10/x86-bugs-add-a-transient-scheduler-attacks...

diff --git a/queue-5.10/x86-bugs-add-a-transient-scheduler-attacks-mitigation.patch b/queue-5.10/x86-bugs-add-a-transient-scheduler-attacks-mitigation.patch
index a9d15bb3c2c533164ae522dbd15cedeef54ec5da..104c02b07095c37539bf72c54c00e21610847c9a 100644 (file)
--- a/queue-5.10/x86-bugs-add-a-transient-scheduler-attacks-mitigation.patch
+++ b/queue-5.10/x86-bugs-add-a-transient-scheduler-attacks-mitigation.patch
@@ -32,9 +32,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  arch/x86/kernel/cpu/common.c                       |   14 ++
  arch/x86/kernel/cpu/scattered.c                    |    2 
  arch/x86/kvm/svm/vmenter.S                         |    3 
- drivers/base/cpu.c                                 |    2 
+ drivers/base/cpu.c                                 |    7 +
  include/linux/cpu.h                                |    1 
- 14 files changed, 252 insertions(+), 5 deletions(-)
+ 14 files changed, 257 insertions(+), 5 deletions(-)
 
 --- a/Documentation/ABI/testing/sysfs-devices-system-cpu
 +++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -483,7 +483,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  1:    vmload %_ASM_AX
 --- a/drivers/base/cpu.c
 +++ b/drivers/base/cpu.c
-@@ -618,6 +618,7 @@ static DEVICE_ATTR(gather_data_sampling,
+@@ -603,6 +603,11 @@ ssize_t __weak cpu_show_indirect_target_
+       return sysfs_emit(buf, "Not affected\n");
+ }
+ 
++ssize_t __weak cpu_show_tsa(struct device *dev, struct device_attribute *attr, char *buf)
++{
++      return sysfs_emit(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);
+@@ -618,6 +623,7 @@ static DEVICE_ATTR(gather_data_sampling,
  static DEVICE_ATTR(spec_rstack_overflow, 0444, cpu_show_spec_rstack_overflow, NULL);
  static DEVICE_ATTR(reg_file_data_sampling, 0444, cpu_show_reg_file_data_sampling, NULL);
  static DEVICE_ATTR(indirect_target_selection, 0444, cpu_show_indirect_target_selection, NULL);
@@ -491,7 +503,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  static struct attribute *cpu_root_vulnerabilities_attrs[] = {
        &dev_attr_meltdown.attr,
-@@ -635,6 +636,7 @@ static struct attribute *cpu_root_vulner
+@@ -635,6 +641,7 @@ static struct attribute *cpu_root_vulner
        &dev_attr_spec_rstack_overflow.attr,
        &dev_attr_reg_file_data_sampling.attr,
        &dev_attr_indirect_target_selection.attr,