diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/blackfin/include/asm/context.S | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/blackfin/include/asm/context.S')
| -rw-r--r-- | arch/blackfin/include/asm/context.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/blackfin/include/asm/context.S b/arch/blackfin/include/asm/context.S index 16561ab18b38..f8a664f022b1 100644 --- a/arch/blackfin/include/asm/context.S +++ b/arch/blackfin/include/asm/context.S | |||
| @@ -223,9 +223,10 @@ | |||
| 223 | [--sp] = RETN; | 223 | [--sp] = RETN; |
| 224 | [--sp] = RETE; | 224 | [--sp] = RETE; |
| 225 | [--sp] = SEQSTAT; | 225 | [--sp] = SEQSTAT; |
| 226 | #ifdef CONFIG_KGDB | 226 | #ifdef CONFIG_DEBUG_KERNEL |
| 227 | r1.l = lo(IPEND); | 227 | p1.l = lo(IPEND); |
| 228 | r1.h = hi(IPEND); | 228 | p1.h = hi(IPEND); |
| 229 | r1 = [p1]; | ||
| 229 | [--sp] = r1; | 230 | [--sp] = r1; |
| 230 | #else | 231 | #else |
| 231 | [--sp] = r0; /* Skip IPEND as well. */ | 232 | [--sp] = r0; /* Skip IPEND as well. */ |