Index: linux-2.6.16.16/include/linux/ipipe.h
===================================================================
--- linux-2.6.16.16.orig/include/linux/ipipe.h
+++ linux-2.6.16.16/include/linux/ipipe.h
@@ -617,6 +617,7 @@ static inline void ipipe_set_foreign_sta
 {
 	/* Must be called hw interrupts off. */
 	ipipe_declare_cpuid;
+	ipipe_load_cpuid();
 	__set_bit(IPIPE_NOSTACK_FLAG, &ipd->cpudata[cpuid].status);
 }
 
@@ -624,6 +625,7 @@ static inline void ipipe_clear_foreign_s
 {
 	/* Must be called hw interrupts off. */
 	ipipe_declare_cpuid;
+	ipipe_load_cpuid();
 	__clear_bit(IPIPE_NOSTACK_FLAG, &ipd->cpudata[cpuid].status);
 }