diff --git a/[refs] b/[refs]
index 5c7684052eba..1b19a0daaf99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d89cfe7f1e82d758a7983584c1593795d4e2c098
+refs/heads/master: 3283a67d8618c9a292eced23e8753ab64adc6dba
diff --git a/trunk/arch/ia64/kernel/gate.lds.S b/trunk/arch/ia64/kernel/gate.lds.S
index e1e4aba9ecd0..7c99e6ec3daf 100644
--- a/trunk/arch/ia64/kernel/gate.lds.S
+++ b/trunk/arch/ia64/kernel/gate.lds.S
@@ -59,6 +59,7 @@ SECTIONS
 	*(.dynbss)
 	*(.bss .bss.* .gnu.linkonce.b.*)
 	*(__ex_table)
+	*(__mca_table)
   }
 }
 
diff --git a/trunk/include/asm-ia64/asmmacro.h b/trunk/include/asm-ia64/asmmacro.h
index d4cec32083d8..edf2cebb2969 100644
--- a/trunk/include/asm-ia64/asmmacro.h
+++ b/trunk/include/asm-ia64/asmmacro.h
@@ -38,6 +38,10 @@
 
 /*
  * Helper macros for accessing user memory.
+ *
+ * When adding any new .section/.previous entries here, make sure to
+ * also add it to the DISCARD section in arch/ia64/kernel/gate.lds.S or
+ * unpleasant things will happen.
  */
 
 	.section "__ex_table", "a"		// declare section & section attributes