2 files changed, 2 insertions, 2 deletions

diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S
index 2c18d08cd913..c52bef39e250 100644
--- a/arch/cris/arch-v10/kernel/entry.S
+++ b/arch/cris/arch-v10/kernel/entry.S
@@ -358,7 +358,7 @@ mmu_bus_fault:
 1:      btstq   12, $r1            ; Refill?
         bpl     2f
         lsrq    24, $r1     ; Get PGD index (bit 24-31)
-        move.d  [per_cpu__current_pgd], $r0 ; PGD for the current process
+        move.d  [current_pgd], $r0 ; PGD for the current process
         move.d  [$r0+$r1.d], $r0   ; Get PMD
         beq     2f
         nop
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c
index 5d75f77f9c73..1a61efc13982 100644
--- a/arch/cris/arch-v10/kernel/irq.c
+++ b/arch/cris/arch-v10/kernel/irq.c
@@ -133,7 +133,7 @@ static void end_crisv10_irq(unsigned int irq)
 }
 
 static struct irq_chip crisv10_irq_type = {
-        .typename =    "CRISv10",
+        .name =        "CRISv10",
         .startup =     startup_crisv10_irq,
         .shutdown =    shutdown_crisv10_irq,
         .enable =      enable_crisv10_irq,