From 32deb42cd38a4faa43f2a3e4ee596bbd5db8e309 Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Fri, 15 Feb 2013 17:07:17 +0100 Subject: [PATCH] --- yaml --- r: 359122 b: refs/heads/master c: ae6fef1790512edde8776ee2a158b1e13d085f61 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/openrisc/kernel/entry.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8172824dfcf4..474fd5aa9f92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4f5b53603468ef229d16350639e293f12128b62 +refs/heads/master: ae6fef1790512edde8776ee2a158b1e13d085f61 diff --git a/trunk/arch/openrisc/kernel/entry.S b/trunk/arch/openrisc/kernel/entry.S index 3de971224cfc..e7fadc0234cd 100644 --- a/trunk/arch/openrisc/kernel/entry.S +++ b/trunk/arch/openrisc/kernel/entry.S @@ -1050,7 +1050,7 @@ ENTRY(_switch) * we are expected to have set up the arg to schedule_tail already, * hence we do so here unconditionally: */ - l.lwz r3,TI_STACK(r3) /* Load 'prev' as schedule_tail arg */ + l.lwz r3,TI_TASK(r3) /* Load 'prev' as schedule_tail arg */ l.jr r9 l.nop