Merge branch 'akpm' (incoming from Andrew)

Merge first patch-bomb from Andrew Morton:
 - Various misc bits
 - kmemleak fixes
 - small befs, codafs, cifs, efs, freexxfs, hfsplus, minixfs, reiserfs things
 - fanotify
 - I appear to have become SuperH maintainer
 - ocfs2 updates
 - direct-io tweaks
 - a bit of the MM queue
 - printk updates
 - MAINTAINERS maintenance
 - some backlight things
 - lib/ updates
 - checkpatch updates
 - the rtc queue
 - nilfs2 updates
 - Small Documentation/ updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (237 commits)
  Documentation/SubmittingPatches: remove references to patch-scripts
  Documentation/SubmittingPatches: update some dead URLs
  Documentation/filesystems/ntfs.txt: remove changelog reference
  Documentation/kmemleak.txt: updates
  fs/reiserfs/super.c: add __init to init_inodecache
  fs/reiserfs: move prototype declaration to header file
  fs/hfsplus/attributes.c: add __init to hfsplus_create_attr_tree_cache()
  fs/hfsplus/extents.c: fix concurrent acess of alloc_blocks
  fs/hfsplus/extents.c: remove unused variable in hfsplus_get_block
  nilfs2: update project's web site in nilfs2.txt
  nilfs2: update MAINTAINERS file entries fix
  nilfs2: verify metadata sizes read from disk
  nilfs2: add FITRIM ioctl support for nilfs2
  nilfs2: add nilfs_sufile_trim_fs to trim clean segs
  nilfs2: implementation of NILFS_IOCTL_SET_SUINFO ioctl
  nilfs2: add nilfs_sufile_set_suinfo to update segment usage
  nilfs2: add struct nilfs_suinfo_update and flags
  nilfs2: update MAINTAINERS file entries
  fs/coda/inode.c: add __init to init_inodecache()
  BEFS: logging cleanup
  ...

6 files changed, 26 insertions, 35 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
index e84a43229b9c..5c0e3c335161 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
@@ -132,7 +132,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP103]),
         CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP102]),
         CLKDEV_CON_ID("mmc0", &mstp_clks[MSTP220]),
-        CLKDEV_CON_ID("rspi2", &mstp_clks[MSTP127]),
+        CLKDEV_DEV_ID("rspi.2", &mstp_clks[MSTP127]),
 };
 
 int __init arch_clk_init(void)
diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c
index b959f5592604..8dfe645bcc4b 100644
--- a/arch/sh/kernel/dumpstack.c
+++ b/arch/sh/kernel/dumpstack.c
@@ -115,7 +115,7 @@ static int print_trace_stack(void *data, char *name)
  */
 static void print_trace_address(void *data, unsigned long addr, int reliable)
 {
-        printk(data);
+        printk("%s", (char *)data);
         printk_address(addr, reliable);
 }
 
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index ca46834294b7..13047a4facd2 100644
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -193,10 +193,10 @@ syscall_trace_entry:
         !                       Reload R0-R4 from kernel stack, where the
         !                       parent may have modified them using
         !                       ptrace(POKEUSR).  (Note that R0-R2 are
-        !                       used by the system call handler directly
-        !                       from the kernel stack anyway, so don't need
-        !                       to be reloaded here.)  This allows the parent
-        !                       to rewrite system calls and args on the fly.
+        !                       reloaded from the kernel stack by syscall_call
+        !                       below, so don't need to be reloaded here.)
+        !                       This allows the parent to rewrite system calls
+        !                       and args on the fly.
         mov.l   @(OFF_R4,r15), r4   ! arg0
         mov.l   @(OFF_R5,r15), r5
         mov.l   @(OFF_R6,r15), r6
@@ -357,8 +357,15 @@ syscall_call:
         mov.l   3f, r8          ! Load the address of sys_call_table
         add     r8, r3
         mov.l   @r3, r8
