diff --git a/[refs] b/[refs]
index 62b4b5da63fa..6abbbac32bdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8675b1a454016c7c50215552ea5c5c4a2413fda0
+refs/heads/master: b91691164be174b780f5c1bb145a7ab5d33fce2f
diff --git a/trunk/include/asm-x86_64/pda.h b/trunk/include/asm-x86_64/pda.h
index 36b766cfc4d5..e16d76c9deb0 100644
--- a/trunk/include/asm-x86_64/pda.h
+++ b/trunk/include/asm-x86_64/pda.h
@@ -22,7 +22,7 @@ struct x8664_pda {
 	struct mm_struct *active_mm;
 	int mmu_state;     
 	unsigned apic_timer_irqs;
-} ____cacheline_aligned;
+} ____cacheline_aligned_in_smp;
 
 
 #define IRQSTACK_ORDER 2