Skip to content

Commit 35776f1

Browse files
committed
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM development updates from Russell King: - Rename "mod_init" and "mod_exit" so that initcall debug output is actually useful (Randy Dunlap) - Update maintainers entries for linux-arm-kernel to indicate it is moderated for non-subscribers (Randy Dunlap) - Move install rules to arch/arm/Makefile (Masahiro Yamada) - Drop unnecessary ARCH_NR_GPIOS definition (Linus Walleij) - Don't warn about atags_to_fdt() stack size (David Heidelberg) - Speed up unaligned copy_{from,to}_kernel_nofault (Arnd Bergmann) - Get rid of set_fs() usage (Arnd Bergmann) - Remove checks for GCC prior to v4.6 (Geert Uytterhoeven) * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 9118/1: div64: Remove always-true __div64_const32_is_OK() duplicate ARM: 9117/1: asm-generic: div64: Remove always-true __div64_const32_is_OK() ARM: 9116/1: unified: Remove check for gcc < 4 ARM: 9110/1: oabi-compat: fix oabi epoll sparse warning ARM: 9113/1: uaccess: remove set_fs() implementation ARM: 9112/1: uaccess: add __{get,put}_kernel_nofault ARM: 9111/1: oabi-compat: rework fcntl64() emulation ARM: 9114/1: oabi-compat: rework sys_semtimedop emulation ARM: 9108/1: oabi-compat: rework epoll_wait/epoll_pwait emulation ARM: 9107/1: syscall: always store thread_info->abi_syscall ARM: 9109/1: oabi-compat: add epoll_pwait handler ARM: 9106/1: traps: use get_kernel_nofault instead of set_fs() ARM: 9115/1: mm/maccess: fix unaligned copy_{from,to}_kernel_nofault ARM: 9105/1: atags_to_fdt: don't warn about stack size ARM: 9103/1: Drop ARCH_NR_GPIOS definition ARM: 9102/1: move theinstall rules to arch/arm/Makefile ARM: 9100/1: MAINTAINERS: mark all linux-arm-kernel@infradead list as moderated ARM: 9099/1: crypto: rename 'mod_init' & 'mod_exit' functions to be module-specific
2 parents 4317562 + 6c974e7 commit 35776f1

30 files changed

+399
-371
lines changed

MAINTAINERS

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,14 +2334,14 @@ N: oxnas
23342334

23352335
ARM/PALM TREO SUPPORT
23362336
M: Tomas Cech <sleep_walker@suse.com>
2337-
L: linux-arm-kernel@lists.infradead.org
2337+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
23382338
S: Maintained
23392339
W: http://hackndev.com
23402340
F: arch/arm/mach-pxa/palmtreo.*
23412341

23422342
ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
23432343
M: Marek Vasut <marek.vasut@gmail.com>
2344-
L: linux-arm-kernel@lists.infradead.org
2344+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
23452345
S: Maintained
23462346
W: http://hackndev.com
23472347
F: arch/arm/mach-pxa/include/mach/palmld.h
@@ -2355,7 +2355,7 @@ F: arch/arm/mach-pxa/palmtx.c
23552355

23562356
ARM/PALMZ72 SUPPORT
23572357
M: Sergey Lapin <slapin@ossfans.org>
2358-
L: linux-arm-kernel@lists.infradead.org
2358+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
23592359
S: Maintained
23602360
W: http://hackndev.com
23612361
F: arch/arm/mach-pxa/palmz72.*
@@ -2525,7 +2525,7 @@ N: s5pv210
25252525

25262526
ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
25272527
M: Andrzej Hajda <a.hajda@samsung.com>
2528-
L: linux-arm-kernel@lists.infradead.org
2528+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
25292529
L: linux-media@vger.kernel.org
25302530
S: Maintained
25312531
F: drivers/media/platform/s5p-g2d/
@@ -2542,14 +2542,14 @@ ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
25422542
M: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
25432543
M: Jacek Anaszewski <jacek.anaszewski@gmail.com>
25442544
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
2545-
L: linux-arm-kernel@lists.infradead.org
2545+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
25462546
L: linux-media@vger.kernel.org
25472547
S: Maintained
25482548
F: drivers/media/platform/s5p-jpeg/
25492549

