Merge tag 'arc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[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 98e4f97..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:
 
-       /* 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
@@ -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
 
-       /* 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
@@ -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.jal   printk
+       l.jal   _printk
        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.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