diff --git a/[refs] b/[refs] index d3f67bba0f70..8aa0347cd58d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7741075b37e2be6693def1ff98487e3aef67874 +refs/heads/master: da23355280d106b1160a0a07028838097b639f0b diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/arch/microblaze/kernel/entry.S index 8f6b4eea4a6f..0747e1d61d55 100644 --- a/trunk/arch/microblaze/kernel/entry.S +++ b/trunk/arch/microblaze/kernel/entry.S @@ -282,9 +282,8 @@ tophys(r1,r1); \ addik r1, r1, -STATE_SAVE_SIZE; /* Make room on the stack. */\ SAVE_REGS \ - swi r1, r1, PTO+PT_MODE; \ brid 2f; \ - nop; /* Fill delay slot */ \ + swi r1, r1, PTO+PT_MODE; \ 1: /* User-mode state save. */ \ lwi r1, r0, TOPHYS(PER_CPU(CURRENT_SAVE)); /* get saved current */\ tophys(r1,r1); \