releases/2.6.30.2/blackfin-fix-command-line-corruption-with-debug_doublefault.patch

   1 From 37082511f06108129bd5f96d625a6fae2d5a4ab4 Mon Sep 17 00:00:00 2001
   2 From: Mike Frysinger <vapier@gentoo.org>
   3 Date: Tue, 26 May 2009 21:48:38 +0000
   4 Subject: Blackfin: fix command line corruption with DEBUG_DOUBLEFAULT
   5
   6 From: Mike Frysinger <vapier@gentoo.org>
   7
   8 commit 37082511f06108129bd5f96d625a6fae2d5a4ab4 upstream.
   9
  10 Commit 6b3087c6 (which introduced Blackfin SMP) broke command line passing
  11 when the DEBUG_DOUBLEFAULT config option was enabled.  Switch the code to
  12 using a scratch register and not R7 which holds the command line.
  13
  14 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16
  17 ---
  18  arch/blackfin/mach-common/head.S |   16 ++++++++--------
  19  1 file changed, 8 insertions(+), 8 deletions(-)
  20
  21 --- a/arch/blackfin/mach-common/head.S
  22 +++ b/arch/blackfin/mach-common/head.S
  23 @@ -126,25 +126,25 @@ ENTRY(__start)
  24          * below
  25          */
  26         GET_PDA(p0, r0);
  27 -       r7 = [p0 + PDA_RETX];
  28 +       r6 = [p0 + PDA_RETX];
  29         p1.l = _init_saved_retx;
  30         p1.h = _init_saved_retx;
  31 -       [p1] = r7;
  32 +       [p1] = r6;
  33
  34 -       r7 = [p0 + PDA_DCPLB];
  35 +       r6 = [p0 + PDA_DCPLB];
  36         p1.l = _init_saved_dcplb_fault_addr;
  37         p1.h = _init_saved_dcplb_fault_addr;
  38 -       [p1] = r7;
  39 +       [p1] = r6;
  40
  41 -       r7 = [p0 + PDA_ICPLB];
  42 +       r6 = [p0 + PDA_ICPLB];
  43         p1.l = _init_saved_icplb_fault_addr;
  44         p1.h = _init_saved_icplb_fault_addr;
  45 -       [p1] = r7;
  46 +       [p1] = r6;
  47
  48 -       r7 = [p0 + PDA_SEQSTAT];
  49 +       r6 = [p0 + PDA_SEQSTAT];
  50         p1.l = _init_saved_seqstat;
  51         p1.h = _init_saved_seqstat;
  52 -       [p1] = r7;
  53 +       [p1] = r6;
  54  #endif
  55
  56         /* Initialize stack pointer */