25502550
ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
25512551
M: Andrzej Hajda <a.hajda@samsung.com>
2552-
L: linux-arm-kernel@lists.infradead.org
2552+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
25532553
L: linux-media@vger.kernel.org
25542554
S: Maintained
25552555
F: drivers/media/platform/s5p-mfc/
@@ -3568,7 +3568,7 @@ BROADCOM BCM5301X ARM ARCHITECTURE
35683568
M: Hauke Mehrtens <hauke@hauke-m.de>
35693569
M: Rafał Miłecki <zajec5@gmail.com>
35703570
M: bcm-kernel-feedback-list@broadcom.com
3571-
L: linux-arm-kernel@lists.infradead.org
3571+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
35723572
S: Maintained
35733573
F: arch/arm/boot/dts/bcm470*
35743574
F: arch/arm/boot/dts/bcm5301*
@@ -3578,7 +3578,7 @@ F: arch/arm/mach-bcm/bcm_5301x.c
35783578
BROADCOM BCM53573 ARM ARCHITECTURE
35793579
M: Rafał Miłecki <rafal@milecki.pl>
35803580
L: bcm-kernel-feedback-list@broadcom.com
3581-
L: linux-arm-kernel@lists.infradead.org
3581+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
35823582
S: Maintained
35833583
F: arch/arm/boot/dts/bcm47189*
35843584
F: arch/arm/boot/dts/bcm53573*
@@ -4874,7 +4874,7 @@ CPUIDLE DRIVER - ARM BIG LITTLE
48744874
M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
48754875
M: Daniel Lezcano <daniel.lezcano@linaro.org>
48764876
L: linux-pm@vger.kernel.org
4877-
L: linux-arm-kernel@lists.infradead.org
4877+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
48784878
S: Maintained
48794879
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
48804880
F: drivers/cpuidle/cpuidle-big_little.c
@@ -4894,14 +4894,14 @@ CPUIDLE DRIVER - ARM PSCI
48944894
M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
48954895
M: Sudeep Holla <sudeep.holla@arm.com>
48964896
L: linux-pm@vger.kernel.org
4897-
L: linux-arm-kernel@lists.infradead.org
4897+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
48984898
S: Supported
48994899
F: drivers/cpuidle/cpuidle-psci.c
49004900

49014901
CPUIDLE DRIVER - ARM PSCI PM DOMAIN
49024902
M: Ulf Hansson <ulf.hansson@linaro.org>
49034903
L: linux-pm@vger.kernel.org
4904-
L: linux-arm-kernel@lists.infradead.org
4904+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
49054905
S: Supported
49064906
F: drivers/cpuidle/cpuidle-psci.h
49074907
F: drivers/cpuidle/cpuidle-psci-domain.c
@@ -7272,7 +7272,7 @@ F: tools/firewire/
72727272

72737273
FIRMWARE FRAMEWORK FOR ARMV8-A
72747274
M: Sudeep Holla <sudeep.holla@arm.com>
7275-
L: linux-arm-kernel@lists.infradead.org
7275+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
72767276
S: Maintained
72777277
F: drivers/firmware/arm_ffa/
72787278
F: include/linux/arm_ffa.h
@@ -7451,7 +7451,7 @@ F: include/linux/platform_data/video-imxfb.h
74517451

74527452
FREESCALE IMX DDR PMU DRIVER
74537453
M: Frank Li <Frank.li@nxp.com>
7454-
L: linux-arm-kernel@lists.infradead.org
7454+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
74557455
S: Maintained
74567456
F: Documentation/admin-guide/perf/imx-ddr.rst
74577457
F: Documentation/devicetree/bindings/perf/fsl-imx-ddr.yaml
@@ -7543,7 +7543,7 @@ F: drivers/tty/serial/ucc_uart.c
75437543
FREESCALE SOC DRIVERS
75447544
M: Li Yang <leoyang.li@nxp.com>
75457545
L: linuxppc-dev@lists.ozlabs.org
7546-
L: linux-arm-kernel@lists.infradead.org
7546+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
75477547
S: Maintained
75487548
F: Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
75497549
F: Documentation/devicetree/bindings/soc/fsl/
@@ -11191,7 +11191,7 @@ F: drivers/net/wireless/marvell/libertas/
1119111191

