From fe05fff422f70a152f35445c3ff3bb26b21ce2ec Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 22 Jun 2010 17:52:47 +0200 Subject: [PATCH] --- yaml --- r: 204665 b: refs/heads/master c: 66f7de8634b39fb685556419fc12522e96990d32 h: refs/heads/master i: 204663: 4124fccb77aaa513e8e2d89187f20fb6d0d7475d v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/entry.S | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 95cd37df2c0e..a12efacb56d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c318d483b3d9cf68d791b4024760cb171dae1215 +refs/heads/master: 66f7de8634b39fb685556419fc12522e96990d32 diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/arch/microblaze/kernel/entry.S index ff8d9872c774..16cb4f1d2338 100644 --- a/trunk/arch/microblaze/kernel/entry.S +++ b/trunk/arch/microblaze/kernel/entry.S @@ -48,56 +48,56 @@ */ #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR .macro clear_bip - msrclr r11, MSR_BIP + msrclr r0, MSR_BIP nop .endm .macro set_bip - msrset r11, MSR_BIP + msrset r0, MSR_BIP nop .endm .macro clear_eip - msrclr r11, MSR_EIP + msrclr r0, MSR_EIP nop .endm .macro set_ee - msrset r11, MSR_EE + msrset r0, MSR_EE nop .endm .macro disable_irq - msrclr r11, MSR_IE + msrclr r0, MSR_IE nop .endm .macro enable_irq - msrset r11, MSR_IE + msrset r0, MSR_IE nop .endm .macro set_ums - msrset r11, MSR_UMS + msrset r0, MSR_UMS nop - msrclr r11, MSR_VMS + msrclr r0, MSR_VMS nop .endm .macro set_vms - msrclr r11, MSR_UMS + msrclr r0, MSR_UMS nop - msrset r11, MSR_VMS + msrset r0, MSR_VMS nop .endm .macro clear_ums - msrclr r11, MSR_UMS + msrclr r0, MSR_UMS nop .endm .macro clear_vms_ums - msrclr r11, MSR_VMS | MSR_UMS + msrclr r0, MSR_VMS | MSR_UMS nop .endm #else