Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / arch / openrisc / kernel / entry.S

diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S
index 947613f..edaa775 100644 (file)
--- a/arch/openrisc/kernel/entry.S
+++ b/arch/openrisc/kernel/entry.S
@@ -326,7 +326,7 @@ EXCEPTION_ENTRY(_data_page_fault_handler)
 1:     l.ori   r6,r0,0x0                  // !write access
 2:
 
 1:     l.ori   r6,r0,0x0                  // !write access
 2:
 

-       /* call fault.c handler in or32/mm/fault.c */
+       /* call fault.c handler in openrisc/mm/fault.c */

        l.jal   do_page_fault
         l.nop
        l.j     _ret_from_exception
        l.jal   do_page_fault
         l.nop
        l.j     _ret_from_exception


@@ -348,7 +348,7 @@ EXCEPTION_ENTRY(_insn_page_fault_handler)
        /* r4 set be EXCEPTION_HANDLE */   // effective address of fault
        l.ori   r6,r0,0x0                  // !write access
 
        /* r4 set be EXCEPTION_HANDLE */   // effective address of fault
        l.ori   r6,r0,0x0                  // !write access
 

-       /* call fault.c handler in or32/mm/fault.c */
+       /* call fault.c handler in openrisc/mm/fault.c */

        l.jal   do_page_fault
         l.nop
        l.j     _ret_from_exception
        l.jal   do_page_fault
         l.nop
        l.j     _ret_from_exception


@@ -547,6 +547,7 @@ EXCEPTION_ENTRY(_external_irq_handler)
        l.bnf   1f                      // ext irq enabled, all ok.
        l.nop
 
        l.bnf   1f                      // ext irq enabled, all ok.
        l.nop
 

+#ifdef CONFIG_PRINTK

        l.addi  r1,r1,-0x8
        l.movhi r3,hi(42f)
        l.ori   r3,r3,lo(42f)
        l.addi  r1,r1,-0x8
        l.movhi r3,hi(42f)
        l.ori   r3,r3,lo(42f)


@@ -560,6 +561,7 @@ EXCEPTION_ENTRY(_external_irq_handler)
                .string "\n\rESR interrupt bug: in _external_irq_handler (ESR %x)\n\r"
                .align 4
        .previous
                .string "\n\rESR interrupt bug: in _external_irq_handler (ESR %x)\n\r"
                .align 4
        .previous

+#endif

 
        l.ori   r4,r4,SPR_SR_IEE        // fix the bug
 //     l.sw    PT_SR(r1),r4
 
        l.ori   r4,r4,SPR_SR_IEE        // fix the bug
 //     l.sw    PT_SR(r1),r4