1119211192
MARVELL MACCHIATOBIN SUPPORT
1119311193
M: Russell King <linux@armlinux.org.uk>
11194-
L: linux-arm-kernel@lists.infradead.org
11194+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1119511195
S: Maintained
1119611196
F: arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
1119711197

@@ -14272,23 +14272,23 @@ F: drivers/pci/controller/pcie-altera.c
1427214272
PCI DRIVER FOR APPLIEDMICRO XGENE
1427314273
M: Toan Le <toan@os.amperecomputing.com>
1427414274
L: linux-pci@vger.kernel.org
14275-
L: linux-arm-kernel@lists.infradead.org
14275+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1427614276
S: Maintained
1427714277
F: Documentation/devicetree/bindings/pci/xgene-pci.txt
1427814278
F: drivers/pci/controller/pci-xgene.c
1427914279

1428014280
PCI DRIVER FOR ARM VERSATILE PLATFORM
1428114281
M: Rob Herring <robh@kernel.org>
1428214282
L: linux-pci@vger.kernel.org
14283-
L: linux-arm-kernel@lists.infradead.org
14283+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1428414284
S: Maintained
1428514285
F: Documentation/devicetree/bindings/pci/versatile.yaml
1428614286
F: drivers/pci/controller/pci-versatile.c
1428714287

