From de996ef0388f2ca38e0bb63cfb17df1c002beec3 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Mon, 4 Jun 2012 14:29:59 +1000
Subject: [PATCH] --- yaml --- r: 310464 b: refs/heads/master c:
 ad1ed2937eaa30adf9996ef5f21e0c1895f906b0 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/avr32/kernel/signal.c        | 2 +-
 trunk/arch/xtensa/include/asm/syscall.h | 4 ++--
 trunk/arch/xtensa/kernel/signal.c       | 2 +-
 trunk/mm/nommu.c                        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d138dd513164..9e3dcdb1b341 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03240b279dbbda41f2fc55ff4424acf651e25bef
+refs/heads/master: ad1ed2937eaa30adf9996ef5f21e0c1895f906b0
diff --git a/trunk/arch/avr32/kernel/signal.c b/trunk/arch/avr32/kernel/signal.c
index d552a854dacc..c140f9b41dce 100644
--- a/trunk/arch/avr32/kernel/signal.c
+++ b/trunk/arch/avr32/kernel/signal.c
@@ -300,7 +300,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti)
 	if ((sysreg_read(SR) & MODE_MASK) == MODE_SUPERVISOR)
 		syscall = 1;
 
-	if (ti->flags & _TIF_SIGPENDING)
+	if (ti->flags & _TIF_SIGPENDING))
 		do_signal(regs, syscall);
 
 	if (ti->flags & _TIF_NOTIFY_RESUME) {
diff --git a/trunk/arch/xtensa/include/asm/syscall.h b/trunk/arch/xtensa/include/asm/syscall.h
index c1dacca312f3..0b9f2e13c781 100644
--- a/trunk/arch/xtensa/include/asm/syscall.h
+++ b/trunk/arch/xtensa/include/asm/syscall.h
@@ -31,5 +31,5 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp,
 asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds,
 	struct timespec __user *tsp, const sigset_t __user *sigmask,
 	size_t sigsetsize);
-asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset,
-		size_t sigsetsize);
+
+
diff --git a/trunk/arch/xtensa/kernel/signal.c b/trunk/arch/xtensa/kernel/signal.c
index efe4e854b3cd..b9f8e5850d3a 100644
--- a/trunk/arch/xtensa/kernel/signal.c
+++ b/trunk/arch/xtensa/kernel/signal.c
@@ -493,7 +493,7 @@ static void do_signal(struct pt_regs *regs)
 		if (ret)
 			return;
 
-		signal_delivered(signr, &info, &ka, regs, 0);
+		signal_delivered(signr, info, ka, regs, 0);
 		if (current->ptrace & PT_SINGLESTEP)
 			task_pt_regs(current)->icountlevel = 1;
 
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index c4acfbc09972..d4b0c10872de 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -1486,7 +1486,7 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
 
 	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
 
-	ret = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);
+	retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);
 
 	if (file)
 		fput(file);