summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-10-01 15:32:59 +0100
committerMark Brown <broonie@kernel.org>2026-10-01 15:32:59 +0100
commita3d2b64449c013ad1bca92964795165f8cddef70 (patch)
tree3855d639eb206207a46b93c6817001a89eb0dce6 /arch/x86/kernel/cpu
parent21b5d0dc111e034071191437b20c14a240fc0c7d (diff)
parentf1850e443b0e4f2429ddf42a8d5033ea54ae8a90 (diff)
downloadlinux-next-a3d2b64449c013ad1bca92964795165f8cddef70.tar.gz
linux-next-a3d2b64449c013ad1bca92964795165f8cddef70.zip
Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/mce/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 39f238952e14..50b1614968be 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -2614,17 +2614,17 @@ static DEVICE_BOOL_ATTR(dont_log_ce, 0644, mca_cfg.dont_log_ce);
static DEVICE_BOOL_ATTR(print_all, 0644, mca_cfg.print_all);
static struct dev_ext_attribute dev_attr_check_interval = {
- __ATTR(check_interval, 0644, device_show_int, store_int_with_restart),
+ __DEVICE_ATTR(check_interval, 0644, device_show_int, store_int_with_restart),
&check_interval
};
static struct dev_ext_attribute dev_attr_ignore_ce = {
- __ATTR(ignore_ce, 0644, device_show_bool, set_ignore_ce),
+ __DEVICE_ATTR(ignore_ce, 0644, device_show_bool, set_ignore_ce),
&mca_cfg.ignore_ce
};
static struct dev_ext_attribute dev_attr_cmci_disabled = {
- __ATTR(cmci_disabled, 0644, device_show_bool, set_cmci_disabled),
+ __DEVICE_ATTR(cmci_disabled, 0644, device_show_bool, set_cmci_disabled),
&mca_cfg.cmci_disabled
};