From 79c8f9d966fe6e8e136dd42fb65254c395dd0988 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Tue, 21 Feb 2006 15:42:09 -0800
Subject: [PATCH] --- yaml --- r: 21514 b: refs/heads/master c:
 6f5374c91f0dd1d92408ed44c066c32bcce5ce69 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/sparc64/kernel/entry.S      | 9 +++++++++
 trunk/include/asm-sparc64/hypervisor.h | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d4b436e99821..311440c9a3b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bd0cd74d102a527b2a72907698d73fad4b82cbd
+refs/heads/master: 6f5374c91f0dd1d92408ed44c066c32bcce5ce69
diff --git a/trunk/arch/sparc64/kernel/entry.S b/trunk/arch/sparc64/kernel/entry.S
index bd332e41532f..9f3048e64e84 100644
--- a/trunk/arch/sparc64/kernel/entry.S
+++ b/trunk/arch/sparc64/kernel/entry.S
@@ -1786,3 +1786,12 @@ sun4v_cpu_qconf:
 	ta	HV_FAST_TRAP
 	retl
 	 nop
+
+	/* returns %o0:	status
+	 */
+	.globl	sun4v_cpu_yield
+sun4v_cpu_yield:
+	mov	HV_FAST_CPU_YIELD, %o5
+	ta	HV_FAST_TRAP
+	retl
+	 nop
diff --git a/trunk/include/asm-sparc64/hypervisor.h b/trunk/include/asm-sparc64/hypervisor.h
index cd5fbcd9556e..726e2ea03ce3 100644
--- a/trunk/include/asm-sparc64/hypervisor.h
+++ b/trunk/include/asm-sparc64/hypervisor.h
@@ -258,6 +258,9 @@
  */
 #define HV_FAST_CPU_YIELD		0x12
 
+#ifndef __ASSEMBLY__
+extern unsigned long sun4v_cpu_yield(void);
+#endif
 
 /* cpu_qconf()
  * TRAP:	HV_FAST_TRAP