[tip:,x86/core] x86/debug: Include percpu.h in debugreg.h to get DECLARE_PER_CPU() et al
| Message ID | 166859054557.4906.8309714877801364722.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp44729wru;
Wed, 16 Nov 2022 01:31:39 -0800 (PST)
X-Google-Smtp-Source:
AA0mqf5tzKc2d0qM78mPYZJJnBmUsXLNxV34Lj5rDOlvOKzD5Sp7DpIyAb2/tVFlY3hLNDoMLbA/
X-Received: by 2002:a17:90b:710:b0:20a:2547:907 with SMTP id
s16-20020a17090b071000b0020a25470907mr2914727pjz.37.1668591099538;
Wed, 16 Nov 2022 01:31:39 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1668591099; cv=none;
d=google.com; s=arc-20160816;
b=YZIZtooabqDAcNrOpyU6G5IookGR+iq2PYPGE87YOwB4r5KocjR5AHI/qvqQXIjpJ+
HVDAMdnbdBiN9L7CBJePeKuBZVSNSJpk1feK23XJdnR0lVtQplB8tp4ZPfca4g4DAq7t
CicnQjvH8Xpk+wRiknjPKEsl4kvf/1w0TIHKm7DaWq42wT1eoBNKJjOFRASnAjATDAOm
mtuPhv4nPdVdYgOApTo7A7ue/nUpiDOCabX6MgId+alWo/YQDfB9OTE8GBDIz5Cn+G5Q
vwbu9GGK24g7Ama8OlP+4qmk0IMFbutfkKpvGohhMiH4ZEkrQ89NSyYABfLXOuTTCZfY
Xfiw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:robot-unsubscribe
:robot-id:message-id:mime-version:references:in-reply-to:cc:subject
:to:reply-to:sender:from:dkim-signature:dkim-signature:date;
bh=MrCWOvdxapIC2FhJTIH20tHEZ3kAPRTBVFgIugO7JtY=;
b=gcwgKZ2KuUm8BSyipeVVpbdS4OW1Can1AKHD9pGFVThydLY3J/tVgUQ+m4RDdNqt/f
XthhCZQep5I3sx5REyriF8GOMnjaBCDVHPTyAuDAm/Y4Ve4qwN9UVtDHGJ7JJH0Lgtcs
4DDCIHrbNKqU0F+wvKhnvkZktNOSS2wwBJagrNEr4MdGUa+M4hUPO6okOIca2Jyj34no
wNlqK66X+pRQvCA7quJn/+dlGLrFVOdVAtqSykPeIQraYvR9hCpwkZVRcyDVjuL7RD8h
vZogSyi2hr+NNKNdRK5aBjoxgpkdea493ORVPyhGjNxwptcUYmao84nRIwOlWC0wUrRv
lMOg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=dqAVZi9D;
dkim=neutral (no key) header.i=@linutronix.de;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
u7-20020a17090341c700b00180a7ff784csi16182656ple.360.2022.11.16.01.31.26;
Wed, 16 Nov 2022 01:31:39 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=dqAVZi9D;
dkim=neutral (no key) header.i=@linutronix.de;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229456AbiKPJWs (ORCPT <rfc822;just.gull.subs@gmail.com>
+ 99 others); Wed, 16 Nov 2022 04:22:48 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45176 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231834AbiKPJWi (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 16 Nov 2022 04:22:38 -0500
Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FFD027CF0;
Wed, 16 Nov 2022 01:22:28 -0800 (PST)
Date: Wed, 16 Nov 2022 09:22:25 -0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020; t=1668590546;
h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=MrCWOvdxapIC2FhJTIH20tHEZ3kAPRTBVFgIugO7JtY=;
b=dqAVZi9DRU2H/2zgIHGha9h8egSYldJesAtstY9tX5uKggePerVqA3mtNw40uQxeUrSZ2o
+jnR5eiXw1a2/hCvd8LbqUIno9TwC39bBOj3axYFm+yt+NaMGyIIlDvUgLrNs4LIeCdTGc
Pbj2PMLoeuGdrxR7jItxQ3fWxxNiJoHEv7fgvx7EqrioGF47/XWpyvzhgcgCm4QdbowPa8
qN/tIGn2SNFKWTGFNfWdaUZy8Pn1GAYP0Dyk7GXnLYZyFBvjF5E/h7LqVL3zaqIpXckcIy
Q0bW+NYpf3tAmWoe2HyUGsiOeK873c3Fif2caH2qNTnBgX5O/0udbelWL8k/oQ==
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020e; t=1668590546;
h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=MrCWOvdxapIC2FhJTIH20tHEZ3kAPRTBVFgIugO7JtY=;
b=XgxzFEQFK96juimMW4PuhXvjFoAbPhwmYA77SUhldLsbsdFjHdLWlEbWWASke7KVNVMJpY
UASbDZ/X5Vm9O7Dw==
From: "tip-bot2 for Sean Christopherson" <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To: linux-tip-commits@vger.kernel.org
Subject: [tip: x86/core] x86/debug: Include percpu.h in debugreg.h to get
DECLARE_PER_CPU() et al
Cc: Sean Christopherson <seanjc@google.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>, x86@kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20221110201707.1976032-1-seanjc@google.com>
References: <20221110201707.1976032-1-seanjc@google.com>
MIME-Version: 1.0
Message-ID: <166859054557.4906.8309714877801364722.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from
these emails
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,
SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1749141709224362352?=
X-GMAIL-MSGID: =?utf-8?q?1749644581045047853?=
|
| Series |
[tip:,x86/core] x86/debug: Include percpu.h in debugreg.h to get DECLARE_PER_CPU() et al
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Nov. 16, 2022, 9:22 a.m. UTC
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 <seanjc@google.com>
AuthorDate: Thu, 10 Nov 2022 20:17:07
Committer: Peter Zijlstra <peterz@infradead.org>
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);
| ^~~~~~~
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20221110201707.1976032-1-seanjc@google.com
---
arch/x86/include/asm/debugreg.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/debugreg.h b/arch/x86/include/asm/debugreg.h index cfdf307..b049d95 100644 --- a/arch/x86/include/asm/debugreg.h +++ b/arch/x86/include/asm/debugreg.h @@ -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);