Linux virtualization list
 help / color / mirror / Atom feed
From: Ian Campbell <Ian.Campbell@xensource.com>
To: Jeremy Fitzhardinge <jeremy@goop.org>,
	Chris Wright <chrisw@sous-sol.org>
Cc: Virtualization Mailing List <virtualization@lists.osdl.org>
Subject: [PATCH 5/5] XEN: fixup APIC accessors when !CONFIG_X86_LOCAL_APIC
Date: Wed, 23 Aug 2006 16:09:52 +0100	[thread overview]
Message-ID: <1156345792.12949.127.camel@localhost.localdomain> (raw)

OK, not strictly in keeping with the subject of the patch set but I
needed this to build ;-)

Should be merged into 02d-xen-apic-esp0.patch

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff -r 6fdbec59813e arch/i386/paravirt-xen/enlighten.c
--- a/arch/i386/paravirt-xen/enlighten.c	Wed Aug 23 15:08:37 2006 +0100
+++ b/arch/i386/paravirt-xen/enlighten.c	Wed Aug 23 15:08:37 2006 +0100
@@ -310,6 +310,7 @@ static fastcall void xen_io_delay(void)
 {
 }
 
+#ifdef CONFIG_X86_LOCAL_APIC
 static fastcall void xen_apic_write(unsigned long reg, unsigned long v)
 {
 }
@@ -322,6 +323,7 @@ static fastcall unsigned long xen_apic_r
 {
 	return 0;
 }
+#endif
 
 static fastcall void xen_flush_tlb(void)
 {
@@ -422,9 +424,11 @@ static const struct paravirt_ops xen_par
 	.set_wallclock = xen_set_wallclock,
 	.get_wallclock = xen_get_wallclock,
 
+#ifdef CONFIG_X86_LOCAL_APIC
 	.apic_write = xen_apic_write,
 	.apic_write_atomic = xen_apic_write_atomic,
 	.apic_read = xen_apic_read,
+#endif
 
 	.flush_tlb_user = xen_flush_tlb,
 	.flush_tlb_kernel = xen_flush_tlb_global,

                 reply	other threads:[~2006-08-23 15:09 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1156345792.12949.127.camel@localhost.localdomain \
    --to=ian.campbell@xensource.com \
    --cc=chrisw@sous-sol.org \
    --cc=jeremy@goop.org \
    --cc=virtualization@lists.osdl.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