[rt] Resolve textual conflict with ARM vectors page changes in 3.10.6

svn path=/dists/sid/linux/; revision=20497

debian/patches/features/all/rt/re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch

@@ -30,18 +30,18 @@ Cc: Frank <Frank_Rowand@sonyusa.com>
 Cc: Peter Zijlstra <peterz@infradead.org>
 Link: http://lkml.kernel.org/r/4E87C535.2030907@am.sony.com
 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+[bwh: Adjust context to apply after commit a5463cd34354
+ 'ARM: make vectors page inaccessible from userspace']
 ---
  arch/arm/kernel/process.c |   25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
-Index: linux-stable/arch/arm/kernel/process.c
-===================================================================
---- linux-stable.orig/arch/arm/kernel/process.c
-+++ linux-stable/arch/arm/kernel/process.c
-@@ -433,6 +433,31 @@ unsigned long arch_randomize_brk(struct
- }
+--- a/arch/arm/kernel/process.c
++++ b/arch/arm/kernel/process.c
+@@ -434,6 +434,31 @@ unsigned long arch_randomize_brk(struct
  
  #ifdef CONFIG_MMU
+ #ifdef CONFIG_KUSER_HELPERS
 +
 +/*
 + * CONFIG_SPLIT_PTLOCK_CPUS results in a page->ptl lock.  If the lock is not
@@ -69,4 +69,4 @@ Index: linux-stable/arch/arm/kernel/process.c
 +
  /*
   * The vectors page is always readable from user space for the
-  * atomic helpers and the signal restart code. Insert it into the
+  * atomic helpers. Insert it into the gate_vma so that it is visible