Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM updates from Russell King:

 - add support for ftrace-with-registers, which is needed for kgraft and
   other ftrace tools

 - support for mremap() for the sigpage/vDSO so that checkpoint/restore
   can work

 - add timestamps to each line of the register dump output

 - remove the unused KTHREAD_SIZE from nommu

 - align the ARM bitops APIs with the generic API (using unsigned long
   pointers rather than void pointers)

 - make the configuration of userspace Thumb support an expert option so
   that we can default it on, and avoid some hard to debug userspace
   crashes

* 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8684/1: NOMMU: Remove unused KTHREAD_SIZE definition
  ARM: 8683/1: ARM32: Support mremap() for sigpage/vDSO
  ARM: 8679/1: bitops: Align prototypes to generic API
  ARM: 8678/1: ftrace: Adds support for CONFIG_DYNAMIC_FTRACE_WITH_REGS
  ARM: make configuration of userspace Thumb support an expert option
  ARM: 8673/1: Fix __show_regs output timestamps

1 files changed, 12 insertions, 4 deletions

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 939e8b58c59d..d96714e1858c 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -123,10 +123,10 @@ void __show_regs(struct pt_regs *regs)
 
         print_symbol("PC is at %s\n", instruction_pointer(regs));
         print_symbol("LR is at %s\n", regs->ARM_lr);
-        printk("pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n"
-               "sp : %08lx  ip : %08lx  fp : %08lx\n",
-                regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
-                regs->ARM_sp, regs->ARM_ip, regs->ARM_fp);
+        printk("pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n",
+               regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr);
+        printk("sp : %08lx  ip : %08lx  fp : %08lx\n",
+               regs->ARM_sp, regs->ARM_ip, regs->ARM_fp);
         printk("r10: %08lx  r9 : %08lx  r8 : %08lx\n",
                 regs->ARM_r10, regs->ARM_r9,
                 regs->ARM_r8);
@@ -404,9 +404,17 @@ static unsigned long sigpage_addr(const struct mm_struct *mm,
 static struct page *signal_page;
 extern struct page *get_signal_page(void);
 
+static int sigpage_mremap(const struct vm_special_mapping *sm,
+                struct vm_area_struct *new_vma)
+{
+        current->mm->context.sigpage = new_vma->vm_start;
+        return 0;
+}
+
 static const struct vm_special_mapping sigpage_mapping = {
         .name = "[sigpage]",
         .pages = &signal_page,
+        .mremap = sigpage_mremap,
 };
 
 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)