vserver 1.9.5.x5

[linux-2.6.git] / include / asm-arm / page.h

diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index a270052..4ca3a8e 100644 (file)
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -85,14 +85,10 @@
 #endif
 
 #ifdef CONFIG_CPU_COPY_V6
-# ifdef _USER
-#  define MULTI_USER 1
-# else
-#  define _USER v6
-# endif
+# define MULTI_USER 1
 #endif
 
-#ifndef _USER
+#if !defined(_USER) && !defined(MULTI_USER)
 #error Unknown user operations model
 #endif