aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-12-19 22:41:27 -0500
committerPaul Mackerras <paulus@samba.org>2007-12-19 22:41:27 -0500
commit2c0b713f70ecccaf4f535caf602f41350a9f484a (patch)
treead8954d362140f9ca0c67a86e1899e6be90af8a1 /include
parentf91266edba3c6ef001819c5abe4c3a0643f66fc9 (diff)
parent1e7710390f95b7efb3f74fd2f8b5fc28656b458c (diff)
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6 into for-2.6.25
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/spu.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index b1accce77bb5..314aad357d98 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -104,6 +104,7 @@
104 104
105struct spu_context; 105struct spu_context;
106struct spu_runqueue; 106struct spu_runqueue;
107struct spu_lscsa;
107struct device_node; 108struct device_node;
108 109
109enum spu_utilization_state { 110enum spu_utilization_state {
@@ -200,6 +201,9 @@ int spu_irq_class_0_bottom(struct spu *spu);
200int spu_irq_class_1_bottom(struct spu *spu); 201int spu_irq_class_1_bottom(struct spu *spu);
201void spu_irq_setaffinity(struct spu *spu, int cpu); 202void spu_irq_setaffinity(struct spu *spu, int cpu);
202 203
204void spu_setup_kernel_slbs(struct spu *spu, struct spu_lscsa *lscsa,
205 void *code, int code_size);
206
203#ifdef CONFIG_KEXEC 207#ifdef CONFIG_KEXEC
204void crash_register_spus(struct list_head *list); 208void crash_register_spus(struct list_head *list);
205#else 209#else
@@ -210,6 +214,7 @@ static inline void crash_register_spus(struct list_head *list)
210 214
211extern void spu_invalidate_slbs(struct spu *spu); 215extern void spu_invalidate_slbs(struct spu *spu);
212extern void spu_associate_mm(struct spu *spu, struct mm_struct *mm); 216extern void spu_associate_mm(struct spu *spu, struct mm_struct *mm);
217int spu_64k_pages_available(void);
213 218
214/* Calls from the memory management to the SPU */ 219/* Calls from the memory management to the SPU */
215struct mm_struct; 220struct mm_struct;