Skip to content

Commit 0653161

Browse files
committed
Merge tag 'arc-5.11-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta: - Address the 2nd boot failure due to snafu in signal handling code (first was generic console ttynull issue) - misc other fixes * tag 'arc-5.11-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: [hsdk]: Enable FPU_SAVE_RESTORE ARC: unbork 5.11 bootup: fix snafu in _TIF_NOTIFY_SIGNAL handling include/soc: remove headers for EZChip NPS arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC
2 parents b3cd1a1 + e8deee4 commit 0653161

File tree

5 files changed

+3
-232
lines changed

5 files changed

+3
-232
lines changed

arch/arc/include/asm/page.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#ifndef __ASSEMBLY__
1111

1212
#define clear_page(paddr) memset((paddr), 0, PAGE_SIZE)
13+
#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
1314
#define copy_page(to, from) memcpy((to), (from), PAGE_SIZE)
1415

1516
struct vm_area_struct;

arch/arc/kernel/entry.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ resume_user_mode_begin:
307307
mov r0, sp ; pt_regs for arg to do_signal()/do_notify_resume()
308308

309309
GET_CURR_THR_INFO_FLAGS r9
310-
and.f 0, r9, TIF_SIGPENDING|TIF_NOTIFY_SIGNAL
310+
and.f 0, r9, _TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL
311311
bz .Lchk_notify_resume
312312

313313
; Normal Trap/IRQ entry only saves Scratch (caller-saved) regs

arch/arc/plat-hsdk/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ menuconfig ARC_SOC_HSDK
77
depends on ISA_ARCV2
88
select ARC_HAS_ACCL_REGS
99
select ARC_IRQ_NO_AUTOSAVE
10+
select ARC_FPU_SAVE_RESTORE
1011
select CLK_HSDK
1112
select RESET_CONTROLLER
1213
select RESET_HSDK

include/soc/nps/common.h

Lines changed: 0 additions & 172 deletions
This file was deleted.

include/soc/nps/mtm.h

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)