diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-31 11:15:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-31 11:15:32 -0700 |
| commit | 18737353cca01db58bb62256338cbb820c310bd7 (patch) | |
| tree | f5a972de403ed3b94a4629dd5994ea5b568e0dd4 /drivers/ras/debugfs.h | |
| parent | 5dad26235c4adde4199c7750c696fd729e5020ae (diff) | |
| parent | a6b227d70d2ad9eb08adc3fe532ebb7ec88ac897 (diff) | |
Merge tag 'edac_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fixes from Borislav Petkov:
- Fix more issues in the AMD FMPM driver
* tag 'edac_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
RAS: Avoid build errors when CONFIG_DEBUG_FS=n
RAS/AMD/FMPM: Safely handle saved records of various sizes
RAS/AMD/FMPM: Avoid NULL ptr deref in get_saved_records()
Diffstat (limited to 'drivers/ras/debugfs.h')
| -rw-r--r-- | drivers/ras/debugfs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ras/debugfs.h b/drivers/ras/debugfs.h index 4749ccdeeba1..5a2f48439258 100644 --- a/drivers/ras/debugfs.h +++ b/drivers/ras/debugfs.h @@ -4,6 +4,10 @@ #include <linux/debugfs.h> +#if IS_ENABLED(CONFIG_DEBUG_FS) struct dentry *ras_get_debugfs_root(void); +#else +static inline struct dentry *ras_get_debugfs_root(void) { return NULL; } +#endif /* DEBUG_FS */ #endif /* __RAS_DEBUGFS_H__ */ |