public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	tglx@linutronix.de, sivanich@sgi.com, mingo@elte.hu
Subject: [tip:x86/uv] x86: UV, SGI RTC: add generic system vector, build fix on UP
Date: Thu, 5 Mar 2009 14:18:48 GMT	[thread overview]
Message-ID: <tip-b2b352590d94651579e6914ecdb08d30b2cb5f19@git.kernel.org> (raw)
In-Reply-To: <20090304185605.GA24419@sgi.com>

Commit-ID:  b2b352590d94651579e6914ecdb08d30b2cb5f19
Gitweb:     http://git.kernel.org/tip/b2b352590d94651579e6914ecdb08d30b2cb5f19
Author:     "Ingo Molnar" <mingo@elte.hu>
AuthorDate: Thu, 5 Mar 2009 15:15:44 +0100
Commit:     Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 5 Mar 2009 15:15:56 +0100

x86: UV, SGI RTC: add generic system vector, build fix on UP

Make ack_APIC_irq() build on !SMP && !APIC too.

Cc: Dimitri Sivanich <sivanich@sgi.com>
LKML-Reference: <20090304185605.GA24419@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/x86/include/asm/apic.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 4ef949c..394d177 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -379,6 +379,7 @@ static inline u32 safe_apic_wait_icr_idle(void)
 
 static inline void ack_APIC_irq(void)
 {
+#ifdef CONFIG_X86_LOCAL_APIC
 	/*
 	 * ack_APIC_irq() actually gets compiled as a single instruction
 	 * ... yummie.
@@ -386,6 +387,7 @@ static inline void ack_APIC_irq(void)
 
 	/* Docs say use 0 for future compatibility */
 	apic_write(APIC_EOI, 0);
+#endif
 }
 
 static inline unsigned default_get_apic_id(unsigned long x)

  parent reply	other threads:[~2009-03-05 14:19 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-04 18:54 [PATCH 0/3 v7] SGI RTC: add UV RTC clocksource/clockevents and generic system vector Dimitri Sivanich
2009-03-04 18:56 ` [PATCH 1/3 v7] SGI RTC: add " Dimitri Sivanich
2009-03-04 18:57   ` [PATCH 2/3 v7] SGI RTC: loop through installed UV blades Dimitri Sivanich
2009-03-04 18:59     ` [PATCH 3/3 v7] SGI RTC: add UV RTC clocksource/clockevents Dimitri Sivanich
2009-03-04 19:48       ` [tip:x86/uv] x86: UV, " Dimitri Sivanich
2009-03-04 19:48     ` [tip:x86/uv] x86: UV, SGI RTC: loop through installed UV blades Dimitri Sivanich
2009-03-04 19:48   ` [tip:x86/uv] x86: UV, SGI RTC: add generic system vector Dimitri Sivanich
2009-03-05 14:18   ` Ingo Molnar [this message]
2009-03-04 19:46 ` [PATCH 0/3 v7] SGI RTC: add UV RTC clocksource/clockevents and " Ingo Molnar
2009-03-04 20:45   ` [PATCH 4/3 v7] SGI RTC: fix uv_time for UP Dimitri Sivanich
2009-03-04 20:58     ` Ingo Molnar
2009-03-04 22:02       ` Dimitri Sivanich
2009-03-05 10:26         ` Ingo Molnar
2009-03-05 10:30         ` [tip:x86/uv] x86: UV, SGI RTC: fix uv_time.c " Dimitri Sivanich

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-b2b352590d94651579e6914ecdb08d30b2cb5f19@git.kernel.org \
    --to=mingo@elte.hu \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=sivanich@sgi.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox