org.handhelds.familiar/packages/linux/nslu2-linksys-kernel-2.4.22/gcc3-userfuncs.patch

   1
   2 #
   3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
   4 #
   5
   6 --- linux-2.4.22/arch/arm/lib/getuser.S~gcc3-userfuncs  2004-09-08 19:14:05.000000000 -0500
   7 +++ linux-2.4.22/arch/arm/lib/getuser.S 2004-09-08 19:49:27.000000000 -0500
   8 @@ -42,17 +42,17 @@
   9
  10         .global __get_user_2
  11  __get_user_2:
  12 -       bic     r2, sp, #0x1f00
  13 -       bic     r2, r2, #0x00ff
  14 -       ldr     r2, [r2, #TSK_ADDR_LIMIT]
  15 -       sub     r2, r2, #2
  16 -       cmp     r0, r2
  17 +       bic     ip, sp, #0x1f00
  18 +       bic     ip, ip, #0x00ff
  19 +       ldr     ip, [ip, #TSK_ADDR_LIMIT]
  20 +       sub     ip, ip, #2
  21 +       cmp     r0, ip
  22  2:     ldrlsbt r1, [r0], #1
  23 -3:     ldrlsbt r2, [r0]
  24 +3:     ldrlsbt ip, [r0]
  25  #ifndef __ARMEB__
  26 -       orrls   r1, r1, r2, lsl #8
  27 +       orrls   r1, r1, ip, lsl #8
  28  #else
  29 -       orrls   r1, r2, r1, lsl #8
  30 +       orrls   r1, ip, r1, lsl #8
  31  #endif
  32         movls   r0, #0
  33         movls   pc, lr
  34 --- linux-2.4.22/arch/arm/lib/putuser.S~gcc3-userfuncs  2004-09-08 19:14:05.000000000 -0500
  35 +++ linux-2.4.22/arch/arm/lib/putuser.S 2004-09-08 19:45:00.000000000 -0500
  36 @@ -18,7 +18,7 @@
  37   * Inputs:     r0 contains the address
  38   *             r1, r2 contains the value
  39   * Outputs:    r0 is the error code
  40 - *             lr corrupted
  41 + *             ip, lr corrupted
  42   *
  43   * No other registers must be altered.  (see include/asm-arm/uaccess.h
  44   * for specific ASM register usage).
  45 @@ -30,11 +30,11 @@
  46
  47         .global __put_user_1
  48  __put_user_1:
  49 -       bic     r2, sp, #0x1f00
  50 -       bic     r2, r2, #0x00ff
  51 -       ldr     r2, [r2, #TSK_ADDR_LIMIT]
  52 -       sub     r2, r2, #1
  53 -       cmp     r0, r2
  54 +       bic     ip, sp, #0x1f00
  55 +       bic     ip, ip, #0x00ff
  56 +       ldr     ip, [ip, #TSK_ADDR_LIMIT]
  57 +       sub     ip, ip, #1
  58 +       cmp     r0, ip
  59  1:     strlsbt r1, [r0]
  60         movls   r0, #0
  61         movls   pc, lr
  62 @@ -42,20 +42,20 @@
  63
  64         .global __put_user_2
  65  __put_user_2:
  66 -       bic     r2, sp, #0x1f00
  67 -       bic     r2, r2, #0x00ff
  68 -       ldr     r2, [r2, #TSK_ADDR_LIMIT]
  69 -       sub     r2, r2, #2
  70 -       cmp     r0, r2
  71 +       bic     ip, sp, #0x1f00
  72 +       bic     ip, ip, #0x00ff
  73 +       ldr     ip, [ip, #TSK_ADDR_LIMIT]
  74 +       sub     ip, ip, #2
  75 +       cmp     r0, ip
  76  #ifndef __ARMEB__
  77  2:     strlsbt r1, [r0], #1
  78         movls   r1, r1, lsr #8
  79  3:     strlsbt r1, [r0]
  80  #else
  81 -2:     movls   r2, r1
  82 +2:     movls   ip, r1
  83         movls   r1, r1, lsr #8
  84         strlsbt r1, [r0], #1
  85 -       movls   r1, r2
  86 +       movls   r1, ip
  87  3:     strlsbt r1, [r0]
  88  #endif
  89         movls   r0, #0
  90 @@ -64,11 +64,11 @@
  91
  92         .global __put_user_4
  93  __put_user_4:
  94 -       bic     r2, sp, #0x1f00
  95 -       bic     r2, r2, #0x00ff
  96 -       ldr     r2, [r2, #TSK_ADDR_LIMIT]
  97 -       sub     r2, r2, #4
  98 -       cmp     r0, r2
  99 +       bic     ip, sp, #0x1f00
 100 +       bic     ip, ip, #0x00ff
 101 +       ldr     ip, [ip, #TSK_ADDR_LIMIT]
 102 +       sub     ip, ip, #4
 103 +       cmp     r0, ip
 104  4:     strlst  r1, [r0]
 105         movls   r0, #0
 106         movls   pc, lr
 107 --- linux-2.4.22/include/asm-arm/uaccess.h~gcc3-userfuncs       2004-09-08 19:36:03.000000000 -0500
 108 +++ linux-2.4.22/include/asm-arm/uaccess.h      2004-09-08 20:03:34.000000000 -0500
 109 @@ -86,7 +86,7 @@
 110                         __get_user_x(__r1, __p, __e, 1, "lr");          \
 111                         break;                                          \
 112                 case 2:                                                 \
 113 -                       __get_user_x(__r1, __p, __e, 2, "r2", "lr");    \
 114 +                       __get_user_x(__r1, __p, __e, 2, "ip", "lr");    \
 115                         break;                                          \
 116                 case 4:                                                 \
 117                         __get_user_x(__r1, __p, __e, 4, "lr");          \
 118 @@ -122,13 +122,13 @@
 119                 register int __e asm("r0");                             \
 120                 switch (sizeof(*(p))) {                                 \
 121                 case 1:                                                 \
 122 -                       __put_user_x(__r1, __p, __e, 1, "r2", "lr");    \
 123 +                       __put_user_x(__r1, __p, __e, 1, "ip", "lr");    \
 124                         break;                                          \
 125                 case 2:                                                 \
 126 -                       __put_user_x(__r1, __p, __e, 2, "r2", "lr");    \
 127 +                       __put_user_x(__r1, __p, __e, 2, "ip", "lr");    \
 128                         break;                                          \
 129                 case 4:                                                 \
 130 -                       __put_user_x(__r1, __p, __e, 4, "r2", "lr");    \
 131 +                       __put_user_x(__r1, __p, __e, 4, "ip", "lr");    \
 132                         break;                                          \
 133                 case 8:                                                 \
 134                         __put_user_x(__r1, __p, __e, 8, "ip", "lr");    \