~hc/RK356X_SDK_RELEASE.git

..	..	@@ -489,7 +489,8 @@
489	489	bool cpu_is_hotpluggable(unsigned cpu)
490	490	{
491	491	struct device *dev = get_cpu_device(cpu);
492		- return dev && container_of(dev, struct cpu, dev)->hotpluggable;
	492	+ return dev && container_of(dev, struct cpu, dev)->hotpluggable
	493	+ && tick_nohz_cpu_hotpluggable(cpu);
493	494	}
494	495	EXPORT_SYMBOL_GPL(cpu_is_hotpluggable);
495	496
..	..	@@ -578,6 +579,18 @@
578	579	return sysfs_emit(buf, "Not affected\n");
579	580	}
580	581
	582	+ssize_t __weak cpu_show_gds(struct device *dev,
	583	+ struct device_attribute attr, char buf)
	584	+{
	585	+ return sysfs_emit(buf, "Not affected\n");
	586	+}
	587	+
	588	+ssize_t __weak cpu_show_spec_rstack_overflow(struct device *dev,
	589	+ struct device_attribute attr, char buf)
	590	+{
	591	+ return sysfs_emit(buf, "Not affected\n");
	592	+}
	593	+
581	594	static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL);
582	595	static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL);
583	596	static DEVICE_ATTR(spectre_v2, 0444, cpu_show_spectre_v2, NULL);
..	..	@@ -589,6 +602,8 @@
589	602	static DEVICE_ATTR(srbds, 0444, cpu_show_srbds, NULL);
590	603	static DEVICE_ATTR(mmio_stale_data, 0444, cpu_show_mmio_stale_data, NULL);
591	604	static DEVICE_ATTR(retbleed, 0444, cpu_show_retbleed, NULL);
	605	+static DEVICE_ATTR(gather_data_sampling, 0444, cpu_show_gds, NULL);
	606	+static DEVICE_ATTR(spec_rstack_overflow, 0444, cpu_show_spec_rstack_overflow, NULL);
592	607
593	608	static struct attribute *cpu_root_vulnerabilities_attrs[] = {
594	609	&dev_attr_meltdown.attr,
..	..	@@ -602,6 +617,8 @@
602	617	&dev_attr_srbds.attr,
603	618	&dev_attr_mmio_stale_data.attr,
604	619	&dev_attr_retbleed.attr,
	620	+ &dev_attr_gather_data_sampling.attr,
	621	+ &dev_attr_spec_rstack_overflow.attr,
605	622	NULL
606	623	};
607	624