diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 18:41:58 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 18:41:58 -0400 |
| commit | 636c8a8d85d0564222071f0caa4a4e6bf527efe5 (patch) | |
| tree | f1958f80f596cfcf496904f12a62662fa79ce990 /arch/powerpc/include/asm/processor.h | |
| parent | 39ec5cbed0bb1878d0b65af0c5e653e37e1945a5 (diff) | |
| parent | d48d5691ebf88a15d95ba96486917ffc79256536 (diff) | |
Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.6-rc3
Here are some new device ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
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 */ |