]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
powerpc/64: Fix watchdog configuration regressions
authorNicholas Piggin <npiggin@gmail.com>
Mon, 28 Aug 2017 04:27:19 +0000 (14:27 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 31 Aug 2017 04:26:00 +0000 (14:26 +1000)
commit70412c55d419e971785094e9f7880fdbcd690520
tree2b5d1f8c8a49983b361e77f9663f6647de2b8ab6
parentb68b1d7487195d17bdd7e06f183acfb896eafcc7
powerpc/64: Fix watchdog configuration regressions

This fixes a couple more bits of fallout from the new hard lockup watchdog
patch.

It restores the required hw_nmi_get_sample_period() function for the
perf watchdog, and removes some function declarations on 64e that are only
defined for 64s. This fixes the 64e build when the hardlockup detector is
enabled.

It restores the default behaviour of disabling the perf watchdog, and also
fixes disabling the 64s watchdog when running as a guest.

Fixes: 2104180a53 ("powerpc/64s: implement arch-specific hardlockup watchdog")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/include/asm/nmi.h
arch/powerpc/kernel/kvm.c
arch/powerpc/kernel/setup_64.c