diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /arch/powerpc/include/asm/processor.h | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/powerpc/include/asm/processor.h')
| -rw-r--r-- | arch/powerpc/include/asm/processor.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 221ba6240464..7492fe8ad6e4 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h | |||
| @@ -229,6 +229,9 @@ struct thread_struct { | |||
| 229 | unsigned long spefscr; /* SPE & eFP status */ | 229 | unsigned long spefscr; /* SPE & eFP status */ |
| 230 | int used_spe; /* set if process has used spe */ | 230 | int used_spe; /* set if process has used spe */ |
| 231 | #endif /* CONFIG_SPE */ | 231 | #endif /* CONFIG_SPE */ |
| 232 | #ifdef CONFIG_KVM_BOOK3S_32_HANDLER | ||
| 233 | void* kvm_shadow_vcpu; /* KVM internal data */ | ||
| 234 | #endif /* CONFIG_KVM_BOOK3S_32_HANDLER */ | ||
| 232 | }; | 235 | }; |
| 233 | 236 | ||
| 234 | #define ARCH_MIN_TASKALIGN 16 | 237 | #define ARCH_MIN_TASKALIGN 16 |