From f7faea78e477c846be5d5b97c918bc201656c41d Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 9 Oct 2012 08:58:19 +0200 Subject: [PATCH] --- yaml --- r: 344399 b: refs/heads/master c: 1475b0f4b4334564470a8606086a42954aa06ba9 h: refs/heads/master i: 344397: a422d00539659392f7a0b9bae0dfc45c38f48ac7 344395: 6ce69bc2ad8ff352789d47acc996bb81ed14b565 344391: ecb1a8c9372760054ff895aece2d90b0282072d7 344383: 4dcb3c39f37b23f1a889fa858959d6d5569fad73 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/entry-nommu.S | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e09dfc34d85e..76a59de63520 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cb0eab2db578345031c689d4ff9b70840271b5c +refs/heads/master: 1475b0f4b4334564470a8606086a42954aa06ba9 diff --git a/trunk/arch/microblaze/kernel/entry-nommu.S b/trunk/arch/microblaze/kernel/entry-nommu.S index cb0327f204ab..70da83a49670 100644 --- a/trunk/arch/microblaze/kernel/entry-nommu.S +++ b/trunk/arch/microblaze/kernel/entry-nommu.S @@ -465,7 +465,6 @@ ENTRY(_switch_to) ENTRY(ret_from_fork) addk r5, r0, r3 - addk r6, r0, r1 brlid r15, schedule_tail nop swi r31, r1, PT_R31 /* save r31 in user context. */