From: "Michael S. Tsirkin" <mst@redhat.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Jacob Pan <jacob.jun.pan@intel.com>,
Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>,
Suresh Siddha <suresh.b.siddha@intel.com>,
Joerg Roedel <joerg.roedel@amd.com>,
Yinghai Lu <yinghai@kernel.org>,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
avi@redhat.com, gleb@redhat.com
Subject: [PATCH 3/3] Revert "apic: fix kvm build on UP without IOAPIC"
Date: Sun, 15 Jul 2012 15:56:58 +0300 [thread overview]
Message-ID: <879c167f131de93e1312c321a56444652d9934fc.1342356186.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1342356186.git.mst@redhat.com>
This reverts commit f9808b7fd422b965cea52e05ba470e0a473c53d3.
After commit 'kvm: switch to apic_set_eoi_write, apic_write'
the stubs are no longer needed as kvm does not look at apicdrivers anymore.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
arch/x86/include/asm/apic.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index ff8dff6..839b8f5 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -417,12 +417,7 @@ extern struct apic *apic;
__aligned(sizeof(struct apic *)) \
__section(.apicdrivers) = { &sym1, &sym2 }
-#ifdef CONFIG_X86_LOCAL_APIC
extern struct apic *__apicdrivers[], *__apicdrivers_end[];
-#else
-#define __apicdrivers ((struct apic **)NULL)
-#define __apicdrivers_end ((struct apic **)NULL)
-#endif
/*
* APIC functionality to boot other CPUs - only used on SMP:
--
MST
next prev parent reply other threads:[~2012-07-15 12:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-15 12:56 [PATCH 0/3] make KVM PV use apic through APIs Michael S. Tsirkin
2012-07-15 12:56 ` [PATCH 1/3] apic: add apic_set_eoi_write for PV use Michael S. Tsirkin
2012-07-16 9:25 ` Ingo Molnar
2012-07-15 12:56 ` [PATCH 2/3] kvm: switch to apic_set_eoi_write, apic_write Michael S. Tsirkin
2012-07-15 12:56 ` Michael S. Tsirkin [this message]
2012-07-15 13:06 ` [PATCH 0/3] make KVM PV use apic through APIs Avi Kivity
2012-07-16 9:52 ` Avi Kivity
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=879c167f131de93e1312c321a56444652d9934fc.1342356186.git.mst@redhat.com \
--to=mst@redhat.com \
--cc=avi@redhat.com \
--cc=fernando@oss.ntt.co.jp \
--cc=gleb@redhat.com \
--cc=hpa@zytor.com \
--cc=jacob.jun.pan@intel.com \
--cc=joerg.roedel@amd.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=suresh.b.siddha@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®