From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: bp@suse.de, linux-kernel@vger.kernel.org, tglx@linutronix.de,
hpa@zytor.com, mingo@kernel.org
Subject: [tip:ras/urgent] x86/mce: Hide mca_cfg
Date: Thu, 5 Oct 2017 05:28:10 -0700 [thread overview]
Message-ID: <tip-262e681183ddcdb24d64a2f993e41a226adcec29@git.kernel.org> (raw)
In-Reply-To: <20171002092836.22971-3-bp@alien8.de>
Commit-ID: 262e681183ddcdb24d64a2f993e41a226adcec29
Gitweb: https://git.kernel.org/tip/262e681183ddcdb24d64a2f993e41a226adcec29
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 2 Oct 2017 11:28:36 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 5 Oct 2017 14:23:06 +0200
x86/mce: Hide mca_cfg
Now that lguest is gone, put it in the internal header which should be
used only by MCA/RAS code.
Add missing header guards while at it.
No functional change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20171002092836.22971-3-bp@alien8.de
---
arch/x86/include/asm/mce.h | 1 -
arch/x86/kernel/cpu/mcheck/mce-internal.h | 7 +++++++
arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 1812649..8edac1d 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -187,7 +187,6 @@ struct mca_msr_regs {
extern struct mce_vendor_flags mce_flags;
-extern struct mca_config mca_cfg;
extern struct mca_msr_regs msr_ops;
enum mce_notifier_prios {
diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h
index 098530a..debb974 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-internal.h
+++ b/arch/x86/kernel/cpu/mcheck/mce-internal.h
@@ -1,3 +1,6 @@
+#ifndef __X86_MCE_INTERNAL_H__
+#define __X86_MCE_INTERNAL_H__
+
#include <linux/device.h>
#include <asm/mce.h>
@@ -108,3 +111,7 @@ static inline void mce_work_trigger(void) { }
static inline void mce_register_injector_chain(struct notifier_block *nb) { }
static inline void mce_unregister_injector_chain(struct notifier_block *nb) { }
#endif
+
+extern struct mca_config mca_cfg;
+
+#endif /* __X86_MCE_INTERNAL_H__ */
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 40e28ed..486f640 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -28,6 +28,8 @@
#include <asm/msr.h>
#include <asm/trace/irq_vectors.h>
+#include "mce-internal.h"
+
#define NR_BLOCKS 5
#define THRESHOLD_MAX 0xFFF
#define INT_TYPE_APIC 0x00020000
prev parent reply other threads:[~2017-10-05 12:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-02 9:28 [PATCH 0/2] RAS: two fixlets Borislav Petkov
2017-10-02 9:28 ` [PATCH 1/2] RAS/CEC: Use the right length for "cec_disable" Borislav Petkov
2017-10-02 15:42 ` Thomas Gleixner
2017-10-03 9:04 ` Borislav Petkov
2017-10-07 14:29 ` Nicolas Iooss
2017-10-02 9:28 ` [PATCH 2/2] x86/mce: Hide mca_cfg Borislav Petkov
2017-10-05 12:28 ` tip-bot for Borislav Petkov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-262e681183ddcdb24d64a2f993e41a226adcec29@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.