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/kernel/process.c | |
| 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/kernel/process.c')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 612df305886b..b8500b4ac7fe 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
| @@ -983,7 +983,7 @@ void restore_tm_state(struct pt_regs *regs) | |||
| 983 | static inline void save_sprs(struct thread_struct *t) | 983 | static inline void save_sprs(struct thread_struct *t) |
| 984 | { | 984 | { |
| 985 | #ifdef CONFIG_ALTIVEC | 985 | #ifdef CONFIG_ALTIVEC |
| 986 | if (cpu_has_feature(cpu_has_feature(CPU_FTR_ALTIVEC))) | 986 | if (cpu_has_feature(CPU_FTR_ALTIVEC)) |
| 987 | t->vrsave = mfspr(SPRN_VRSAVE); | 987 | t->vrsave = mfspr(SPRN_VRSAVE); |
| 988 | #endif | 988 | #endif |
| 989 | #ifdef CONFIG_PPC_BOOK3S_64 | 989 | #ifdef CONFIG_PPC_BOOK3S_64 |