From 9258bbe0c4e4116724fd8d373ab019ddcd38a6d8 Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@queued.net>
Date: Wed, 7 May 2008 13:07:37 -0700
Subject: [PATCH] --- yaml --- r: 96345 b: refs/heads/master c:
 547acec7ecc32b14c2740de3f32ce7d1b36a0f69 h: refs/heads/master i:   96343:
 a3a99ef8b1468eacde5c821a7ebf1b72dc670371 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/kernel/geode_32.c | 19 +++++++++++++++++++
 trunk/include/asm-x86/geode.h    | 11 +----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index b6ead440d685..a5a813806895 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac44cc96fbc8f44c056fa37573e8447eec512b10
+refs/heads/master: 547acec7ecc32b14c2740de3f32ce7d1b36a0f69
diff --git a/trunk/arch/x86/kernel/geode_32.c b/trunk/arch/x86/kernel/geode_32.c
index 9dad6ca6cd70..e8edd63ab000 100644
--- a/trunk/arch/x86/kernel/geode_32.c
+++ b/trunk/arch/x86/kernel/geode_32.c
@@ -161,6 +161,25 @@ void geode_gpio_setup_event(unsigned int gpio, int pair, int pme)
 }
 EXPORT_SYMBOL_GPL(geode_gpio_setup_event);
 
+int geode_has_vsa2(void)
+{
+	static int has_vsa2 = -1;
+
+	if (has_vsa2 == -1) {
+		/*
+		 * The VSA has virtual registers that we can query for a
+		 * signature.
+		 */
+		outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);
+		outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX);
+
+		has_vsa2 = (inw(VSA_VRC_DATA) == VSA_SIG);
+	}
+
+	return has_vsa2;
+}
+EXPORT_SYMBOL_GPL(geode_has_vsa2);
+
 static int __init geode_southbridge_init(void)
 {
 	if (!is_geode())
diff --git a/trunk/include/asm-x86/geode.h b/trunk/include/asm-x86/geode.h
index 7154dc4de951..8a53bc817230 100644
--- a/trunk/include/asm-x86/geode.h
+++ b/trunk/include/asm-x86/geode.h
@@ -185,16 +185,7 @@ static inline int is_geode(void)
 	return (is_geode_gx() || is_geode_lx());
 }
 
-/*
- * The VSA has virtual registers that we can query for a signature.
- */
-static inline int geode_has_vsa2(void)
-{
-	outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);
-	outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX);
-
-	return (inw(VSA_VRC_DATA) == VSA_SIG);
-}
+extern int geode_has_vsa2(void);
 
 /* MFGPTs */