diff --git a/[refs] b/[refs]
index 2322b283b00d..3908d5568649 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4bea2883974a59ab7a0ac6c01d34f7ae0e8cd8e
+refs/heads/master: 3af6e01e9acfb786c5dd2862f57f206b0b3cb889
diff --git a/trunk/arch/sparc64/kernel/trampoline.S b/trunk/arch/sparc64/kernel/trampoline.S
index 22fb24eac997..b9c9f54b0a00 100644
--- a/trunk/arch/sparc64/kernel/trampoline.S
+++ b/trunk/arch/sparc64/kernel/trampoline.S
@@ -17,6 +17,7 @@
 #include <asm/thread_info.h>
 #include <asm/mmu.h>
 #include <asm/hypervisor.h>
+#include <asm/cpudata.h>
 
 	.data
 	.align	8