1428814288
PCI DRIVER FOR ARMADA 8K
1428914289
M: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
1429014290
L: linux-pci@vger.kernel.org
14291-
L: linux-arm-kernel@lists.infradead.org
14291+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1429214292
S: Maintained
1429314293
F: Documentation/devicetree/bindings/pci/pci-armada8k.txt
1429414294
F: drivers/pci/controller/dwc/pcie-armada8k.c
@@ -14306,7 +14306,7 @@ M: Mingkai Hu <mingkai.hu@nxp.com>
1430614306
M: Roy Zang <roy.zang@nxp.com>
1430714307
L: linuxppc-dev@lists.ozlabs.org
1430814308
L: linux-pci@vger.kernel.org
14309-
L: linux-arm-kernel@lists.infradead.org
14309+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1431014310
S: Maintained
1431114311
F: drivers/pci/controller/dwc/*layerscape*
1431214312

@@ -14386,7 +14386,7 @@ F: drivers/pci/controller/pci-tegra.c
1438614386
PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER
1438714387
M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
1438814388
L: linux-pci@vger.kernel.org
14389-
L: linux-arm-kernel@lists.infradead.org
14389+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1439014390
S: Maintained
1439114391
F: Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
1439214392
F: drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
@@ -14421,7 +14421,7 @@ PCI DRIVER FOR TI DRA7XX/J721E
1442114421
M: Kishon Vijay Abraham I <kishon@ti.com>
1442214422
L: linux-omap@vger.kernel.org
1442314423
L: linux-pci@vger.kernel.org
14424-
L: linux-arm-kernel@lists.infradead.org
14424+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1442514425
S: Supported
1442614426
F: Documentation/devicetree/bindings/pci/ti-pci.txt
1442714427
F: drivers/pci/controller/cadence/pci-j721e.c
@@ -14477,7 +14477,7 @@ F: drivers/pci/controller/pcie-altera-msi.c
1447714477
PCI MSI DRIVER FOR APPLIEDMICRO XGENE
1447814478
M: Toan Le <toan@os.amperecomputing.com>
1447914479
L: linux-pci@vger.kernel.org
14480-
L: linux-arm-kernel@lists.infradead.org
14480+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1448114481
S: Maintained
1448214482
F: Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
1448314483
F: drivers/pci/controller/pci-xgene-msi.c
@@ -14994,7 +14994,7 @@ F: include/linux/dtpm.h
1499414994
POWER STATE COORDINATION INTERFACE (PSCI)
1499514995
M: Mark Rutland <mark.rutland@arm.com>
1499614996
M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
14997-
L: linux-arm-kernel@lists.infradead.org
14997+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1499814998
S: Maintained
1499914999
F: drivers/firmware/psci/
1500015000
F: include/linux/psci.h
@@ -15519,7 +15519,7 @@ F: arch/hexagon/
1551915519

1552015520
QUALCOMM HIDMA DRIVER
1552115521
M: Sinan Kaya <okaya@kernel.org>
15522-
L: linux-arm-kernel@lists.infradead.org
15522+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1552315523
L: linux-arm-msm@vger.kernel.org
1552415524
L: dmaengine@vger.kernel.org
1552515525
S: Supported
@@ -17233,7 +17233,7 @@ SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
1723317233
M: Mark Rutland <mark.rutland@arm.com>
1723417234
M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
1723517235
M: Sudeep Holla <sudeep.holla@arm.com>
17236-
L: linux-arm-kernel@lists.infradead.org
17236+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1723717237
S: Maintained
1723817238
F: drivers/firmware/smccc/
1723917239
F: include/linux/arm-smccc.h
@@ -17350,7 +17350,7 @@ F: drivers/media/pci/solo6x10/
1735017350

1735117351
SOFTWARE DELEGATED EXCEPTION INTERFACE (SDEI)
1735217352
M: James Morse <james.morse@arm.com>
17353-
L: linux-arm-kernel@lists.infradead.org
17353+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1735417354
S: Maintained
1735517355
F: Documentation/devicetree/bindings/arm/firmware/sdei.txt
1735617356
F: drivers/firmware/arm_sdei.c
@@ -18137,7 +18137,7 @@ F: drivers/mfd/syscon.c
1813718137
SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
1813818138
M: Sudeep Holla <sudeep.holla@arm.com>
1813918139
R: Cristian Marussi <cristian.marussi@arm.com>
18140-
L: linux-arm-kernel@lists.infradead.org
18140+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1814118141
S: Maintained
1814218142
F: Documentation/devicetree/bindings/firmware/arm,sc[mp]i.yaml
1814318143
F: drivers/clk/clk-sc[mp]i.c
@@ -18510,7 +18510,7 @@ TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
1851018510
M: Nishanth Menon <nm@ti.com>
1851118511
M: Tero Kristo <kristo@kernel.org>
1851218512
M: Santosh Shilimkar <ssantosh@kernel.org>
18513-
L: linux-arm-kernel@lists.infradead.org
18513+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1851418514
S: Maintained
1851518515
F: Documentation/devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml
1851618516
F: Documentation/devicetree/bindings/arm/keystone/ti,sci.txt

arch/arm/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ config ARM
124124
select PCI_SYSCALL if PCI
125125
select PERF_USE_VMALLOC
126126
select RTC_LIB
127-
select SET_FS
128127
select SYS_SUPPORTS_APM_EMULATION
129128
select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
130129
# Above selects are sorted alphabetically; please add new ones

arch/arm/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ $(BOOT_TARGETS): vmlinux
308308
@$(kecho) ' Kernel: $(boot)/$@ is ready'
309309

310310
$(INSTALL_TARGETS):
311-
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
311+
$(CONFIG_SHELL) $(srctree)/$(boot)/install.sh "$(KERNELRELEASE)" \
312+
$(boot)/$(patsubst %install,%Image,$@) System.map "$(INSTALL_PATH)"
312313

313314
PHONY += vdso_install
314315
vdso_install:

arch/arm/boot/Makefile

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,11 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
9696
$(obj)/bootpImage: $(obj)/bootp/bootp FORCE
9797
$(call if_changed,objcopy)
9898

99-
PHONY += initrd install zinstall uinstall
99+
PHONY += initrd
100100
initrd:
101101
@test "$(INITRD_PHYS)" != "" || \
102102
(echo This machine does not support INITRD; exit -1)
103103
@test "$(INITRD)" != "" || \
104104
(echo You must specify INITRD; exit -1)
105105

106-
install:
107-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
108-
$(obj)/Image System.map "$(INSTALL_PATH)"
109-
110-
zinstall:
111-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
112-
$(obj)/zImage System.map "$(INSTALL_PATH)"
113-
114-
uinstall:
115-
$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \
116-
$(obj)/uImage System.map "$(INSTALL_PATH)"
117-
118106
subdir- := bootp compressed dts

arch/arm/boot/compressed/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ compress-$(CONFIG_KERNEL_LZ4) = lz4
8585
libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o
8686

8787
ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
88+
CFLAGS_REMOVE_atags_to_fdt.o += -Wframe-larger-than=${CONFIG_FRAME_WARN}
89+
CFLAGS_atags_to_fdt.o += -Wframe-larger-than=1280
8890
OBJS += $(libfdt_objs) atags_to_fdt.o
8991
endif
9092
ifeq ($(CONFIG_USE_OF),y)

arch/arm/include/asm/div64.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,6 @@ static inline uint32_t __div64_32(uint64_t *n, uint32_t base)
5252

5353
#else
5454

55-
/*
56-
* gcc versions earlier than 4.0 are simply too problematic for the
57-
* __div64_const32() code in asm-generic/div64.h. First there is
58-
* gcc PR 15089 that tend to trig on more complex constructs, spurious
59-
* .global __udivsi3 are inserted even if none of those symbols are
60-
* referenced in the generated code, and those gcc versions are not able
61-
* to do constant propagation on long long values anyway.
62-
*/
63-
64-
#define __div64_const32_is_OK (__GNUC__ >= 4)
65-
6655
static inline uint64_t __arch_xprod_64(uint64_t m, uint64_t n, bool bias)
6756
{
6857
unsigned long long res;

arch/arm/include/asm/gpio.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#ifndef _ARCH_ARM_GPIO_H
33
#define _ARCH_ARM_GPIO_H
44

5-
#if CONFIG_ARCH_NR_GPIO > 0
6-
#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO
7-
#endif
8-
95
/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */
106
#include <asm-generic/gpio.h>
117

arch/arm/include/asm/ptrace.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ struct pt_regs {
1919
struct svc_pt_regs {
2020
struct pt_regs regs;
2121
u32 dacr;
22-
u32 addr_limit;
2322
};
2423

2524
#define to_svc_pt_regs(r) container_of(r, struct svc_pt_regs, regs)

arch/arm/include/asm/syscall.h

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,21 @@ extern const unsigned long sys_call_table[];
2222
static inline int syscall_get_nr(struct task_struct *task,
2323
struct pt_regs *regs)
2424
{
25-
return task_thread_info(task)->syscall;
25+
if (IS_ENABLED(CONFIG_AEABI) && !IS_ENABLED(CONFIG_OABI_COMPAT))
26+
return task_thread_info(task)->abi_syscall;
27+
28+
return task_thread_info(task)->abi_syscall & __NR_SYSCALL_MASK;
29+
}
30+
31+
static inline bool __in_oabi_syscall(struct task_struct *task)
32+
{
33+
return IS_ENABLED(CONFIG_OABI_COMPAT) &&
34+
(task_thread_info(task)->abi_syscall & __NR_OABI_SYSCALL_BASE);
35+
}
36+
37+
static inline bool in_oabi_syscall(void)
38+
{
39+
return __in_oabi_syscall(current);
2640
}
2741

2842
static inline void syscall_rollback(struct task_struct *task,

arch/arm/include/asm/thread_info.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ struct task_struct;
3131

3232
#include <asm/types.h>
3333

34-
typedef unsigned long mm_segment_t;
35-
3634
struct cpu_context_save {
3735
__u32 r4;
3836
__u32 r5;
@@ -54,15 +52,14 @@ struct cpu_context_save {
5452
struct thread_info {
5553
unsigned long flags; /* low level flags */
5654
int preempt_count; /* 0 => preemptable, <0 => bug */
57-
mm_segment_t addr_limit; /* address limit */
5855
struct task_struct *task; /* main task structure */
5956
__u32 cpu; /* cpu */
6057
__u32 cpu_domain; /* cpu domain */
6158
#ifdef CONFIG_STACKPROTECTOR_PER_TASK
6259
unsigned long stack_canary;
6360
#endif
6461
struct cpu_context_save cpu_context; /* cpu context */
65-
__u32 syscall; /* syscall number */
62+
__u32 abi_syscall; /* ABI type and syscall nr */
6663
__u8 used_cp[16]; /* thread used copro */
6764
unsigned long tp_value[2]; /* TLS registers */
6865
union fp_state fpstate __attribute__((aligned(8)));
@@ -77,7 +74,6 @@ struct thread_info {
7774
.task = &tsk, \
7875
.flags = 0, \
7976
.preempt_count = INIT_PREEMPT_COUNT, \
80-
.addr_limit = KERNEL_DS, \
8177
}
8278

8379
/*

0 commit comments

Comments
 (0)