Skip to content

Commit 5173ac2

Browse files
committed
Merge tag 'entry-split-for-arm' into core/entry
Prerequisite for ARM[64] generic entry conversion Merge it into the entry branch so further changes can be based on it.
2 parents b6a5a16 + a70e9f6 commit 5173ac2

File tree

8 files changed

+519
-498
lines changed

8 files changed

+519
-498
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10052,6 +10052,7 @@ S: Maintained
1005210052
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/entry
1005310053
F: include/linux/entry-common.h
1005410054
F: include/linux/entry-kvm.h
10055+
F: include/linux/irq-entry-common.h
1005510056
F: kernel/entry/
1005610057

1005710058
GENERIC GPIO I2C DRIVER

arch/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,17 @@ config HOTPLUG_PARALLEL
6464
bool
6565
select HOTPLUG_SPLIT_STARTUP
6666

67+
config GENERIC_IRQ_ENTRY
68+
bool
69+
70+
config GENERIC_SYSCALL
71+
bool
72+
depends on GENERIC_IRQ_ENTRY
73+
6774
config GENERIC_ENTRY
6875
bool
76+
select GENERIC_IRQ_ENTRY
77+
select GENERIC_SYSCALL
6978

7079
config KPROBES
7180
bool "Kprobes"

0 commit comments

Comments
 (0)