diff --git a/[refs] b/[refs]
index 35e67d33d816..6d5e5a2977b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8bebe2f71d26871b0970ae1d9cf0ed3cdd9569d
+refs/heads/master: 2faa4cf76e7d229016240b79b50a43d81f458323
diff --git a/trunk/include/linux/elfcore.h b/trunk/include/linux/elfcore.h
index e687bc3ba4da..394a3e0e4a6b 100644
--- a/trunk/include/linux/elfcore.h
+++ b/trunk/include/linux/elfcore.h
@@ -150,8 +150,6 @@ static inline int elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregse
 }
 #endif
 
-#endif /* __KERNEL__ */
-
 /*
  * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out
  * extra segments containing the gate DSO contents.  Dumping its
@@ -168,4 +166,6 @@ extern int
 elf_core_write_extra_data(struct file *file, size_t *size, unsigned long limit);
 extern size_t elf_core_extra_data_size(void);
 
+#endif /* __KERNEL__ */
+
 #endif /* _LINUX_ELFCORE_H */