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 8c8ac34..edaa775 100644 (file)
--- a/arch/openrisc/kernel/entry.S
+++ b/arch/openrisc/kernel/entry.S
@@ -552,7 +552,7 @@ EXCEPTION_ENTRY(_external_irq_handler)
        l.movhi r3,hi(42f)
        l.ori   r3,r3,lo(42f)
        l.sw    0x0(r1),r3
        l.movhi r3,hi(42f)
        l.ori   r3,r3,lo(42f)
        l.sw    0x0(r1),r3

-       l.jal   printk
+       l.jal   _printk

        l.sw    0x4(r1),r4
        l.addi  r1,r1,0x8
 
        l.sw    0x4(r1),r4
        l.addi  r1,r1,0x8
 


@@ -683,8 +683,8 @@ _syscall_debug:
        l.sw    -4(r1),r27
        l.sw    -8(r1),r11
        l.addi  r1,r1,-8
        l.sw    -4(r1),r27
        l.sw    -8(r1),r11
        l.addi  r1,r1,-8

-       l.movhi r27,hi(printk)
-       l.ori   r27,r27,lo(printk)
+       l.movhi r27,hi(_printk)
+       l.ori   r27,r27,lo(_printk)

        l.jalr  r27
         l.nop
        l.addi  r1,r1,8
        l.jalr  r27
         l.nop
        l.addi  r1,r1,8