diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-01 11:12:25 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-02-01 11:12:25 +0300 |
| commit | ed5c8c854f2b990dfa4d85c4995d115768a05d3c (patch) | |
| tree | a4a826795ec6784f25bebade98bdb20121d9c211 /arch/x86/kernel/cpu/common.c | |
| parent | 619bd4a71874a8fd78eb6ccf9f272c5e98bcc7b7 (diff) | |
| parent | a2ca3d617944417e9dd5f09fc8a4549cda115f4f (diff) | |
| download | linux-ed5c8c854f2b990dfa4d85c4995d115768a05d3c.tar.xz | |
Merge branch 'linus' into sched/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 3457186275a0..0bdb1ab7d17c 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1224,7 +1224,7 @@ static __init int setup_disablecpuid(char *arg) { int bit; - if (get_option(&arg, &bit) && bit < NCAPINTS*32) + if (get_option(&arg, &bit) && bit >= 0 && bit < NCAPINTS * 32) setup_clear_cpu_cap(bit); else return 0; |