From 65c50f8dfdc256e81c637ed2c0c34bb0b5e1b3ba Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Tue, 7 Jul 2009 02:47:14 +0000 Subject: [PATCH] --- yaml --- r: 155585 b: refs/heads/master c: ad863a9dc9887330b2ab753323063865c59d8db6 h: refs/heads/master i: 155583: 39cc9111a0721c1ca31e520a25f9b0678697186f v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/context.S | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ba4e5d885a73..3a6eff9f50ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a920accbb5f88d753ab5a6a47d0dd48b6269f84 +refs/heads/master: ad863a9dc9887330b2ab753323063865c59d8db6 diff --git a/trunk/arch/blackfin/include/asm/context.S b/trunk/arch/blackfin/include/asm/context.S index 16561ab18b38..f8a664f022b1 100644 --- a/trunk/arch/blackfin/include/asm/context.S +++ b/trunk/arch/blackfin/include/asm/context.S @@ -223,9 +223,10 @@ [--sp] = RETN; [--sp] = RETE; [--sp] = SEQSTAT; -#ifdef CONFIG_KGDB - r1.l = lo(IPEND); - r1.h = hi(IPEND); +#ifdef CONFIG_DEBUG_KERNEL + p1.l = lo(IPEND); + p1.h = hi(IPEND); + r1 = [p1]; [--sp] = r1; #else [--sp] = r0; /* Skip IPEND as well. */