--- a/kernel/eka/include/nkern/nk_cpu.h	Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/include/nkern/nk_cpu.h	Wed Sep 01 12:34:56 2010 +0100
@@ -669,18 +669,6 @@
 
 #define	__chill()
 
-#ifdef 	__CPU_ARM_HAS_WFE_SEV
-
-extern "C" void __arm_wfe();
-extern "C" void __arm_sev();
-
-#define	__snooze()	__arm_wfe()
-#define	__holler()	__arm_sev()
-#else
-#define	__snooze()
-#define	__holler()
-#endif
-
 #if defined(__SMP__) && !defined(__CPU_ARM_HAS_LDREX_STREX_V6K)
 #error SMP not allowed without v6K
 #endif
@@ -688,8 +676,6 @@
 #error SMP not allowed without thread ID registers
 #endif
 
-#define	__SRATIO_MACHINE_CODED__
-
 #endif	//	end of __CPU_ARM
 
 #if defined(__CPU_X86) && defined(__EPOC32__)
@@ -710,9 +696,6 @@
 #error Unknown x86 compiler
 #endif
 
-#define	__snooze()	__chill()
-#define	__holler()
-
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -814,8 +797,8 @@
 
 #define USER_MEMORY_GUARD_SAVE_WORDS			2
 #define USER_MEMORY_DOMAIN						15
-#define	USER_MEMORY_DOMAIN_MASK					(3U << (2*USER_MEMORY_DOMAIN))
-#define	USER_MEMORY_DOMAIN_CLIENT				(1U << (2*USER_MEMORY_DOMAIN))
+#define	USER_MEMORY_DOMAIN_MASK					(3 << (2*USER_MEMORY_DOMAIN))
+#define	USER_MEMORY_DOMAIN_CLIENT				(1 << (2*USER_MEMORY_DOMAIN))
 
 // Save the DACR in the named register
 #define USER_MEMORY_GUARD_SAVE(save)											\