+        mov.l   @(OFF_R2,r15), r2
+        mov.l   @(OFF_R1,r15), r1
+        mov.l   @(OFF_R0,r15), r0
+        mov.l   r2, @-r15
+        mov.l   r1, @-r15
+        mov.l   r0, @-r15
         jsr     @r8             ! jump to specific syscall handler
          nop
+        add     #12, r15
         mov.l   @(OFF_R0,r15), r12              ! save r0
         mov.l   r0, @(OFF_R0,r15)               ! save the return value
         !
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 6af6e7c5cac8..594cd371aa28 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -148,11 +148,9 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *r0_p
         return err;
 }
 
-asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
-                             unsigned long r6, unsigned long r7,
-                             struct pt_regs __regs)
+asmlinkage int sys_sigreturn(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        struct pt_regs *regs = current_pt_regs();
         struct sigframe __user *frame = (struct sigframe __user *)regs->regs[15];
         sigset_t set;
         int r0;
@@ -180,11 +178,9 @@ badframe:
         return 0;
 }
 
-asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
-                                unsigned long r6, unsigned long r7,
-                                struct pt_regs __regs)
+asmlinkage int sys_rt_sigreturn(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        struct pt_regs *regs = current_pt_regs();
         struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs->regs[15];
         sigset_t set;
         int r0;
diff --git a/arch/sh/kernel/sys_sh32.c b/arch/sh/kernel/sys_sh32.c
index 497bab3a0401..b66d1c62eb19 100644
--- a/arch/sh/kernel/sys_sh32.c
+++ b/arch/sh/kernel/sys_sh32.c
@@ -21,17 +21,14 @@
  * sys_pipe() is the normal C calling standard for creating
  * a pipe. It's not the way Unix traditionally does this, though.
  */
-asmlinkage int sys_sh_pipe(unsigned long r4, unsigned long r5,
-        unsigned long r6, unsigned long r7,
-        struct pt_regs __regs)
+asmlinkage int sys_sh_pipe(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         int fd[2];
         int error;
 
         error = do_pipe_flags(fd, 0);
         if (!error) {
-                regs->regs[1] = fd[1];
+                current_pt_regs()->regs[1] = fd[1];
                 return fd[0];
         }
         return error;
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index 68e99f09171d..ff639342a8be 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -594,9 +594,7 @@ int is_dsp_inst(struct pt_regs *regs)
 #endif /* CONFIG_SH_DSP */
 
 #ifdef CONFIG_CPU_SH2A
-asmlinkage void do_divide_error(unsigned long r4, unsigned long r5,
-                                unsigned long r6, unsigned long r7,
-                                struct pt_regs __regs)
+asmlinkage void do_divide_error(unsigned long r4)
 {
         siginfo_t info;
 
@@ -613,11 +611,9 @@ asmlinkage void do_divide_error(unsigned long r4, unsigned long r5,
 }
 #endif
 
-asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
-                                unsigned long r6, unsigned long r7,
-                                struct pt_regs __regs)
+asmlinkage void do_reserved_inst(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        struct pt_regs *regs = current_pt_regs();
         unsigned long error_code;
         struct task_struct *tsk = current;
 
@@ -701,11 +697,9 @@ static int emulate_branch(unsigned short inst, struct pt_regs *regs)
 }
 #endif
 
-asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
-                                unsigned long r6, unsigned long r7,
-                                struct pt_regs __regs)
+asmlinkage void do_illegal_slot_inst(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        struct pt_regs *regs = current_pt_regs();
         unsigned long inst;
         struct task_struct *tsk = current;
 
@@ -730,15 +724,12 @@ asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
         die_if_no_fixup("illegal slot instruction", regs, inst);
 }
 
-asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,
-                                   unsigned long r6, unsigned long r7,
-                                   struct pt_regs __regs)
+asmlinkage void do_exception_error(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         long ex;
 
         ex = lookup_exception_vector();
-        die_if_kernel("exception", regs, ex);
+        die_if_kernel("exception", current_pt_regs(), ex);
 }
 
 void per_cpu_trap_init(void)