vserver 1.9.5.x5

[linux-2.6.git] / include / asm-ia64 / processor.h

diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index f62f93c..8769dd9 100644 (file)
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -20,6 +20,9 @@
 #include <asm/ptrace.h>
 #include <asm/ustack.h>
 
+/* Our arch specific arch_init_sched_domain is in arch/ia64/kernel/domain.c */
+#define ARCH_HAS_SCHED_DOMAIN
+
 #define IA64_NUM_DBG_REGS      8
 /*
  * Limits for PMC and PMD are set to less than maximum architected values
@@ -28,8 +31,8 @@
 #define IA64_NUM_PMC_REGS      32
 #define IA64_NUM_PMD_REGS      32
 
-#define DEFAULT_MAP_BASE       0x2000000000000000
-#define DEFAULT_TASK_SIZE      0xa000000000000000
+#define DEFAULT_MAP_BASE       __IA64_UL_CONST(0x2000000000000000)
+#define DEFAULT_TASK_SIZE      __IA64_UL_CONST(0xa000000000000000)
 
 /*
  * TASK_SIZE really is a mis-named.  It really is the maximum user
@@ -200,7 +203,7 @@ typedef struct {
 #define GET_UNALIGN_CTL(task,addr)                                                             \
 ({                                                                                             \
        put_user(((task)->thread.flags & IA64_THREAD_UAC_MASK) >> IA64_THREAD_UAC_SHIFT,        \
-                (int *) (addr));                                                               \
+                (int __user *) (addr));                                                        \
 })
 
 #define SET_FPEMU_CTL(task,value)                                                              \
@@ -212,7 +215,7 @@ typedef struct {
 #define GET_FPEMU_CTL(task,addr)                                                               \
 ({                                                                                             \
        put_user(((task)->thread.flags & IA64_THREAD_FPEMU_MASK) >> IA64_THREAD_FPEMU_SHIFT,    \
-                (int *) (addr));                                                               \
+                (int __user *) (addr));                                                        \
 })
 
 #ifdef CONFIG_IA32_SUPPORT
@@ -262,7 +265,7 @@ struct thread_struct {
                                .fdr =          0,                      \
                                .old_k1 =       0,                      \
                                .old_iob =      0,                      \
-                               .ppl =          0,
+                               .ppl =          NULL,
 #else
 # define INIT_THREAD_IA32
 #endif /* CONFIG_IA32_SUPPORT */
@@ -688,6 +691,8 @@ prefetchw (const void *x)
 
 #define spin_lock_prefetch(x)  prefetchw(x)
 
+extern unsigned long boot_option_idle_override;
+
 #endif /* !__ASSEMBLY__ */
 
 #endif /* _ASM_IA64_PROCESSOR_H */