From dce9e35a5372787348780cd684a1bfd0bf3b17b5 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 6 Aug 2010 10:42:30 +0200 Subject: [PATCH] --- yaml --- r: 217127 b: refs/heads/master c: 7d4320956f0f8aa2c36c23f209acc3e4c3ae52d6 h: refs/heads/master i: 217125: d5afd0376ae85d870ca2c5d5df1d37067437bb69 217123: 21a31ba8b6501a867993421f7109d52582f320f6 217119: da2c86d3b4b34388dc608a9aa1c0b2faba8f2d1c v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/entry.S | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 877b918db39a..65ff448472c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 791d0a169b912220d58e0ce4564d7bf1e68146a8 +refs/heads/master: 7d4320956f0f8aa2c36c23f209acc3e4c3ae52d6 diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/arch/microblaze/kernel/entry.S index ab4f1e159308..8539c6c0e741 100644 --- a/trunk/arch/microblaze/kernel/entry.S +++ b/trunk/arch/microblaze/kernel/entry.S @@ -295,6 +295,8 @@ C_ENTRY(_user_exception): /* addik r1, r1, -STATE_SAVE_SIZE; */ addik r1, r1, THREAD_SIZE + CONFIG_KERNEL_BASE_ADDR - CONFIG_KERNEL_START - STATE_SAVE_SIZE; SAVE_REGS + swi r0, r1, PTO + PT_R3 + swi r0, r1, PTO + PT_R4 lwi r11, r0, TOPHYS(PER_CPU(ENTRY_SP)); swi r11, r1, PTO+PT_R1; /* Store user SP. */