diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:50:48 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:50:48 +0200 |
commit | 2257e268b1154966c5b0141b23695db1043ff39d (patch) | |
tree | dae4b032afb9872568cf7921b39d30c79a6c3fee /arch/x86/events/core.c | |
parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/core.c')
-rw-r--r-- | arch/x86/events/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index ff1ea2fb9705..8e3db8f642a7 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -191,8 +191,8 @@ static void release_pmc_hardware(void) {} static bool check_hw_exists(void) { - u64 val, val_fail, val_new= ~0; - int i, reg, reg_fail, ret = 0; + u64 val, val_fail = -1, val_new= ~0; + int i, reg, reg_fail = -1, ret = 0; int bios_fail = 0; int reg_safe = -1; |