X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fexec.c;h=fb4f3cdda78c422518ed58c550fcf4019c8f2c99;hb=295594e9cf6ae2efd73371777aa8feba0f87f42f;hp=e639957d7a57a310c12718e8fe3e4f0d9dfe2fe2;hpb=59ef7a83f1127038a433464597df02e2dc9540e7;p=mv-sheeva.git

diff --git a/fs/exec.c b/fs/exec.c
index e639957d7a5..fb4f3cdda78 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -678,8 +678,8 @@ exit:
 }
 EXPORT_SYMBOL(open_exec);
 
-int kernel_read(struct file *file, unsigned long offset,
-	char *addr, unsigned long count)
+int kernel_read(struct file *file, loff_t offset,
+		char *addr, unsigned long count)
 {
 	mm_segment_t old_fs;
 	loff_t pos = offset;
@@ -1277,8 +1277,8 @@ int do_execve(char * filename,
 	if (!bprm)
 		goto out_files;
 
-	retval = mutex_lock_interruptible(&current->cred_guard_mutex);
-	if (retval < 0)
+	retval = -ERESTARTNOINTR;
+	if (mutex_lock_interruptible(&current->cred_guard_mutex))
 		goto out_free;
 	current->in_execve = 1;