summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2023-08-11 04:59:43 +0300
committerJakub Kicinski <kuba@kernel.org>2023-08-11 04:59:43 +0300
commit35f563d61b97f83b8aa9780525ad8da9346ad557 (patch)
tree8372287326637706bd6dc1be5e1525990ef04b2e /include/linux
parent4a8d287909c905107d88a9835141ad592aedae75 (diff)
parent9ebbb29db9cae23e29881b9a268767d4baa53cdb (diff)
downloadlinux-35f563d61b97f83b8aa9780525ad8da9346ad557.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge net again, after pulling in x86/bugs fixes to clang linking errors. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/cpu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 23ac87be1ff1..e006c719182b 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -72,6 +72,8 @@ extern ssize_t cpu_show_retbleed(struct device *dev,
struct device_attribute *attr, char *buf);
extern ssize_t cpu_show_spec_rstack_overflow(struct device *dev,
struct device_attribute *attr, char *buf);
+extern ssize_t cpu_show_gds(struct device *dev,
+ struct device_attribute *attr, char *buf);
extern __printf(4, 5)
struct device *cpu_device_create(struct device *parent, void *drvdata,