2021-07-12 02:51:51

by Michael Kelley (LINUX)

Subject: [PATCH 1/1] asm-generic/hyperv: Add missing #include of nmi.h

The recent move of hv_do_rep_hypercall() to this file adds
a reference to touch_nmi_watchdog(). Its function definition
is included indirectly when compiled on x86, but not when
compiled on ARM64. So add the explicit #include.

No functional change.

Signed-off-by: Michael Kelley <[email protected]>
---
include/asm-generic/mshyperv.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h
index 2a187fe..60cdff3 100644
--- a/include/asm-generic/mshyperv.h
+++ b/include/asm-generic/mshyperv.h
@@ -22,6 +22,7 @@
#include <linux/atomic.h>
#include <linux/bitops.h>
#include <linux/cpumask.h>
+#include <linux/nmi.h>
#include <asm/ptrace.h>
#include <asm/hyperv-tlfs.h>

--
1.8.3.1

2021-07-12 17:28:27

by Wei Liu

Subject: Re: [PATCH 1/1] asm-generic/hyperv: Add missing #include of nmi.h

On Sun, Jul 11, 2021 at 07:50:04PM -0700, Michael Kelley wrote:
> The recent move of hv_do_rep_hypercall() to this file adds
> a reference to touch_nmi_watchdog(). Its function definition
> is included indirectly when compiled on x86, but not when
> compiled on ARM64. So add the explicit #include.
>
> No functional change.
>
> Signed-off-by: Michael Kelley <[email protected]>

Applied to hyperv-next. Thanks.

> ---
> include/asm-generic/mshyperv.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h
> index 2a187fe..60cdff3 100644
> --- a/include/asm-generic/mshyperv.h
> +++ b/include/asm-generic/mshyperv.h
> @@ -22,6 +22,7 @@
> #include <linux/atomic.h>
> #include <linux/bitops.h>
> #include <linux/cpumask.h>
> +#include <linux/nmi.h>
> #include <asm/ptrace.h>
> #include <asm/hyperv-tlfs.h>
>
> --
> 1.8.3.1
>