From 855622dbdae20366a988a6ee698fc7f727e38378 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinder@infradead.org>
Date: Tue, 30 Dec 2008 22:46:36 +0530
Subject: [PATCH] --- yaml --- r: 125411 b: refs/heads/master c:
 ec8c842a524888fdcccece337d91798e3e8af880 h: refs/heads/master i:   125409:
 bc1292702ad3aa40eeeb902fbdbc99a81681cd77   125407:
 d003c0ba72d949a780f48457d35ceddb837977df v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/include/asm/apic.h | 1 -
 trunk/arch/x86/kernel/apic.c      | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5bbaa055f9d1..e309e2ca50d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c62e9d56ea90ef94f9708ce3f11860c20fa5e135
+refs/heads/master: ec8c842a524888fdcccece337d91798e3e8af880
diff --git a/trunk/arch/x86/include/asm/apic.h b/trunk/arch/x86/include/asm/apic.h
index e644bf6f90dc..ab1d51a8855e 100644
--- a/trunk/arch/x86/include/asm/apic.h
+++ b/trunk/arch/x86/include/asm/apic.h
@@ -54,7 +54,6 @@ extern int disable_apic;
 extern int is_vsmp_box(void);
 extern void xapic_wait_icr_idle(void);
 extern u32 safe_xapic_wait_icr_idle(void);
-extern u64 xapic_icr_read(void);
 extern void xapic_icr_write(u32, u32);
 extern int setup_profiling_timer(unsigned int);
 
diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c
index c67722f010bd..66198cbe464d 100644
--- a/trunk/arch/x86/kernel/apic.c
+++ b/trunk/arch/x86/kernel/apic.c
@@ -228,7 +228,7 @@ void xapic_icr_write(u32 low, u32 id)
 	apic_write(APIC_ICR, low);
 }
 
-u64 xapic_icr_read(void)
+static u64 xapic_icr_read(void)
 {
 	u32 icr1, icr2;
 
@@ -268,7 +268,7 @@ void x2apic_icr_write(u32 low, u32 id)
 	wrmsrl(APIC_BASE_MSR + (APIC_ICR >> 4), ((__u64) id) << 32 | low);
 }
 
-u64 x2apic_icr_read(void)
+static u64 x2apic_icr_read(void)
 {
 	unsigned long val;