projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-powerpc
/
spu.h
diff --git
a/include/asm-powerpc/spu.h
b/include/asm-powerpc/spu.h
index e3c845b0f76438af611c8450c36e4660b076207b..99348c1f4cab3360ff697ead7cd21a55acf39c5a 100644
(file)
--- a/
include/asm-powerpc/spu.h
+++ b/
include/asm-powerpc/spu.h
@@
-100,6
+100,7
@@
/* Flag indicating progress during context switch. */
#define SPU_CONTEXT_SWITCH_PENDING 0UL
/* Flag indicating progress during context switch. */
#define SPU_CONTEXT_SWITCH_PENDING 0UL
+#define SPU_CONTEXT_FAULT_PENDING 1UL
struct spu_context;
struct spu_runqueue;
struct spu_context;
struct spu_runqueue;
@@
-128,9
+129,10
@@
struct spu {
unsigned int irqs[3];
u32 node;
u64 flags;
unsigned int irqs[3];
u32 node;
u64 flags;
- u64 dar;
- u64 dsisr;
u64 class_0_pending;
u64 class_0_pending;
+ u64 class_0_dar;
+ u64 class_1_dar;
+ u64 class_1_dsisr;
size_t ls_size;
unsigned int slb_replace;
struct mm_struct *mm;
size_t ls_size;
unsigned int slb_replace;
struct mm_struct *mm;
@@
-143,7
+145,7
@@
struct spu {
void (* wbox_callback)(struct spu *spu);
void (* ibox_callback)(struct spu *spu);
void (* wbox_callback)(struct spu *spu);
void (* ibox_callback)(struct spu *spu);
- void (* stop_callback)(struct spu *spu);
+ void (* stop_callback)(struct spu *spu
, int irq
);
void (* mfc_callback)(struct spu *spu);
char irq_c0[8];
void (* mfc_callback)(struct spu *spu);
char irq_c0[8];