diff --git a/[refs] b/[refs]
index 6c2ba7471531..b0b691aef954 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faf80d62e44dc627efb741f48db50c1858d1667c
+refs/heads/master: e9bf0cc7cbfbf3952cdf8028aa0d348d09ecdba1
diff --git a/trunk/include/linux/elfcore.h b/trunk/include/linux/elfcore.h
index 03ec16779802..00d6a68d0421 100644
--- a/trunk/include/linux/elfcore.h
+++ b/trunk/include/linux/elfcore.h
@@ -122,10 +122,9 @@ static inline void elf_core_copy_kernel_regs(elf_gregset_t *elfregs, struct pt_r
 
 static inline int elf_core_copy_task_regs(struct task_struct *t, elf_gregset_t* elfregs)
 {
-#ifdef ELF_CORE_COPY_TASK_REGS
-	
+#if defined (ELF_CORE_COPY_TASK_REGS)
 	return ELF_CORE_COPY_TASK_REGS(t, elfregs);
-#else
+#elif defined (task_pt_regs)
 	elf_core_copy_regs(elfregs, task_pt_regs(t));
 #endif
 	return 0;