Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

csky updates for 5.16-rc5

Browse Source 
Only 1 fixup for csky:
  - fpu config macro
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCgAwFiEE2KAv+isbWR/viAKHAXH1GYaIxXsFAmG0fjcSHGd1b3JlbkBr
 ZXJuZWwub3JnAAoJEAFx9RmGiMV7MvAQAI9FNrhBJlK41rtMjzspKWQXYc0R7GRl
 acRUam/97uGKeiVlQcKaSfP07GDQCfcaXlaQ1tW4pgALDbXqaaOOh2DlsNaZKQ3h
 OoBJJ2WcH2+sE+YkZcxjBR2FuuAKRPfGAEbTiZ7rZjZqiQDGhjqwNqBcoz4/Ua90
 saOMoVxstVuALK1W6AZ2JmeSNXzA+aO7kM7O3pp2UgaYCJkh0nqDFJwIkXVhPhNz
 GhADqot1VRad51pa5xNd8KXXXic5lIUsk2qohrxZpluz1kjGFS3JAWSn4Mbj5hBk
 SfzT9FI188NXieh+Zm5lhFbxgOcaWCKUJut7yJOhsYY4YFnNB7lj+AFJj/l0GUfq
 Q1D4fww5GLLv9nKBBUVHF6dbXC3Z66J/5kJa/t1BOLQR7L7BUbd4bKbMlx/sigjm
 CxdS2YZVuDCmz4rSof4B1Y3TOjV6Olb0muawqHq+iSzZqMtB/+5sgMyD5LmEyigK
 5sJT6LZDbL7sdjh5YqU3rVtqsonO5o2hRfdAZaxtgodxCLZpeF4tUMHl2CSD7XKQ
 nhRZvZ7w4n7BY4zS+fyXfPAecVzfH0nIMdskDsZhwcnjxqGuRZbDd/ookXW7P3ID
 7g/fNVAOkxUbRE7MSO7RSOfh6lD4Y6zTrBx+YDj4ht1YDErTeLn4BCVWOb4LgjQs
 CR9Hbai5YUIS
 =g1GK
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-12-12 09:32:49 -08:00
commit 0f3d41e82d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/csky/kernel/traps.c
View File

@ -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