diff --git a/[refs] b/[refs]
index f787cf4a6933..4fbeaad0479d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90a4c0f51e8e44111a926be6f4c87af3938a79c3
+refs/heads/master: 4bf1924c008dffdc154f82507b4052e49263a6f4
diff --git a/trunk/arch/x86/um/shared/sysdep/ptrace.h b/trunk/arch/x86/um/shared/sysdep/ptrace.h
index 2bbe1ec2d96a..5ef9344a8b24 100644
--- a/trunk/arch/x86/um/shared/sysdep/ptrace.h
+++ b/trunk/arch/x86/um/shared/sysdep/ptrace.h
@@ -1,6 +1,3 @@
-#ifndef __SYSDEP_X86_PTRACE_H
-#define __SYSDEP_X86_PTRACE_H
-
 #ifdef __i386__
 #include "ptrace_32.h"
 #else
@@ -11,5 +8,3 @@ static inline long regs_return_value(struct uml_pt_regs *regs)
 {
 	return UPT_SYSCALL_RET(regs);
 }
-
-#endif /* __SYSDEP_X86_PTRACE_H */
diff --git a/trunk/lib/mpi/mpicoder.c b/trunk/lib/mpi/mpicoder.c
index fe84bb978e3b..716802b774ea 100644
--- a/trunk/lib/mpi/mpicoder.c
+++ b/trunk/lib/mpi/mpicoder.c
@@ -255,6 +255,8 @@ void *mpi_get_buffer(MPI a, unsigned *nbytes, int *sign)
 	if (!n)
 		n++;		/* avoid zero length allocation */
 	p = buffer = kmalloc(n, GFP_KERNEL);
+	if (!p)
+		return NULL;
 
 	for (i = a->nlimbs - 1; i >= 0; i--) {
 		alimb = a->d[i];