From 2c4d3879f564a93bc204f4af0e97b063e8e46ab1 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 20 Aug 2010 12:47:38 +0000 Subject: [PATCH] 2010-08-20 Gedare Bloom PR 1681/cpukit * shared/score/interrupt.S: With the percpu patch, ASM uses INTERRUPT_STACK_HIGH instead of _CPU_Interrupt_stack_high. The sparc64 was still using the old variable, which was declared in its cpu.h file. This patch to comment out the declaration and switch to using INTERRUPT_STACK_HIGH. --- c/src/lib/libcpu/sparc64/ChangeLog | 9 +++++++++ c/src/lib/libcpu/sparc64/shared/score/interrupt.S | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/c/src/lib/libcpu/sparc64/ChangeLog b/c/src/lib/libcpu/sparc64/ChangeLog index 3184c16cdd..a648f63bf2 100644 --- a/c/src/lib/libcpu/sparc64/ChangeLog +++ b/c/src/lib/libcpu/sparc64/ChangeLog @@ -1,3 +1,12 @@ +2010-08-20 Gedare Bloom + + PR 1681/cpukit + * shared/score/interrupt.S: With the percpu patch, ASM uses + INTERRUPT_STACK_HIGH instead of _CPU_Interrupt_stack_high. The + sparc64 was still using the old variable, which was declared in its + cpu.h file. This patch to comment out the declaration and switch to + using INTERRUPT_STACK_HIGH. + 2010-06-28 Joel Sherrill PR 1573/cpukit diff --git a/c/src/lib/libcpu/sparc64/shared/score/interrupt.S b/c/src/lib/libcpu/sparc64/shared/score/interrupt.S index 1540366664..4532cc563b 100644 --- a/c/src/lib/libcpu/sparc64/shared/score/interrupt.S +++ b/c/src/lib/libcpu/sparc64/shared/score/interrupt.S @@ -195,7 +195,7 @@ PUBLIC(_ISR_Handler) subcc %g4, 1, %g4 ! outermost interrupt handler? bnz dont_switch_stacks ! No, then do not switch stacks - setx SYM(_CPU_Interrupt_stack_high), %o5, %g1 + setx SYM(INTERRUPT_STACK_HIGH), %o5, %g1 ldx [%g1], %sp /*