x86/debug: Include percpu.h in debugreg.h to get DECLARE_PER_CPU() et al
PATCH 1/1 x86/debug: Include percpu.h in debugreg.h to get DECLARE_PER_CPU() et al
Include percpu.h to pick up the definition of DECLARE_PER_CPU() and friends instead of relying on the parent to provide the #include. E.g. swapping the order of includes in arch/x86/kvm/vmx/nested.c (simulating KVM code movement being done for other purposes) results in build errors:
In file included from arch/x86/kvm/vmx/nested.c:3:
arch/x86/include/asm/debugreg.h:9:32: error: unknown type name ‘cpu_dr7’
9 | DECLARE_PER_CPU(unsigned long, cpu_dr7);
| ^~~~~~~--- arch/x86/include/asm/debugreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/debugreg.h +1 -1
@@ -2,8 +2,8 @@#ifndef _ASM_X86_DEBUGREG_H#define _ASM_X86_DEBUGREG_H -#include <linux/bug.h> +#include <linux/percpu.h> #include <uapi/asm/debugreg.h> DECLARE_PER_CPU(unsigned long, cpu_dr7);
base-commit: 7420ae3bb977b46eab082f4964641f3ddc98ebaf
Signature · 1 line
2.38.1.431.g37b22c650d-goog
The following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 2d08a893b87cf9b2f9dbb3afaff60ca4530d55a2 Gitweb: https://git.kernel.org/tip/2d08a893b87cf9b2f9dbb3afaff60ca4530d55a2 Author: Sean Christopherson <[email protected]> AuthorDate: Thu, 10 Nov 2022 20:17:07 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 16 Nov 2022 10:12:56 +01:00
x86/debug: Include percpu.h in debugreg.h to get DECLARE_PER_CPU() et al
Include percpu.h to pick up the definition of DECLARE_PER_CPU() and friends instead of relying on the parent to provide the #include. E.g. swapping the order of includes in arch/x86/kvm/vmx/nested.c (simulating KVM code movement being done for other purposes) results in build errors:
In file included from arch/x86/kvm/vmx/nested.c:3:
arch/x86/include/asm/debugreg.h:9:32: error: unknown type name âcpu_dr7â=99
9 | DECLARE_PER_CPU(unsigned long, cpu_dr7);
| ^~~~~~~--- arch/x86/include/asm/debugreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/debugreg.h +1 -1
@@ -2,8 +2,8 @@#ifndef _ASM_X86_DEBUGREG_H#define _ASM_X86_DEBUGREG_H -#include <linux/bug.h> +#include <linux/percpu.h> #include <uapi/asm/debugreg.h> DECLARE_PER_CPU(unsigned long, cpu_dr7);