summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2006-08-31 01:53:35 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2006-08-31 01:53:35 +0000
commitddee935174ca59d610cca29c5134877f084beee5 (patch)
tree8a78affa09d2ac4b13a68c64fe2a21111cc9bd69 /cpukit
parent2006-08-30 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-ddee935174ca59d610cca29c5134877f084beee5.tar.bz2
2006-08-30 Joel Sherrill <joel@OARcorp.com>
* rtems/score/cpu.h: Revert change. It did not appear to correct all warnings.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/score/cpu/h8300/ChangeLog5
-rw-r--r--cpukit/score/cpu/h8300/rtems/score/cpu.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog
index 47882e6d08..084d2c083e 100644
--- a/cpukit/score/cpu/h8300/ChangeLog
+++ b/cpukit/score/cpu/h8300/ChangeLog
@@ -1,5 +1,10 @@
2006-08-30 Joel Sherrill <joel@OARcorp.com>
+ * rtems/score/cpu.h: Revert change. It did not appear to correct all
+ warnings.
+
+2006-08-30 Joel Sherrill <joel@OARcorp.com>
+
* rtems/score/cpu.h:
2006-08-29 Joel Sherrill <joel@OARcorp.com>
diff --git a/cpukit/score/cpu/h8300/rtems/score/cpu.h b/cpukit/score/cpu/h8300/rtems/score/cpu.h
index 4156225393..c7f3b3c77b 100644
--- a/cpukit/score/cpu/h8300/rtems/score/cpu.h
+++ b/cpukit/score/cpu/h8300/rtems/score/cpu.h
@@ -626,8 +626,7 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)();
#define _CPU_ISR_Disable( _isr_cookie ) \
do { \
- _isr_cookie = 0; /* to avoid warnings */; \
- asm volatile( "stc.w ccr, @-er7 ;\n orc #0xC0,ccr ;\n mov.w @er7+,%0" : "=r" (_isr_cookie) : ); \
+ asm volatile( "stc.w ccr, @-er7 ;\n orc #0xC0,ccr ;\n mov.w @er7+,%0" : : "r" (_isr_cookie) ); \
} while (0)