diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 08:18:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 08:18:27 -0400 |
| commit | 52bef0cb107d0cc801bbdb931de97d3e501ebf2c (patch) | |
| tree | df4013c47fc2100bb89e004d3141e5edd7ad112f /arch/powerpc/include/asm/processor.h | |
| parent | dc8a64ee1ab3f7ef34488392de7ee908047d6f99 (diff) | |
| parent | 71528d8bd7a8aa920cd69d4223c6c87d5849257d (diff) | |
Merge tag 'powerpc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- Fixup preempt underflow with huge pages from Sebastian Siewior
- Fix altivec SPR not being saved from Oliver O'Halloran
- Correct used_vsr comment from Simon Guo
* tag 'powerpc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc: Correct used_vsr comment
powerpc/process: Fix altivec SPR not being saved
powerpc/mm: Fixup preempt underflow with huge pages
Diffstat (limited to 'arch/powerpc/include/asm/processor.h')
| -rw-r--r-- | arch/powerpc/include/asm/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 8ab8a1a9610a..009fab130cd8 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h | |||
| @@ -246,7 +246,7 @@ struct thread_struct { | |||
| 246 | #endif /* CONFIG_ALTIVEC */ | 246 | #endif /* CONFIG_ALTIVEC */ |
| 247 | #ifdef CONFIG_VSX | 247 | #ifdef CONFIG_VSX |
| 248 | /* VSR status */ | 248 | /* VSR status */ |
| 249 | int used_vsr; /* set if process has used altivec */ | 249 | int used_vsr; /* set if process has used VSX */ |
| 250 | #endif /* CONFIG_VSX */ | 250 | #endif /* CONFIG_VSX */ |
| 251 | #ifdef CONFIG_SPE | 251 | #ifdef CONFIG_SPE |
| 252 | unsigned long evr[32]; /* upper 32-bits of SPE regs */ | 252 | unsigned long evr[32]; /* upper 32-bits of SPE regs */ |