diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-28 13:03:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-28 13:03:20 +1000 |
| commit | 273ff0fc385a9fe3a52ced79b3348be185fa5459 (patch) | |
| tree | 3b1425997a370b4a0a7779f674b353b2df6bdd96 /include | |
| parent | ff548bb4636a7c859a67b4ed5f864cb4b5f24560 (diff) | |
| parent | f8d5549df25e3961d6bd2ae36d3e0b08614660d9 (diff) | |
Merge remote-tracking branch 'edac-amd/for-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/edac.h | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/include/linux/edac.h b/include/linux/edac.h index 5b6adf964248..8ae0f45fafd6 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -28,12 +28,10 @@ struct device; #define EDAC_OPSTATE_INT 2 extern int edac_op_state; -extern int edac_err_assert; -extern atomic_t edac_handlers; -extern int edac_handler_set(void); -extern void edac_atomic_assert_error(void); -extern struct bus_type *edac_get_sysfs_subsys(void); +struct bus_type *edac_get_sysfs_subsys(void); +int edac_get_report_status(void); +void edac_set_report_status(int new); enum { EDAC_REPORTING_ENABLED, @@ -41,28 +39,6 @@ enum { EDAC_REPORTING_FORCE }; -extern int edac_report_status; -#ifdef CONFIG_EDAC -static inline int get_edac_report_status(void) -{ - return edac_report_status; -} - -static inline void set_edac_report_status(int new) -{ - edac_report_status = new; -} -#else -static inline int get_edac_report_status(void) -{ - return EDAC_REPORTING_DISABLED; -} - -static inline void set_edac_report_status(int new) -{ -} -#endif - static inline void opstate_init(void) { switch (edac_op_state) { |