From 97c3f8ddb08c4269b61533b55c7675705b6ec5fa Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 22 Jun 2010 20:49:46 +0200 Subject: [PATCH] --- yaml --- r: 204673 b: refs/heads/master c: 0a6b08fda6e3229713e779e30028598c067e904d h: refs/heads/master i: 204671: 179fa34798512efa15728630ee4926870a4d653f v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/entry.S | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9e8c3474b899..46905eb408a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80c5ff6b9b2dd9a2e99d3d6f74df5e6f888d43e9 +refs/heads/master: 0a6b08fda6e3229713e779e30028598c067e904d diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/arch/microblaze/kernel/entry.S index f4fda8578551..6c117ceaabea 100644 --- a/trunk/arch/microblaze/kernel/entry.S +++ b/trunk/arch/microblaze/kernel/entry.S @@ -728,10 +728,8 @@ C_ENTRY(_interrupt): /* MS: Make room on the stack -> activation record */ addik r1, r1, -STATE_SAVE_SIZE; SAVE_REGS - swi r1, r1, PTO + PT_MODE; /* 0 - user mode, 1 - kernel mode */ brid 2f; - nop; /* MS: Fill delay slot */ - + swi r1, r1, PTO + PT_MODE; /* 0 - user mode, 1 - kernel mode */ 1: /* User-mode state save. */ /* MS: get the saved current */