summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-06-27 17:35:41 +0200
committerWill Deacon <will.deacon@arm.com>2017-06-29 10:48:57 +0100
commit0607512d0a8d7fac86667466b884095e04b10a59 (patch)
tree22ba3897b21e4790621e1ae7b5808f35f9369d69
parent3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb (diff)
downloadlinux-0607512d0a8d7fac86667466b884095e04b10a59.tar.gz
linux-0607512d0a8d7fac86667466b884095e04b10a59.tar.bz2
linux-0607512d0a8d7fac86667466b884095e04b10a59.zip
ras: mark stub functions as 'inline'
With CONFIG_RAS disabled, we get two harmless warnings about unused functions: include/linux/ras.h:37:13: error: 'log_arm_hw_error' defined but not used [-Werror=unused-function] static void log_arm_hw_error(struct cper_sec_proc_arm *err) { return; } include/linux/ras.h:33:13: error: 'log_non_standard_event' defined but not used [-Werror=unused-function] static void log_non_standard_event(const guid_t *sec_type, Clearly these are meant to be 'inline', like the other stubs in the same header. Fixes: 297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section") Fixes: e9279e83ad1f ("trace, ras: add ARM processor error trace event") Acked-by: Borislav Petkov <bp@suse.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--include/linux/ras.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/ras.h b/include/linux/ras.h
index 7d61863ff265..be5338a35d57 100644
--- a/include/linux/ras.h
+++ b/include/linux/ras.h
@@ -30,11 +30,13 @@ void log_non_standard_event(const guid_t *sec_type,
const u8 sev, const u8 *err, const u32 len);
void log_arm_hw_error(struct cper_sec_proc_arm *err);
#else
-static void log_non_standard_event(const guid_t *sec_type,
- const guid_t *fru_id, const char *fru_text,
- const u8 sev, const u8 *err,
- const u32 len) { return; }
-static void log_arm_hw_error(struct cper_sec_proc_arm *err) { return; }
+static inline void
+log_non_standard_event(const guid_t *sec_type,
+ const guid_t *fru_id, const char *fru_text,
+ const u8 sev, const u8 *err, const u32 len)
+{ return; }
+static inline void
+log_arm_hw_error(struct cper_sec_proc_arm *err) { return; }
#endif
#endif /* __RAS_H__ */