--- a/packages/kernel/current/tests/kcache2.c
+++ b/packages/kernel/current/tests/kcache2.c
@@ -5,29 +5,38 @@
 //        Cache feature/timing tests
 //
 //==========================================================================
-//####COPYRIGHTBEGIN####
-//                                                                          
-// -------------------------------------------                              
-// The contents of this file are subject to the Red Hat eCos Public License 
-// Version 1.1 (the "License"); you may not use this file except in         
-// compliance with the License.  You may obtain a copy of the License at    
-// http://www.redhat.com/                                                   
-//                                                                          
-// Software distributed under the License is distributed on an "AS IS"      
-// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the 
-// License for the specific language governing rights and limitations under 
-// the License.                                                             
-//                                                                          
-// The Original Code is eCos - Embedded Configurable Operating System,      
-// released September 30, 1998.                                             
-//                                                                          
-// The Initial Developer of the Original Code is Red Hat.                   
-// Portions created by Red Hat are                                          
-// Copyright (C) 1998, 1999, 2000 Red Hat, Inc.                             
-// All Rights Reserved.                                                     
-// -------------------------------------------                              
-//                                                                          
-//####COPYRIGHTEND####
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
 //==========================================================================
 //#####DESCRIPTIONBEGIN####
 //
@@ -256,20 +265,15 @@ static void test_dstore(void)
     HAL_DCACHE_SYNC();
     HAL_DCACHE_INVALIDATE_ALL();
     HAL_DCACHE_ENABLE();
-    HAL_RESTORE_INTERRUPTS(oldints);
 
     aligned_p =  (volatile cyg_uint8*) 
         (((unsigned long) &m[HAL_DCACHE_LINE_SIZE*2]) 
          & ~(HAL_DCACHE_LINE_SIZE-1));
 
-    HAL_DISABLE_INTERRUPTS(oldints);
-
     aligned_p[0] = 42 + aligned_p[1]; // Load causes cache to be used!
 
     HAL_DCACHE_STORE(aligned_p, HAL_DCACHE_LINE_SIZE);
 
-    HAL_RESTORE_INTERRUPTS(oldints);
-
     CYG_TEST_CHECK(42 == aligned_p[0],
                    "memory didn't contain flushed data");
 
@@ -277,6 +281,8 @@ static void test_dstore(void)
 
     CYG_TEST_CHECK(42 == aligned_p[0],
                    "memory didn't contain flushed data after invalidate all");
+
+    HAL_RESTORE_INTERRUPTS(oldints);
 }
 #endif
 
@@ -303,21 +309,16 @@ static void test_dsync(void)
     HAL_DCACHE_SYNC();
     HAL_DCACHE_INVALIDATE_ALL();
     HAL_DCACHE_ENABLE();
-    HAL_RESTORE_INTERRUPTS(oldints);
 
     aligned_p =  (volatile cyg_uint8*) 
         (((unsigned long) &m[HAL_DCACHE_LINE_SIZE*2]) 
          & ~(HAL_DCACHE_LINE_SIZE-1));
 
-    HAL_DISABLE_INTERRUPTS(oldints);
-
     aligned_p[0] = 42 + aligned_p[1]; // Load causes cache to be used!
     aligned_p[HAL_DCACHE_LINE_SIZE] = 43 + aligned_p[HAL_DCACHE_LINE_SIZE + 1];
 
     HAL_DCACHE_SYNC();
 
-    HAL_RESTORE_INTERRUPTS(oldints);
-
     CYG_TEST_CHECK(42 == aligned_p[0],
                    "memory didn't contain flushed data");
     CYG_TEST_CHECK(43 == aligned_p[HAL_DCACHE_LINE_SIZE], 
@@ -330,6 +331,8 @@ static void test_dsync(void)
     CYG_TEST_CHECK(43 == aligned_p[HAL_DCACHE_LINE_SIZE], 
                    "memory didn't contain flushed data next block after invalidate");
 
+    HAL_RESTORE_INTERRUPTS(oldints);
+
     HAL_ICACHE_INVALIDATE_ALL();    
     HAL_DCACHE_DISABLE();
 
@@ -469,14 +472,11 @@ static void test_dinvalidate_all(void)
     HAL_DCACHE_SYNC();
     HAL_DCACHE_INVALIDATE_ALL();
     HAL_DCACHE_ENABLE();
-    HAL_RESTORE_INTERRUPTS(oldints);
 
     aligned_p =  (volatile cyg_uint8*) 
         (((unsigned long) &m[HAL_DCACHE_LINE_SIZE*2]) 
          & ~(HAL_DCACHE_LINE_SIZE-1));
 
-    HAL_DISABLE_INTERRUPTS(oldints);
-
     aligned_p[0] = 43 + aligned_p[1]; // Load causes cache to be used!
     aligned_p[HAL_DCACHE_LINE_SIZE-1] = 43;