diff --git a/[refs] b/[refs]
index 126cbac26f8d..ef51b54b2250 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 177a858ff8d71a8e7f8b0ef53ff49441e29c8fb1
+refs/heads/master: f4aa1c30255278b7b50a1cd273c7b4a46f099a90
diff --git a/trunk/include/linux/elf.h b/trunk/include/linux/elf.h
index 0b61ca41a044..45a937be6d38 100644
--- a/trunk/include/linux/elf.h
+++ b/trunk/include/linux/elf.h
@@ -377,6 +377,7 @@ typedef struct elf64_note {
   Elf64_Word n_type;	/* Content type */
 } Elf64_Nhdr;
 
+#ifdef __KERNEL__
 #if ELF_CLASS == ELFCLASS32
 
 extern Elf32_Dyn _DYNAMIC [];
@@ -404,5 +405,5 @@ static inline int elf_coredump_extra_notes_write(struct file *file,
 extern int elf_coredump_extra_notes_size(void);
 extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset);
 #endif
-
+#endif /* __KERNEL__ */
 #endif /* _LINUX_ELF_H */