diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-14 15:19:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-14 15:19:11 -0400 |
| commit | 7b764cedcb1a04e795795dd0fa38570467583be3 (patch) | |
| tree | e50d5e6d1dd212e852f148e8f058d157e9c52dd7 /drivers | |
| parent | 26c923ab196601011b6dd51088f47ed840e7b666 (diff) | |
| parent | 262e681183ddcdb24d64a2f993e41a226adcec29 (diff) | |
Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RAS fixes from Ingo Molnar:
"A boot parameter fix, plus a header export fix"
* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Hide mca_cfg
RAS/CEC: Use the right length for "cec_disable"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ras/cec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c index d0e5d6ee882c..e2c1988cd7c0 100644 --- a/drivers/ras/cec.c +++ b/drivers/ras/cec.c @@ -523,7 +523,7 @@ int __init parse_cec_param(char *str) if (*str == '=') str++; - if (!strncmp(str, "cec_disable", 7)) + if (!strcmp(str, "cec_disable")) ce_arr.disabled = 1; else return 0; |