Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3657/1: S3C24XX: Documentation update of Overview.txt
  [ARM] Update mach-types
  [ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation
  [ARM] 3654/1: add ajeco 1arm sbc support
  [ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug
  [ARM] 3651/1: S3C24XX: Make arch list more detailed
  [ARM] 3650/1: S3C2412: Update s3c2410_defconfig
  [ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440
  [ARM] 3612/1: make pci bus optional for ixp4xx platform
  [ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ
  [ARM] Remove save_lr/restore_pc macros
  [ARM] Remove partial non-v6 binutils compatibility
  [ARM] Remove LOADREGS macro
  [ARM] Remove RETINSTR macro

19 files changed, 51 insertions, 53 deletions

diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
index 16153c86c3f8..058b80d72aa1 100644
--- a/arch/arm/lib/backtrace.S
+++ b/arch/arm/lib/backtrace.S
@@ -41,7 +41,7 @@ ENTRY(c_backtrace)
                 movne   r0, #0
                 movs    frame, r0
 1:              moveq   r0, #-2
-                LOADREGS(eqfd, sp!, {r4 - r8, pc})
+                ldmeqfd sp!, {r4 - r8, pc}
 
 2:              stmfd   sp!, {pc}               @ calculate offset of PC in STMIA instruction
                 ldr     r0, [sp], #4
@@ -85,7 +85,7 @@ ENTRY(c_backtrace)
                  * A zero next framepointer means we're done.
                  */
                 teq     next, #0
-                LOADREGS(eqfd, sp!, {r4 - r8, pc})
+                ldmeqfd sp!, {r4 - r8, pc}
 
                 /*
                  * The next framepointer must be above the
@@ -104,7 +104,7 @@ ENTRY(c_backtrace)
 1007:           ldr     r0, =.Lbad
                 mov     r1, frame
                 bl      printk
-                LOADREGS(fd, sp!, {r4 - r8, pc})
+                ldmfd   sp!, {r4 - r8, pc}
                 .ltorg
                 .previous
                 
@@ -145,7 +145,7 @@ ENTRY(c_backtrace)
                 adrne   r0, .Lcr
                 blne    printk
                 mov     r0, stack
-                LOADREGS(fd, sp!, {instr, reg, stack, r7, r8, pc})
+                ldmfd   sp!, {instr, reg, stack, r7, r8, pc}
 
 .Lfp:           .asciz  " r%d = %08X%c"
 .Lcr:           .asciz  "\n"
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
index 7ff9f831b3f9..ea435ae2e4a5 100644
--- a/arch/arm/lib/clear_user.S
+++ b/arch/arm/lib/clear_user.S
@@ -43,10 +43,10 @@ USER(		strnebt	r2, [r0], #1)
                 tst     r1, #1                  @ x1 x0 x1 x0 x1 x0 x1
 USER(           strnebt r2, [r0], #1)
                 mov     r0, #0
-                LOADREGS(fd,sp!, {r1, pc})
+                ldmfd   sp!, {r1, pc}
 
                 .section .fixup,"ax"
                 .align  0
-9001:           LOADREGS(fd,sp!, {r0, pc})
+9001:           ldmfd   sp!, {r0, pc}
                 .previous
 
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
index 68117968482b..666c99cc0744 100644
--- a/arch/arm/lib/copy_page.S
+++ b/arch/arm/lib/copy_page.S
@@ -43,4 +43,4 @@ ENTRY(copy_page)
                 bgt     1b                              @       1
         PLD(    ldmeqia r1!, {r3, r4, ip, lr}   )
         PLD(    beq     2b                      )
-                LOADREGS(fd, sp!, {r4, pc})             @       3
+                ldmfd   sp!, {r4, pc}                   @       3
diff --git a/arch/arm/lib/csumipv6.S b/arch/arm/lib/csumipv6.S
index 7065a20ee8ad..9621469beec1 100644
--- a/arch/arm/lib/csumipv6.S
+++ b/arch/arm/lib/csumipv6.S
@@ -28,5 +28,5 @@ ENTRY(__csum_ipv6_magic)
                 adcs    r0, r0, r3
                 adcs    r0, r0, r2
                 adcs    r0, r0, #0
-                LOADREGS(fd, sp!, {pc})
+                ldmfd   sp!, {pc}
 
diff --git a/arch/arm/lib/delay.S b/arch/arm/lib/delay.S
index 9183b06c0e2f..930a70259220 100644
--- a/arch/arm/lib/delay.S
+++ b/arch/arm/lib/delay.S
@@ -31,7 +31,7 @@ ENTRY(__const_udelay)				@ 0 <= r0 <= 0x7fffff06
                 mov     r2, r2, lsr #10         @ max = 0x00007fff
                 mul     r0, r2, r0              @ max = 2^32-1
                 movs    r0, r0, lsr #6
-                RETINSTR(moveq,pc,lr)
+                moveq   pc, lr
 
 /*
  * loops = r0 * HZ * loops_per_jiffy / 1000000
@@ -43,20 +43,20 @@ ENTRY(__const_udelay)				@ 0 <= r0 <= 0x7fffff06
 ENTRY(__delay)
                 subs    r0, r0, #1
 #if 0
-                RETINSTR(movls,pc,lr)
+                movls   pc, lr
                 subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
+                movls   pc, lr
                 subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
+                movls   pc, lr
                 subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
+                movls   pc, lr
                 subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
+                movls   pc, lr
                 subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
+                movls   pc, lr
                 subs    r0, r0, #1
-                RETINSTR(movls,pc,lr)
+                movls   pc, lr
                 subs    r0, r0, #1
 #endif
                 bhi     __delay
-                RETINSTR(mov,pc,lr)
+                mov     pc, lr
diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S
index fb7b602a6f76..c55aaa2a2088 100644
--- a/arch/arm/lib/ecard.S
+++ b/arch/arm/lib/ecard.S
@@ -29,7 +29,7 @@ ENTRY(ecard_loader_read)
                 CPSR2SPSR(r0)
                 mov     lr, pc
                 mov     pc, r2
-                LOADREGS(fd, sp!, {r4 - r12, pc})
+                ldmfd   sp!, {r4 - r12, pc}
 
 @ Purpose: call an expansion card loader to reset the card
 @ Proto  : void read_loader(int card_base, char *loader);
@@ -41,5 +41,5 @@ ENTRY(ecard_loader_reset)
                 CPSR2SPSR(r0)
                 mov     lr, pc
                 add     pc, r1, #8
-                LOADREGS(fd, sp!, {r4 - r12, pc})
+                ldmfd   sp!, {r4 - r12, pc}
 
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S
index 6f8e27a58c78..a5ca0248aa4e 100644
--- a/arch/arm/lib/findbit.S
+++ b/arch/arm/lib/findbit.S
@@ -32,7 +32,7 @@ ENTRY(_find_first_zero_bit_le)
 2:              cmp     r2, r1                  @ any more?
                 blo     1b
 3:              mov     r0, r1                  @ no free bits
-                RETINSTR(mov,pc,lr)
+                mov     pc, lr
 
 /*
  * Purpose  : Find next 'zero' bit
@@ -66,7 +66,7 @@ ENTRY(_find_first_bit_le)
 2:              cmp     r2, r1                  @ any more?
                 blo     1b
 3:              mov     r0, r1                  @ no free bits
-                RETINSTR(mov,pc,lr)
+                mov     pc, lr
 
 /*
  * Purpose  : Find next 'one' bit
@@ -98,7 +98,7 @@ ENTRY(_find_first_zero_bit_be)
 2:              cmp     r2, r1                  @ any more?
                 blo     1b
 3:              mov     r0, r1                  @ no free bits
-                RETINSTR(mov,pc,lr)
+                mov     pc, lr
 
 ENTRY(_find_next_zero_bit_be)
                 teq     r1, #0
@@ -126,7 +126,7 @@ ENTRY(_find_first_bit_be)
 2:              cmp     r2, r1                  @ any more?
                 blo     1b
 3:              mov     r0, r1                  @ no free bits
-                RETINSTR(mov,pc,lr)
+                mov     pc, lr
 
 ENTRY(_find_next_bit_be)
                 teq     r1, #0
@@ -164,5 +164,5 @@ ENTRY(_find_next_bit_be)
                 addeq   r2, r2, #1
                 mov     r0, r2
 #endif
-                RETINSTR(mov,pc,lr)
+                mov     pc, lr
 
diff --git a/arch/arm/lib/io-readsb.S b/arch/arm/lib/io-readsb.S
index d3d8de71a2c8..fb966ad0276f 100644
--- a/arch/arm/lib/io-readsb.S
+++ b/arch/arm/lib/io-readsb.S
@@ -72,7 +72,7 @@ ENTRY(__raw_readsb)
                 bpl     .Linsb_16_lp
 
                 tst     r2, #15
-                LOADREGS(eqfd, sp!, {r4 - r6, pc})
+                ldmeqfd sp!, {r4 - r6, pc}
 
 .Linsb_no_16:   tst     r2, #8
                 beq     .Linsb_no_8
@@ -109,7 +109,7 @@ ENTRY(__raw_readsb)
                 str     r3, [r1], #4
 
 .Linsb_no_4:    ands    r2, r2, #3
-                LOADREGS(eqfd, sp!, {r4 - r6, pc})
+                ldmeqfd sp!, {r4 - r6, pc}
 
                 cmp     r2, #2
                 ldrb    r3, [r0]
@@ -119,4 +119,4 @@ ENTRY(__raw_readsb)
                 ldrgtb  r3, [r0]
                 strgtb  r3, [r1]
 
-                LOADREGS(fd, sp!, {r4 - r6, pc})
+                ldmfd   sp!, {r4 - r6, pc}
diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S
index 146d47c15455..4ef904185142 100644
--- a/arch/arm/lib/io-readsw-armv3.S
+++ b/arch/arm/lib/io-readsw-armv3.S
@@ -28,7 +28,7 @@
                 strb    r3, [r1], #1
 
                 subs    r2, r2, #1
-                RETINSTR(moveq, pc, lr)
+                moveq   pc, lr
 
 ENTRY(__raw_readsw)
                 teq     r2, #0          @ do we have to check for the zero len?
@@ -69,7 +69,7 @@ ENTRY(__raw_readsw)
                 bpl     .Linsw_8_lp
 
                 tst     r2, #7
-                LOADREGS(eqfd, sp!, {r4, r5, r6, pc})
+                ldmeqfd sp!, {r4, r5, r6, pc}
 
 .Lno_insw_8:    tst     r2, #4
                 beq     .Lno_insw_4
@@ -102,6 +102,6 @@ ENTRY(__raw_readsw)
                 movne   r3, r3, lsr #8
                 strneb  r3, [r1]
 
-                LOADREGS(fd, sp!, {r4, r5, r6, pc})
+                ldmfd   sp!, {r4, r5, r6, pc}
 
 
diff --git a/arch/arm/lib/io-writesb.S b/arch/arm/lib/io-writesb.S
index 08209fc640ea..7eba2b6cc69f 100644
--- a/arch/arm/lib/io-writesb.S
+++ b/arch/arm/lib/io-writesb.S
@@ -64,7 +64,7 @@ ENTRY(__raw_writesb)
                 bpl     .Loutsb_16_lp
 
                 tst     r2, #15
-                LOADREGS(eqfd, sp!, {r4, r5, pc})
+                ldmeqfd sp!, {r4, r5, pc}
 
 .Loutsb_no_16:  tst     r2, #8
                 beq     .Loutsb_no_8
@@ -80,7 +80,7 @@ ENTRY(__raw_writesb)
                 outword r3
 
 .Loutsb_no_4:   ands    r2, r2, #3
-                LOADREGS(eqfd, sp!, {r4, r5, pc})
+                ldmeqfd sp!, {r4, r5, pc}
 
                 cmp     r2, #2
                 ldrb    r3, [r1], #1
@@ -90,4 +90,4 @@ ENTRY(__raw_writesb)
                 ldrgtb  r3, [r1]
                 strgtb  r3, [r0]
 
-                LOADREGS(fd, sp!, {r4, r5, pc})
+                ldmfd   sp!, {r4, r5, pc}
diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S
index 52d62b481295..1607a29f49b7 100644
--- a/arch/arm/lib/io-writesw-armv3.S
+++ b/arch/arm/lib/io-writesw-armv3.S
@@ -29,7 +29,7 @@
                 orr     r3, r3, r3, lsl #16
                 str     r3, [r0]
                 subs    r2, r2, #1
-                RETINSTR(moveq, pc, lr)
+                moveq   pc, lr
 
 ENTRY(__raw_writesw)
                 teq     r2, #0          @ do we have to check for the zero len?
@@ -80,7 +80,7 @@ ENTRY(__raw_writesw)
                 bpl     .Loutsw_8_lp
 
                 tst     r2, #7
-                LOADREGS(eqfd, sp!, {r4, r5, r6, pc})
+                ldmeqfd sp!, {r4, r5, r6, pc}
 
 .Lno_outsw_8:   tst     r2, #4
                 beq     .Lno_outsw_4
@@ -124,4 +124,4 @@ ENTRY(__raw_writesw)
                 orrne   ip, ip, ip, lsr #16
                 strne   ip, [r0]
 
-                LOADREGS(fd, sp!, {r4, r5, r6, pc})
+                ldmfd   sp!, {r4, r5, r6, pc}
diff --git a/arch/arm/lib/memchr.S b/arch/arm/lib/memchr.S
index ac34fe55d21a..e7ab1ea8ebaa 100644
--- a/arch/arm/lib/memchr.S
+++ b/arch/arm/lib/memchr.S
@@ -22,4 +22,4 @@ ENTRY(memchr)
         bne     1b
         sub     r0, r0, #1
 2:      movne   r0, #0
-        RETINSTR(mov,pc,lr)
+        mov     pc, lr
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
index a1795f599937..95b110b07a89 100644
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
@@ -53,7 +53,7 @@ ENTRY(memset)
         stmgeia r0!, {r1, r3, ip, lr}
         stmgeia r0!, {r1, r3, ip, lr}
         bgt     2b
-        LOADREGS(eqfd, sp!, {pc})       @ Now <64 bytes to go.
+        ldmeqfd sp!, {pc}               @ Now <64 bytes to go.
 /*
  * No need to correct the count; we're only testing bits from now on
  */
@@ -77,4 +77,4 @@ ENTRY(memset)
         strneb  r1, [r0], #1
         tst     r2, #1
         strneb  r1, [r0], #1
-        RETINSTR(mov,pc,lr)
+        mov     pc, lr
diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S
index 51ccc60160fd..abf2508e8221 100644
--- a/arch/arm/lib/memzero.S
+++ b/arch/arm/lib/memzero.S
@@ -53,7 +53,7 @@ ENTRY(__memzero)
         stmgeia r0!, {r2, r3, ip, lr}   @ 4
         stmgeia r0!, {r2, r3, ip, lr}   @ 4
         bgt     3b                      @ 1
-        LOADREGS(eqfd, sp!, {pc})       @ 1/2 quick exit
+        ldmeqfd sp!, {pc}               @ 1/2 quick exit
 /*
  * No need to correct the count; we're only testing bits from now on
  */
@@ -77,4 +77,4 @@ ENTRY(__memzero)
         strneb  r2, [r0], #1            @ 1
         tst     r1, #1                  @ 1 a byte left over
         strneb  r2, [r0], #1            @ 1
-        RETINSTR(mov,pc,lr)             @ 1
+        mov     pc, lr                  @ 1
diff --git a/arch/arm/lib/strchr.S b/arch/arm/lib/strchr.S
index 5b9b493733fc..9f18d6fdee6a 100644
--- a/arch/arm/lib/strchr.S
+++ b/arch/arm/lib/strchr.S
@@ -23,4 +23,4 @@ ENTRY(strchr)
                 teq     r2, r1
                 movne   r0, #0
                 subeq   r0, r0, #1
-                RETINSTR(mov,pc,lr)
+                mov     pc, lr
diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S
index 629cc8775276..35649f04fcac 100644
--- a/arch/arm/lib/strncpy_from_user.S
+++ b/arch/arm/lib/strncpy_from_user.S
@@ -21,7 +21,6 @@
  *  -EFAULT on exception, or "len" if we fill the whole buffer
  */
 ENTRY(__arch_strncpy_from_user)
-        save_lr
         mov     ip, r1
 1:      subs    r2, r2, #1
 USER(   ldrplbt r3, [r1], #1)
@@ -31,13 +30,13 @@ USER(	ldrplbt	r3, [r1], #1)
         bne     1b
         sub     r1, r1, #1      @ take NUL character out of count
 2:      sub     r0, r1, ip
-        restore_pc
+        mov     pc, lr
 
         .section .fixup,"ax"
         .align  0
 9001:   mov     r3, #0
         strb    r3, [r0, #0]    @ null terminate
         mov     r0, #-EFAULT
-        restore_pc
+        mov     pc, lr
         .previous
 
diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S
index 67bcd8268128..3668a15991ef 100644
--- a/arch/arm/lib/strnlen_user.S
+++ b/arch/arm/lib/strnlen_user.S
@@ -21,7 +21,6 @@
  *            or zero on exception, or n + 1 if too long
  */
 ENTRY(__arch_strnlen_user)
-        save_lr
         mov     r2, r0
 1:
 USER(   ldrbt   r3, [r0], #1)
@@ -31,10 +30,10 @@ USER(	ldrbt	r3, [r0], #1)
         bne     1b
         add     r0, r0, #1
 2:      sub     r0, r0, r2
-        restore_pc
+        mov     pc, lr
 
         .section .fixup,"ax"
         .align  0
 9001:   mov     r0, #0
-        restore_pc
+        mov     pc, lr
         .previous
diff --git a/arch/arm/lib/strrchr.S b/arch/arm/lib/strrchr.S
index fa923f026f15..538df220aa48 100644
--- a/arch/arm/lib/strrchr.S
+++ b/arch/arm/lib/strrchr.S
@@ -22,4 +22,4 @@ ENTRY(strrchr)
                 teq     r2, #0
                 bne     1b
                 mov     r0, r3
-                RETINSTR(mov,pc,lr)
+                mov     pc, lr
diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
index 0cc450f863b6..1f1545d737be 100644
--- a/arch/arm/lib/uaccess.S
+++ b/arch/arm/lib/uaccess.S
@@ -105,7 +105,7 @@ USER(		strgtbt	r3, [r0], #1)			@ May fault
                 movs    ip, r2
                 bne     .Lc2u_nowords
 .Lc2u_finished: mov     r0, #0
-                LOADREGS(fd,sp!,{r2, r4 - r7, pc})
+                ldmfd   sp!, {r2, r4 - r7, pc}
 
 .Lc2u_src_not_aligned:
                 bic     r1, r1, #3
@@ -280,7 +280,7 @@ USER(		strgtbt	r3, [r0], #1)			@ May fault
 
                 .section .fixup,"ax"
                 .align  0
-9001:           LOADREGS(fd,sp!, {r0, r4 - r7, pc})
+9001:           ldmfd   sp!, {r0, r4 - r7, pc}
                 .previous
 
 /* Prototype: unsigned long __arch_copy_from_user(void *to,const void *from,unsigned long n);
@@ -369,7 +369,7 @@ USER(		ldrgtbt	r3, [r1], #1)			@ May fault
                 bne     .Lcfu_nowords
 .Lcfu_finished: mov     r0, #0
                 add     sp, sp, #8
-                LOADREGS(fd,sp!,{r4 - r7, pc})
+                ldmfd   sp!, {r4 - r7, pc}
 
 .Lcfu_src_not_aligned:
                 bic     r1, r1, #3
@@ -556,6 +556,6 @@ USER(		ldrgtbt	r3, [r1], #1)			@ May fault
                 movne   r1, r4
                 blne    __memzero
                 mov     r0, r4
-                LOADREGS(fd,sp!, {r4 - r7, pc})
+                ldmfd   sp!, {r4 - r7, pc}
                 .previous