Index: kernel/test/fpu/fpu1/test.c
===================================================================
--- kernel/test/fpu/fpu1/test.c	(revision a796127170a8ce9b89fe78fa9fb1b13f5b742b74)
+++ kernel/test/fpu/fpu1/test.c	(revision b254b3b9cf2ab6ddfb7a668c8739854bc5da0efb)
@@ -46,13 +46,13 @@
 
 
-#ifdef __ia32_ARCH_H__
+#ifdef KERN_ia32_ARCH_H_
 static inline double sqrt(double x) { double v; __asm__ ("fsqrt\n" : "=t" (v) : "0" (x)); return v; }
 #endif
 
-#ifdef __amd64_ARCH_H__
+#ifdef KERN_amd64_ARCH_H_
 static inline double sqrt(double x) { double v; __asm__ ("fsqrt\n" : "=t" (v) : "0" (x)); return v; }
 #endif
 
-#ifdef __ia64_ARCH_H__
+#ifdef KERN_ia64_ARCH_H_
 static inline long double sqrt(long double a) 
 {   
@@ -106,5 +106,5 @@
 {
 
-#ifdef __ia64_ARCH_H__
+#ifdef KERN_ia64_ARCH_H_
 #undef PI_10e8	
 #define PI_10e8	3141592
@@ -135,5 +135,5 @@
 		}
 
-#ifdef __ia64_ARCH_H__
+#ifdef KERN_ia64_ARCH_H_
 		if((int)(1000000*pi)!=PI_10e8)
 			panic("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (1000000*pi),(unative_t) (PI_10e8/100));