Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[powerpc.git] / include / asm-powerpc / system.h

diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index 027479d..5341b75 100644 (file)
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -8,7 +8,7 @@
 #include <linux/kernel.h>
 
 #include <asm/hw_irq.h>
-#include <asm/ppc_asm.h>
+#include <asm/atomic.h>
 
 /*
  * Memory barrier.
@@ -127,11 +127,12 @@ extern void flush_fp_to_thread(struct task_struct *);
 extern void enable_kernel_altivec(void);
 extern void giveup_altivec(struct task_struct *);
 extern void load_up_altivec(struct task_struct *);
+extern int emulate_altivec(struct pt_regs *);
 extern void giveup_spe(struct task_struct *);
 extern void load_up_spe(struct task_struct *);
 extern int fix_alignment(struct pt_regs *);
-extern void cvt_fd(float *from, double *to, unsigned long *fpscr);
-extern void cvt_df(double *from, float *to, unsigned long *fpscr);
+extern void cvt_fd(float *from, double *to, struct thread_struct *thread);
+extern void cvt_df(double *from, float *to, struct thread_struct *thread);
 
 #ifdef CONFIG_ALTIVEC
 extern void flush_altivec_to_thread(struct task_struct *);
@@ -176,6 +177,11 @@ extern struct task_struct *_switch(struct thread_struct *prev,
                                   struct thread_struct *next);
 
 extern unsigned int rtas_data;
+extern int mem_init_done;      /* set on boot once kmalloc can be called */
+extern unsigned long memory_limit;
+extern unsigned long klimit;
+
+extern int powersave_nap;      /* set if nap mode can be used in idle loop */
 
 /*
  * Atomic exchange
@@ -283,7 +289,7 @@ __cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new)
 
 #ifdef CONFIG_PPC64
 static __inline__ unsigned long
-__cmpxchg_u64(volatile long *p, unsigned long old, unsigned long new)
+__cmpxchg_u64(volatile unsigned long *p, unsigned long old, unsigned long new)
 {
        unsigned long prev;
 
@@ -346,7 +352,60 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new,
 
 #define arch_align_stack(x) (x)
 
+/* Used in very early kernel initialization. */
 extern unsigned long reloc_offset(void);
+extern unsigned long add_reloc_offset(unsigned long);
+extern void reloc_got2(unsigned long);
+
+#define PTRRELOC(x)    ((typeof(x)) add_reloc_offset((unsigned long)(x)))
+
+static inline void create_instruction(unsigned long addr, unsigned int instr)
+{
+       unsigned int *p;
+       p  = (unsigned int *)addr;
+       *p = instr;
+       asm ("dcbst 0, %0; sync; icbi 0,%0; sync; isync" : : "r" (p));
+}
+
+/* Flags for create_branch:
+ * "b"   == create_branch(addr, target, 0);
+ * "ba"  == create_branch(addr, target, BRANCH_ABSOLUTE);
+ * "bl"  == create_branch(addr, target, BRANCH_SET_LINK);
+ * "bla" == create_branch(addr, target, BRANCH_ABSOLUTE | BRANCH_SET_LINK);
+ */
+#define BRANCH_SET_LINK        0x1
+#define BRANCH_ABSOLUTE        0x2
+
+static inline void create_branch(unsigned long addr,
+               unsigned long target, int flags)
+{
+       unsigned int instruction;
+
+       if (! (flags & BRANCH_ABSOLUTE))
+               target = target - addr;
+
+       /* Mask out the flags and target, so they don't step on each other. */
+       instruction = 0x48000000 | (flags & 0x3) | (target & 0x03FFFFFC);
+
+       create_instruction(addr, instruction);
+}
+
+static inline void create_function_call(unsigned long addr, void * func)
+{
+       unsigned long func_addr;
+
+#ifdef CONFIG_PPC64
+       /*
+        * On PPC64 the function pointer actually points to the function's
+        * descriptor. The first entry in the descriptor is the address
+        * of the function text.
+        */
+       func_addr = *(unsigned long *)func;
+#else
+       func_addr = (unsigned long)func;
+#endif
+       create_branch(addr, func_addr, BRANCH_SET_LINK);
+}
 
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_SYSTEM_H */