summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/score/src/isr.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 4d376a37ad..d9a52cc947 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-01 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ PR 1733/cpukit
+ * score/src/isr.c: If target architecture does nto require stack
+ initialization, then do not perform adjustment.
+
2011-02-01 Ralf Corsepius <ralf.corsepius@rtems.org>
* libcsupport/src/printk.c: Fix typo.
diff --git a/cpukit/score/src/isr.c b/cpukit/score/src/isr.c
index 00361a5b8e..799bb08dbb 100644
--- a/cpukit/score/src/isr.c
+++ b/cpukit/score/src/isr.c
@@ -62,8 +62,10 @@ void _ISR_Handler_initialization( void )
Configuration.interrupt_stack_size
);
+#if (CPU_STACK_ALIGNMENT != 0)
_CPU_Interrupt_stack_high = (void *)
((uintptr_t) _CPU_Interrupt_stack_high & ~(CPU_STACK_ALIGNMENT - 1));
+#endif
/* Interrupt stack might have to be aligned and/or setup
* in a specific way.