aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-10-26 08:50:17 -0400
committerIngo Molnar <mingo@kernel.org>2012-10-26 08:50:17 -0400
commit003db633d6f2d3649ea18652a3c55ad17d4f0e47 (patch)
treef72783a5d13fda7ab6f760f2223b9983bacbb5cb /include/linux
parent2ab3f29dddfb444c9fcc0a2f3a56ed4bdba41969 (diff)
parent1462594bf2866c1dc80066ed6f49f4331c551901 (diff)
Merge tag 'mca_cfg' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull x86 RAS changes from Borislav Petkov: "Rework all config variables used throughout the MCA code and collect them together into a mca_config struct. This keeps them tightly and neatly packed together instead of spilled all over the place. Then, convert those which are used as booleans into real booleans and save some space." Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 86ef6ab553b1..50c85a26b003 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -496,6 +496,10 @@ ssize_t device_show_int(struct device *dev, struct device_attribute *attr,
496 char *buf); 496 char *buf);
497ssize_t device_store_int(struct device *dev, struct device_attribute *attr, 497ssize_t device_store_int(struct device *dev, struct device_attribute *attr,
498 const char *buf, size_t count); 498 const char *buf, size_t count);
499ssize_t device_show_bool(struct device *dev, struct device_attribute *attr,
500 char *buf);
501ssize_t device_store_bool(struct device *dev, struct device_attribute *attr,
502 const char *buf, size_t count);
499 503
500#define DEVICE_ATTR(_name, _mode, _show, _store) \ 504#define DEVICE_ATTR(_name, _mode, _show, _store) \
501 struct device_attribute dev_attr_##_name = __ATTR(_name, _mode, _show, _store) 505 struct device_attribute dev_attr_##_name = __ATTR(_name, _mode, _show, _store)
@@ -505,6 +509,9 @@ ssize_t device_store_int(struct device *dev, struct device_attribute *attr,
505#define DEVICE_INT_ATTR(_name, _mode, _var) \ 509#define DEVICE_INT_ATTR(_name, _mode, _var) \
506 struct dev_ext_attribute dev_attr_##_name = \ 510 struct dev_ext_attribute dev_attr_##_name = \
507 { __ATTR(_name, _mode, device_show_int, device_store_int), &(_var) } 511 { __ATTR(_name, _mode, device_show_int, device_store_int), &(_var) }
512#define DEVICE_BOOL_ATTR(_name, _mode, _var) \
513 struct dev_ext_attribute dev_attr_##_name = \
514 { __ATTR(_name, _mode, device_show_bool, device_store_bool), &(_var) }
508#define DEVICE_ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) \ 515#define DEVICE_ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) \
509 struct device_attribute dev_attr_##_name = \ 516 struct device_attribute dev_attr_##_name = \
510 __ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) 517 __ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store)