diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-12 09:32:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-12 09:32:49 -0800 |
| commit | 0f3d41e82d78bf521dfee4d6db1d247628dcf399 (patch) | |
| tree | 16c27275ac2af947f18622057ff151d468b75220 | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| parent | csky: fix typo of fpu config macro (diff) | |
| download | linux-dev-0f3d41e82d78bf521dfee4d6db1d247628dcf399.tar.xz linux-dev-0f3d41e82d78bf521dfee4d6db1d247628dcf399.zip | |
Merge tag 'csky-for-linus-5.16-rc5' of git://github.com/c-sky/csky-linux
Pull csky from Guo Ren:
"Only one fix for csky: fix fpu config macro"
* tag 'csky-for-linus-5.16-rc5' of git://github.com/c-sky/csky-linux:
csky: fix typo of fpu config macro
| -rw-r--r-- | arch/csky/kernel/traps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/csky/kernel/traps.c b/arch/csky/kernel/traps.c index e5fbf8653a21..2020af88b636 100644 --- a/arch/csky/kernel/traps.c +++ b/arch/csky/kernel/traps.c @@ -209,7 +209,7 @@ asmlinkage void do_trap_illinsn(struct pt_regs *regs) asmlinkage void do_trap_fpe(struct pt_regs *regs) { -#ifdef CONFIG_CPU_HAS_FP +#ifdef CONFIG_CPU_HAS_FPU return fpu_fpe(regs); #else do_trap_error(regs, SIGILL, ILL_ILLOPC, regs->pc, @@ -219,7 +219,7 @@ asmlinkage void do_trap_fpe(struct pt_regs *regs) asmlinkage void do_trap_priv(struct pt_regs *regs) { -#ifdef CONFIG_CPU_HAS_FP +#ifdef CONFIG_CPU_HAS_FPU if (user_mode(regs) && fpu_libc_helper(regs)) return; #endif |