summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-02 23:20:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-02 23:20:12 -0400
commitf5a8eb632b562bd9c16c389f5db3a5260fba4157 (patch)
tree82687234d772ff8f72a31e598fe16553885c56c9 /include
parentc9297d284126b80c9cfd72c690e0da531c99fc48 (diff)
parentdd3b8c329aa270027fba61a02a12600972dc3983 (diff)
Merge tag 'arch-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pul removal of obsolete architecture ports from Arnd Bergmann: "This removes the entire architecture code for blackfin, cris, frv, m32r, metag, mn10300, score, and tile, including the associated device drivers. I have been working with the (former) maintainers for each one to ensure that my interpretation was right and the code is definitely unused in mainline kernels. Many had fond memories of working on the respective ports to start with and getting them included in upstream, but also saw no point in keeping the port alive without any users. In the end, it seems that while the eight architectures are extremely different, they all suffered the same fate: There was one company in charge of an SoC line, a CPU microarchitecture and a software ecosystem, which was more costly than licensing newer off-the-shelf CPU cores from a third party (typically ARM, MIPS, or RISC-V). It seems that all the SoC product lines are still around, but have not used the custom CPU architectures for several years at this point. In contrast, CPU instruction sets that remain popular and have actively maintained kernel ports tend to all be used across multiple licensees. [ See the new nds32 port merged in the previous commit for the next generation of "one company in charge of an SoC line, a CPU microarchitecture and a software ecosystem" - Linus ] The removal came out of a discussion that is now documented at https://lwn.net/Articles/748074/. Unlike the original plans, I'm not marking any ports as deprecated but remove them all at once after I made sure that they are all unused. Some architectures (notably tile, mn10300, and blackfin) are still being shipped in products with old kernels, but those products will never be updated to newer kernel releases. After this series, we still have a few architectures without mainline gcc support: - unicore32 and hexagon both have very outdated gcc releases, but the maintainers promised to work on providing something newer. At least in case of hexagon, this will only be llvm, not gcc. - openrisc, risc-v and nds32 are still in the process of finishing their support or getting it added to mainline gcc in the first place. They all have patched gcc-7.3 ports that work to some degree, but complete upstream support won't happen before gcc-8.1. Csky posted their first kernel patch set last week, their situation will be similar [ Palmer Dabbelt points out that RISC-V support is in mainline gcc since gcc-7, although gcc-7.3.0 is the recommended minimum - Linus ]" This really says it all: 2498 files changed, 95 insertions(+), 467668 deletions(-) * tag 'arch-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (74 commits) MAINTAINERS: UNICORE32: Change email account staging: iio: remove iio-trig-bfin-timer driver tty: hvc: remove tile driver tty: remove bfin_jtag_comm and hvc_bfin_jtag drivers serial: remove tile uart driver serial: remove m32r_sio driver serial: remove blackfin drivers serial: remove cris/etrax uart drivers usb: Remove Blackfin references in USB support usb: isp1362: remove blackfin arch glue usb: musb: remove blackfin port usb: host: remove tilegx platform glue pwm: remove pwm-bfin driver i2c: remove bfin-twi driver spi: remove blackfin related host drivers watchdog: remove bfin_wdt driver can: remove bfin_can driver mmc: remove bfin_sdh driver input: misc: remove blackfin rotary driver input: keyboard: remove bf54x driver ...
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/atomic.h2
-rw-r--r--include/asm-generic/barrier.h2
-rw-r--r--include/asm-generic/exec.h2
-rw-r--r--include/asm-generic/io.h2
-rw-r--r--include/asm-generic/pci_iomap.h2
-rw-r--r--include/asm-generic/switch_to.h2
-rw-r--r--include/clocksource/metag_generic.h21
-rw-r--r--include/linux/bfin_mac.h30
-rw-r--r--include/linux/bootmem.h9
-rw-r--r--include/linux/cpuhotplug.h3
-rw-r--r--include/linux/fb.h3
-rw-r--r--include/linux/ide.h7
-rw-r--r--include/linux/irqchip/metag-ext.h34
-rw-r--r--include/linux/irqchip/metag.h25
-rw-r--r--include/linux/linux_logo.h3
-rw-r--r--include/linux/mm.h2
-rw-r--r--include/linux/platform_data/bfin_rotary.h117
-rw-r--r--include/linux/platform_data/pinctrl-adi2.h40
-rw-r--r--include/linux/raid/pq.h1
-rw-r--r--include/linux/usb/musb.h7
-rw-r--r--include/linux/usb/tilegx.h35
-rw-r--r--include/media/blackfin/bfin_capture.h39
-rw-r--r--include/media/blackfin/ppi.h94
-rw-r--r--include/trace/events/mmflags.h2
-rw-r--r--include/uapi/asm-generic/siginfo.h56
-rw-r--r--include/uapi/asm-generic/unistd.h163
-rw-r--r--include/uapi/linux/elf.h3
27 files changed, 18 insertions, 688 deletions
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 3f38eb03649c..abe6dd9ca2a8 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -2,8 +2,6 @@
2 * Generic C implementation of atomic counter operations. Usable on 2 * Generic C implementation of atomic counter operations. Usable on
3 * UP systems only. Do not include in machine independent code. 3 * UP systems only. Do not include in machine independent code.
4 * 4 *
5 * Originally implemented for MN10300.
6 *
7 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. 5 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
8 * Written by David Howells (dhowells@redhat.com) 6 * Written by David Howells (dhowells@redhat.com)
9 * 7 *
diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
index fe297b599b0a..29458bbb2fa0 100644
--- a/include/asm-generic/barrier.h
+++ b/include/asm-generic/barrier.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Generic barrier definitions, originally based on MN10300 definitions. 2 * Generic barrier definitions.
3 * 3 *
4 * It should be possible to use these on really simple architectures, 4 * It should be possible to use these on really simple architectures,
5 * but it serves more as a starting point for new ports. 5 * but it serves more as a starting point for new ports.
diff --git a/include/asm-generic/exec.h b/include/asm-generic/exec.h
index 567766b0074a..32c0a216f576 100644
--- a/include/asm-generic/exec.h
+++ b/include/asm-generic/exec.h
@@ -1,4 +1,4 @@
1/* Generic process execution definitions, based on MN10300 definitions. 1/* Generic process execution definitions.
2 * 2 *
3 * It should be possible to use these on really simple architectures, 3 * It should be possible to use these on really simple architectures,
4 * but it serves more as a starting point for new ports. 4 * but it serves more as a starting point for new ports.
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 7c6a39e64749..8de9cc251286 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -1,4 +1,4 @@
1/* Generic I/O port emulation, based on MN10300 code 1/* Generic I/O port emulation.
2 * 2 *
3 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. 3 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
4 * Written by David Howells (dhowells@redhat.com) 4 * Written by David Howells (dhowells@redhat.com)
diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h
index 854f96ad5ccb..d4f16dcc2ed7 100644
--- a/include/asm-generic/pci_iomap.h
+++ b/include/asm-generic/pci_iomap.h
@@ -1,5 +1,5 @@
1/* SPDX-License-Identifier: GPL-2.0+ */ 1/* SPDX-License-Identifier: GPL-2.0+ */
2/* Generic I/O port emulation, based on MN10300 code 2/* Generic I/O port emulation.
3 * 3 *
4 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. 4 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
5 * Written by David Howells (dhowells@redhat.com) 5 * Written by David Howells (dhowells@redhat.com)
diff --git a/include/asm-generic/switch_to.h b/include/asm-generic/switch_to.h
index 052c4ac04fd5..986acc9d34bb 100644
--- a/include/asm-generic/switch_to.h
+++ b/include/asm-generic/switch_to.h
@@ -1,4 +1,4 @@
1/* Generic task switch macro wrapper, based on MN10300 definitions. 1/* Generic task switch macro wrapper.
2 * 2 *
3 * It should be possible to use these on really simple architectures, 3 * It should be possible to use these on really simple architectures,
4 * but it serves more as a starting point for new ports. 4 * but it serves more as a starting point for new ports.
diff --git a/include/clocksource/metag_generic.h b/include/clocksource/metag_generic.h
deleted file mode 100644
index ac17e7d06cfb..000000000000
--- a/include/clocksource/metag_generic.h
+++ /dev/null
@@ -1,21 +0,0 @@
1/*
2 * Copyright (C) 2013 Imaginaton Technologies Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#ifndef __CLKSOURCE_METAG_GENERIC_H
17#define __CLKSOURCE_METAG_GENERIC_H
18
19extern int metag_generic_timer_init(void);
20
21#endif /* __CLKSOURCE_METAG_GENERIC_H */
diff --git a/include/linux/bfin_mac.h b/include/linux/bfin_mac.h
deleted file mode 100644
index a69554ef8476..000000000000
--- a/include/linux/bfin_mac.h
+++ /dev/null
@@ -1,30 +0,0 @@
1/*
2 * Blackfin On-Chip MAC Driver
3 *
4 * Copyright 2004-2010 Analog Devices Inc.
5 *
6 * Enter bugs at http://blackfin.uclinux.org/
7 *
8 * Licensed under the GPL-2 or later.
9 */
10
11#ifndef _LINUX_BFIN_MAC_H_
12#define _LINUX_BFIN_MAC_H_
13
14#include <linux/phy.h>
15
16struct bfin_phydev_platform_data {
17 unsigned short addr;
18 int irq;
19};
20
21struct bfin_mii_bus_platform_data {
22 int phydev_number;
23 struct bfin_phydev_platform_data *phydev_data;
24 const unsigned short *mac_peripherals;
25 int phy_mode;
26 unsigned int phy_mask;
27 unsigned short vlan1_mask, vlan2_mask;
28};
29
30#endif
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index a53063e9d7d8..7942a96b1a9d 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -364,15 +364,6 @@ static inline void __init memblock_free_late(
364} 364}
365#endif /* defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM) */ 365#endif /* defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM) */
366 366
367#ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP
368extern void *alloc_remap(int nid, unsigned long size);
369#else
370static inline void *alloc_remap(int nid, unsigned long size)
371{
372 return NULL;
373}
374#endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */
375
376extern void *alloc_large_system_hash(const char *tablename, 367extern void *alloc_large_system_hash(const char *tablename,
377 unsigned long bucketsize, 368 unsigned long bucketsize,
378 unsigned long numentries, 369 unsigned long numentries,
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 5172ad0daa7c..8796ba387152 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -29,7 +29,6 @@ enum cpuhp_state {
29 CPUHP_PERF_PREPARE, 29 CPUHP_PERF_PREPARE,
30 CPUHP_PERF_X86_PREPARE, 30 CPUHP_PERF_X86_PREPARE,
31 CPUHP_PERF_X86_AMD_UNCORE_PREP, 31 CPUHP_PERF_X86_AMD_UNCORE_PREP,
32 CPUHP_PERF_BFIN,
33 CPUHP_PERF_POWER, 32 CPUHP_PERF_POWER,
34 CPUHP_PERF_SUPERH, 33 CPUHP_PERF_SUPERH,
35 CPUHP_X86_HPET_DEAD, 34 CPUHP_X86_HPET_DEAD,
@@ -108,7 +107,6 @@ enum cpuhp_state {
108 CPUHP_AP_PERF_X86_CQM_STARTING, 107 CPUHP_AP_PERF_X86_CQM_STARTING,
109 CPUHP_AP_PERF_X86_CSTATE_STARTING, 108 CPUHP_AP_PERF_X86_CSTATE_STARTING,
110 CPUHP_AP_PERF_XTENSA_STARTING, 109 CPUHP_AP_PERF_XTENSA_STARTING,
111 CPUHP_AP_PERF_METAG_STARTING,
112 CPUHP_AP_MIPS_OP_LOONGSON3_STARTING, 110 CPUHP_AP_MIPS_OP_LOONGSON3_STARTING,
113 CPUHP_AP_ARM_SDEI_STARTING, 111 CPUHP_AP_ARM_SDEI_STARTING,
114 CPUHP_AP_ARM_VFP_STARTING, 112 CPUHP_AP_ARM_VFP_STARTING,
@@ -122,7 +120,6 @@ enum cpuhp_state {
122 CPUHP_AP_JCORE_TIMER_STARTING, 120 CPUHP_AP_JCORE_TIMER_STARTING,
123 CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING, 121 CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
124 CPUHP_AP_ARM_TWD_STARTING, 122 CPUHP_AP_ARM_TWD_STARTING,
125 CPUHP_AP_METAG_TIMER_STARTING,
126 CPUHP_AP_QCOM_TIMER_STARTING, 123 CPUHP_AP_QCOM_TIMER_STARTING,
127 CPUHP_AP_ARMADA_TIMER_STARTING, 124 CPUHP_AP_ARMADA_TIMER_STARTING,
128 CPUHP_AP_MARCO_TIMER_STARTING, 125 CPUHP_AP_MARCO_TIMER_STARTING,
diff --git a/include/linux/fb.h b/include/linux/fb.h
index f577d3c89618..aa74a228bb92 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -571,8 +571,7 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
571 571
572#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || \ 572#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || \
573 defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || \ 573 defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || \
574 defined(__avr32__) || defined(__bfin__) || defined(__arm__) || \ 574 defined(__arm__) || defined(__aarch64__)
575 defined(__aarch64__)
576 575
577#define fb_readb __raw_readb 576#define fb_readb __raw_readb
578#define fb_readw __raw_readw 577#define fb_readw __raw_readw
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 771989d25ef8..1d6f16110eae 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -25,15 +25,10 @@
25#include <asm/byteorder.h> 25#include <asm/byteorder.h>
26#include <asm/io.h> 26#include <asm/io.h>
27 27
28#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300)
29# define SUPPORT_VLB_SYNC 0
30#else
31# define SUPPORT_VLB_SYNC 1
32#endif
33
34/* 28/*
35 * Probably not wise to fiddle with these 29 * Probably not wise to fiddle with these
36 */ 30 */
31#define SUPPORT_VLB_SYNC 1
37#define IDE_DEFAULT_MAX_FAILURES 1 32#define IDE_DEFAULT_MAX_FAILURES 1
38#define ERROR_MAX 8 /* Max read/write errors per sector */ 33#define ERROR_MAX 8 /* Max read/write errors per sector */
39#define ERROR_RESET 3 /* Reset controller every 4th retry */ 34#define ERROR_RESET 3 /* Reset controller every 4th retry */
diff --git a/include/linux/irqchip/metag-ext.h b/include/linux/irqchip/metag-ext.h
deleted file mode 100644
index d120496370b9..000000000000
--- a/include/linux/irqchip/metag-ext.h
+++ /dev/null
@@ -1,34 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0 */
2/*
3 * Copyright (C) 2012 Imagination Technologies
4 */
5
6#ifndef _LINUX_IRQCHIP_METAG_EXT_H_
7#define _LINUX_IRQCHIP_METAG_EXT_H_
8
9struct irq_data;
10struct platform_device;
11
12/* called from core irq code at init */
13int init_external_IRQ(void);
14
15/*
16 * called from SoC init_irq() callback to dynamically indicate the lack of
17 * HWMASKEXT registers.
18 */
19void meta_intc_no_mask(void);
20
21/*
22 * These allow SoCs to specialise the interrupt controller from their init_irq
23 * callbacks.
24 */
25
26extern struct irq_chip meta_intc_edge_chip;
27extern struct irq_chip meta_intc_level_chip;
28
29/* this should be called in the mask callback */
30void meta_intc_mask_irq_simple(struct irq_data *data);
31/* this should be called in the unmask callback */
32void meta_intc_unmask_irq_simple(struct irq_data *data);
33
34#endif /* _LINUX_IRQCHIP_METAG_EXT_H_ */
diff --git a/include/linux/irqchip/metag.h b/include/linux/irqchip/metag.h
deleted file mode 100644
index 0adcf449e4e4..000000000000
--- a/include/linux/irqchip/metag.h
+++ /dev/null
@@ -1,25 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0 */
2/*
3 * Copyright (C) 2011 Imagination Technologies
4 */
5
6#ifndef _LINUX_IRQCHIP_METAG_H_
7#define _LINUX_IRQCHIP_METAG_H_
8
9#include <linux/errno.h>
10
11#ifdef CONFIG_METAG_PERFCOUNTER_IRQS
12extern int init_internal_IRQ(void);
13extern int internal_irq_map(unsigned int hw);
14#else
15static inline int init_internal_IRQ(void)
16{
17 return 0;
18}
19static inline int internal_irq_map(unsigned int hw)
20{
21 return -EINVAL;
22}
23#endif
24
25#endif /* _LINUX_IRQCHIP_METAG_H_ */
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index 5e3581d76c7f..d4d5b93efe84 100644
--- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h
@@ -36,8 +36,6 @@ struct linux_logo {
36extern const struct linux_logo logo_linux_mono; 36extern const struct linux_logo logo_linux_mono;
37extern const struct linux_logo logo_linux_vga16; 37extern const struct linux_logo logo_linux_vga16;
38extern const struct linux_logo logo_linux_clut224; 38extern const struct linux_logo logo_linux_clut224;
39extern const struct linux_logo logo_blackfin_vga16;
40extern const struct linux_logo logo_blackfin_clut224;
41extern const struct linux_logo logo_dec_clut224; 39extern const struct linux_logo logo_dec_clut224;
42extern const struct linux_logo logo_mac_clut224; 40extern const struct linux_logo logo_mac_clut224;
43extern const struct linux_logo logo_parisc_clut224; 41extern const struct linux_logo logo_parisc_clut224;
@@ -46,7 +44,6 @@ extern const struct linux_logo logo_sun_clut224;
46extern const struct linux_logo logo_superh_mono; 44extern const struct linux_logo logo_superh_mono;
47extern const struct linux_logo logo_superh_vga16; 45extern const struct linux_logo logo_superh_vga16;
48extern const struct linux_logo logo_superh_clut224; 46extern const struct linux_logo logo_superh_clut224;
49extern const struct linux_logo logo_m32r_clut224;
50extern const struct linux_logo logo_spe_clut224; 47extern const struct linux_logo logo_spe_clut224;
51 48
52extern const struct linux_logo *fb_find_logo(int depth); 49extern const struct linux_logo *fb_find_logo(int depth);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index ad06d42adb1a..ccac10682ce5 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -241,8 +241,6 @@ extern unsigned int kobjsize(const void *objp);
241# define VM_SAO VM_ARCH_1 /* Strong Access Ordering (powerpc) */ 241# define VM_SAO VM_ARCH_1 /* Strong Access Ordering (powerpc) */
242#elif defined(CONFIG_PARISC) 242#elif defined(CONFIG_PARISC)
243# define VM_GROWSUP VM_ARCH_1 243# define VM_GROWSUP VM_ARCH_1
244#elif defined(CONFIG_METAG)
245# define VM_GROWSUP VM_ARCH_1
246#elif defined(CONFIG_IA64) 244#elif defined(CONFIG_IA64)
247# define VM_GROWSUP VM_ARCH_1 245# define VM_GROWSUP VM_ARCH_1
248#elif !defined(CONFIG_MMU) 246#elif !defined(CONFIG_MMU)
diff --git a/include/linux/platform_data/bfin_rotary.h b/include/linux/platform_data/bfin_rotary.h
deleted file mode 100644
index 98829370fee2..000000000000
--- a/include/linux/platform_data/bfin_rotary.h
+++ /dev/null
@@ -1,117 +0,0 @@
1/*
2 * board initialization should put one of these structures into platform_data
3 * and place the bfin-rotary onto platform_bus named "bfin-rotary".
4 *
5 * Copyright 2008-2010 Analog Devices Inc.
6 *
7 * Licensed under the GPL-2 or later.
8 */
9
10#ifndef _BFIN_ROTARY_H
11#define _BFIN_ROTARY_H
12
13/* mode bitmasks */
14#define ROT_QUAD_ENC CNTMODE_QUADENC /* quadrature/grey code encoder mode */
15#define ROT_BIN_ENC CNTMODE_BINENC /* binary encoder mode */
16#define ROT_UD_CNT CNTMODE_UDCNT /* rotary counter mode */
17#define ROT_DIR_CNT CNTMODE_DIRCNT /* direction counter mode */
18
19#define ROT_DEBE DEBE /* Debounce Enable */
20
21#define ROT_CDGINV CDGINV /* CDG Pin Polarity Invert */
22#define ROT_CUDINV CUDINV /* CUD Pin Polarity Invert */
23#define ROT_CZMINV CZMINV /* CZM Pin Polarity Invert */
24
25struct bfin_rotary_platform_data {
26 /* set rotary UP KEY_### or BTN_### in case you prefer
27 * bfin-rotary to send EV_KEY otherwise set 0
28 */
29 unsigned int rotary_up_key;
30 /* set rotary DOWN KEY_### or BTN_### in case you prefer
31 * bfin-rotary to send EV_KEY otherwise set 0
32 */
33 unsigned int rotary_down_key;
34 /* set rotary BUTTON KEY_### or BTN_### */
35 unsigned int rotary_button_key;
36 /* set rotary Relative Axis REL_### in case you prefer
37 * bfin-rotary to send EV_REL otherwise set 0
38 */
39 unsigned int rotary_rel_code;
40 unsigned short debounce; /* 0..17 */
41 unsigned short mode;
42 unsigned short pm_wakeup;
43 unsigned short *pin_list;
44};
45
46/* CNT_CONFIG bitmasks */
47#define CNTE (1 << 0) /* Counter Enable */
48#define DEBE (1 << 1) /* Debounce Enable */
49#define CDGINV (1 << 4) /* CDG Pin Polarity Invert */
50#define CUDINV (1 << 5) /* CUD Pin Polarity Invert */
51#define CZMINV (1 << 6) /* CZM Pin Polarity Invert */
52#define CNTMODE_SHIFT 8
53#define CNTMODE (0x7 << CNTMODE_SHIFT) /* Counter Operating Mode */
54#define ZMZC (1 << 1) /* CZM Zeroes Counter Enable */
55#define BNDMODE_SHIFT 12
56#define BNDMODE (0x3 << BNDMODE_SHIFT) /* Boundary register Mode */
57#define INPDIS (1 << 15) /* CUG and CDG Input Disable */
58
59#define CNTMODE_QUADENC (0 << CNTMODE_SHIFT) /* quadrature encoder mode */
60#define CNTMODE_BINENC (1 << CNTMODE_SHIFT) /* binary encoder mode */
61#define CNTMODE_UDCNT (2 << CNTMODE_SHIFT) /* up/down counter mode */
62#define CNTMODE_DIRCNT (4 << CNTMODE_SHIFT) /* direction counter mode */
63#define CNTMODE_DIRTMR (5 << CNTMODE_SHIFT) /* direction timer mode */
64
65#define BNDMODE_COMP (0 << BNDMODE_SHIFT) /* boundary compare mode */
66#define BNDMODE_ZERO (1 << BNDMODE_SHIFT) /* boundary compare and zero mode */
67#define BNDMODE_CAPT (2 << BNDMODE_SHIFT) /* boundary capture mode */
68#define BNDMODE_AEXT (3 << BNDMODE_SHIFT) /* boundary auto-extend mode */
69
70/* CNT_IMASK bitmasks */
71#define ICIE (1 << 0) /* Illegal Gray/Binary Code Interrupt Enable */
72#define UCIE (1 << 1) /* Up count Interrupt Enable */
73#define DCIE (1 << 2) /* Down count Interrupt Enable */
74#define MINCIE (1 << 3) /* Min Count Interrupt Enable */
75#define MAXCIE (1 << 4) /* Max Count Interrupt Enable */
76#define COV31IE (1 << 5) /* Bit 31 Overflow Interrupt Enable */
77#define COV15IE (1 << 6) /* Bit 15 Overflow Interrupt Enable */
78#define CZEROIE (1 << 7) /* Count to Zero Interrupt Enable */
79#define CZMIE (1 << 8) /* CZM Pin Interrupt Enable */
80#define CZMEIE (1 << 9) /* CZM Error Interrupt Enable */
81#define CZMZIE (1 << 10) /* CZM Zeroes Counter Interrupt Enable */
82
83/* CNT_STATUS bitmasks */
84#define ICII (1 << 0) /* Illegal Gray/Binary Code Interrupt Identifier */
85#define UCII (1 << 1) /* Up count Interrupt Identifier */
86#define DCII (1 << 2) /* Down count Interrupt Identifier */
87#define MINCII (1 << 3) /* Min Count Interrupt Identifier */
88#define MAXCII (1 << 4) /* Max Count Interrupt Identifier */
89#define COV31II (1 << 5) /* Bit 31 Overflow Interrupt Identifier */
90#define COV15II (1 << 6) /* Bit 15 Overflow Interrupt Identifier */
91#define CZEROII (1 << 7) /* Count to Zero Interrupt Identifier */
92#define CZMII (1 << 8) /* CZM Pin Interrupt Identifier */
93#define CZMEII (1 << 9) /* CZM Error Interrupt Identifier */
94#define CZMZII (1 << 10) /* CZM Zeroes Counter Interrupt Identifier */
95
96/* CNT_COMMAND bitmasks */
97#define W1LCNT 0xf /* Load Counter Register */
98#define W1LMIN 0xf0 /* Load Min Register */
99#define W1LMAX 0xf00 /* Load Max Register */
100#define W1ZMONCE (1 << 12) /* Enable CZM Clear Counter Once */
101
102#define W1LCNT_ZERO (1 << 0) /* write 1 to load CNT_COUNTER with zero */
103#define W1LCNT_MIN (1 << 2) /* write 1 to load CNT_COUNTER from CNT_MIN */
104#define W1LCNT_MAX (1 << 3) /* write 1 to load CNT_COUNTER from CNT_MAX */
105
106#define W1LMIN_ZERO (1 << 4) /* write 1 to load CNT_MIN with zero */
107#define W1LMIN_CNT (1 << 5) /* write 1 to load CNT_MIN from CNT_COUNTER */
108#define W1LMIN_MAX (1 << 7) /* write 1 to load CNT_MIN from CNT_MAX */
109
110#define W1LMAX_ZERO (1 << 8) /* write 1 to load CNT_MAX with zero */
111#define W1LMAX_CNT (1 << 9) /* write 1 to load CNT_MAX from CNT_COUNTER */
112#define W1LMAX_MIN (1 << 10) /* write 1 to load CNT_MAX from CNT_MIN */
113
114/* CNT_DEBOUNCE bitmasks */
115#define DPRESCALE 0xf /* Load Counter Register */
116
117#endif
diff --git a/include/linux/platform_data/pinctrl-adi2.h b/include/linux/platform_data/pinctrl-adi2.h
deleted file mode 100644
index 8f91300617ec..000000000000
--- a/include/linux/platform_data/pinctrl-adi2.h
+++ /dev/null
@@ -1,40 +0,0 @@
1/*
2 * Pinctrl Driver for ADI GPIO2 controller
3 *
4 * Copyright 2007-2013 Analog Devices Inc.
5 *
6 * Licensed under the GPLv2 or later
7 */
8
9
10#ifndef PINCTRL_ADI2_H
11#define PINCTRL_ADI2_H
12
13#include <linux/io.h>
14#include <linux/platform_device.h>
15
16/**
17 * struct adi_pinctrl_gpio_platform_data - Pinctrl gpio platform data
18 * for ADI GPIO2 device.
19 *
20 * @port_gpio_base: Optional global GPIO index of the GPIO bank.
21 * 0 means driver decides.
22 * @port_pin_base: Pin index of the pin controller device.
23 * @port_width: PIN number of the GPIO bank device
24 * @pint_id: GPIO PINT device id that this GPIO bank should map to.
25 * @pint_assign: The 32-bit GPIO PINT registers can be divided into 2 parts. A
26 * GPIO bank can be mapped into either low 16 bits[0] or high 16
27 * bits[1] of each PINT register.
28 * @pint_map: GIOP bank mapping code in PINT device
29 */
30struct adi_pinctrl_gpio_platform_data {
31 unsigned int port_gpio_base;
32 unsigned int port_pin_base;
33 unsigned int port_width;
34 u8 pinctrl_id;
35 u8 pint_id;
36 bool pint_assign;
37 u8 pint_map;
38};
39
40#endif
diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h
index 583cdd3d49ca..a366cc314479 100644
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@ -105,7 +105,6 @@ extern const struct raid6_calls raid6_avx2x4;
105extern const struct raid6_calls raid6_avx512x1; 105extern const struct raid6_calls raid6_avx512x1;
106extern const struct raid6_calls raid6_avx512x2; 106extern const struct raid6_calls raid6_avx512x2;
107extern const struct raid6_calls raid6_avx512x4; 107extern const struct raid6_calls raid6_avx512x4;
108extern const struct raid6_calls raid6_tilegx8;
109extern const struct raid6_calls raid6_s390vx8; 108extern const struct raid6_calls raid6_s390vx8;
110 109
111struct raid6_recov_calls { 110struct raid6_recov_calls {
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index 5d19e6730475..9eb908a98033 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -89,13 +89,6 @@ struct musb_hdrc_config {
89 u8 ram_bits; /* ram address size */ 89 u8 ram_bits; /* ram address size */
90 90
91 struct musb_hdrc_eps_bits *eps_bits __deprecated; 91 struct musb_hdrc_eps_bits *eps_bits __deprecated;
92#ifdef CONFIG_BLACKFIN
93 /* A GPIO controlling VRSEL in Blackfin */
94 unsigned int gpio_vrsel;
95 unsigned int gpio_vrsel_active;
96 /* musb CLKIN in Blackfin in MHZ */
97 unsigned char clkin;
98#endif
99 u32 maximum_speed; 92 u32 maximum_speed;
100}; 93};
101 94
diff --git a/include/linux/usb/tilegx.h b/include/linux/usb/tilegx.h
deleted file mode 100644
index 817908573fe8..000000000000
--- a/include/linux/usb/tilegx.h
+++ /dev/null
@@ -1,35 +0,0 @@
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * Copyright 2012 Tilera Corporation. All Rights Reserved.
4 *
5 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License
7 * as published by the Free Software Foundation, version 2.
8 *
9 * This program is distributed in the hope that it will be useful, but
10 * WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
12 * NON INFRINGEMENT. See the GNU General Public License for
13 * more details.
14 *
15 * Structure to contain platform-specific data related to Tile-Gx USB
16 * controllers.
17 */
18
19#ifndef _LINUX_USB_TILEGX_H
20#define _LINUX_USB_TILEGX_H
21
22#include <gxio/usb_host.h>
23
24struct tilegx_usb_platform_data {
25 /* GXIO device index. */
26 int dev_index;
27
28 /* GXIO device context. */
29 gxio_usb_host_context_t usb_ctx;
30
31 /* Device IRQ. */
32 unsigned int irq;
33};
34
35#endif /* _LINUX_USB_TILEGX_H */
diff --git a/include/media/blackfin/bfin_capture.h b/include/media/blackfin/bfin_capture.h
deleted file mode 100644
index a999a3970c69..000000000000
--- a/include/media/blackfin/bfin_capture.h
+++ /dev/null
@@ -1,39 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0 */
2#ifndef _BFIN_CAPTURE_H_
3#define _BFIN_CAPTURE_H_
4
5#include <linux/i2c.h>
6
7struct v4l2_input;
8struct ppi_info;
9
10struct bcap_route {
11 u32 input;
12 u32 output;
13 u32 ppi_control;
14};
15
16struct bfin_capture_config {
17 /* card name */
18 char *card_name;
19 /* inputs available at the sub device */
20 struct v4l2_input *inputs;
21 /* number of inputs supported */
22 int num_inputs;
23 /* routing information for each input */
24 struct bcap_route *routes;
25 /* i2c bus adapter no */
26 int i2c_adapter_id;
27 /* i2c subdevice board info */
28 struct i2c_board_info board_info;
29 /* ppi board info */
30 const struct ppi_info *ppi_info;
31 /* ppi control */
32 unsigned long ppi_control;
33 /* ppi interrupt mask */
34 u32 int_mask;
35 /* horizontal blanking pixels */
36 int blank_pixels;
37};
38
39#endif
diff --git a/include/media/blackfin/ppi.h b/include/media/blackfin/ppi.h
deleted file mode 100644
index 987e49e8f9c9..000000000000
--- a/include/media/blackfin/ppi.h
+++ /dev/null
@@ -1,94 +0,0 @@
1/*
2 * Analog Devices PPI header file
3 *
4 * Copyright (c) 2011 Analog Devices Inc.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 */
15
16#ifndef _PPI_H_
17#define _PPI_H_
18
19#include <linux/interrupt.h>
20#include <asm/blackfin.h>
21#include <asm/bfin_ppi.h>
22
23/* EPPI */
24#ifdef EPPI_EN
25#define PORT_EN EPPI_EN
26#define PORT_DIR EPPI_DIR
27#define DMA32 0
28#define PACK_EN PACKEN
29#endif
30
31/* EPPI3 */
32#ifdef EPPI0_CTL2
33#define PORT_EN EPPI_CTL_EN
34#define PORT_DIR EPPI_CTL_DIR
35#define PACK_EN EPPI_CTL_PACKEN
36#define DMA32 0
37#define DLEN_8 EPPI_CTL_DLEN08
38#define DLEN_16 EPPI_CTL_DLEN16
39#endif
40
41struct ppi_if;
42
43struct ppi_params {
44 u32 width; /* width in pixels */
45 u32 height; /* height in lines */
46 u32 hdelay; /* delay after the HSYNC in pixels */
47 u32 vdelay; /* delay after the VSYNC in lines */
48 u32 line; /* total pixels per line */
49 u32 frame; /* total lines per frame */
50 u32 hsync; /* HSYNC length in pixels */
51 u32 vsync; /* VSYNC length in lines */
52 int bpp; /* bits per pixel */
53 int dlen; /* data length for ppi in bits */
54 u32 ppi_control; /* ppi configuration */
55 u32 int_mask; /* interrupt mask */
56};
57
58struct ppi_ops {
59 int (*attach_irq)(struct ppi_if *ppi, irq_handler_t handler);
60 void (*detach_irq)(struct ppi_if *ppi);
61 int (*start)(struct ppi_if *ppi);
62 int (*stop)(struct ppi_if *ppi);
63 int (*set_params)(struct ppi_if *ppi, struct ppi_params *params);
64 void (*update_addr)(struct ppi_if *ppi, unsigned long addr);
65};
66
67enum ppi_type {
68 PPI_TYPE_PPI,
69 PPI_TYPE_EPPI,
70 PPI_TYPE_EPPI3,
71};
72
73struct ppi_info {
74 enum ppi_type type;
75 int dma_ch;
76 int irq_err;
77 void __iomem *base;
78 const unsigned short *pin_req;
79};
80
81struct ppi_if {
82 struct device *dev;
83 unsigned long ppi_control;
84 const struct ppi_ops *ops;
85 const struct ppi_info *info;
86 bool err_int; /* if we need request error interrupt */
87 bool err; /* if ppi has fifo error */
88 void *priv;
89};
90
91struct ppi_if *ppi_create_instance(struct platform_device *pdev,
92 const struct ppi_info *info);
93void ppi_delete_instance(struct ppi_if *ppi);
94#endif
diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
index dbe1bb058c09..a81cffb76d89 100644
--- a/include/trace/events/mmflags.h
+++ b/include/trace/events/mmflags.h
@@ -115,7 +115,7 @@ IF_HAVE_PG_IDLE(PG_idle, "idle" )
115#define __VM_ARCH_SPECIFIC_1 {VM_PAT, "pat" } 115#define __VM_ARCH_SPECIFIC_1 {VM_PAT, "pat" }
116#elif defined(CONFIG_PPC) 116#elif defined(CONFIG_PPC)
117#define __VM_ARCH_SPECIFIC_1 {VM_SAO, "sao" } 117#define __VM_ARCH_SPECIFIC_1 {VM_SAO, "sao" }
118#elif defined(CONFIG_PARISC) || defined(CONFIG_METAG) || defined(CONFIG_IA64) 118#elif defined(CONFIG_PARISC) || defined(CONFIG_IA64)
119#define __VM_ARCH_SPECIFIC_1 {VM_GROWSUP, "growsup" } 119#define __VM_ARCH_SPECIFIC_1 {VM_GROWSUP, "growsup" }
120#elif !defined(CONFIG_MMU) 120#elif !defined(CONFIG_MMU)
121#define __VM_ARCH_SPECIFIC_1 {VM_MAPPED_COPY,"mappedcopy" } 121#define __VM_ARCH_SPECIFIC_1 {VM_MAPPED_COPY,"mappedcopy" }
diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
index 99c902e460c2..5528cdb0b54a 100644
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -179,33 +179,16 @@ typedef struct siginfo {
179 * SIGILL si_codes 179 * SIGILL si_codes
180 */ 180 */
181#define ILL_ILLOPC 1 /* illegal opcode */ 181#define ILL_ILLOPC 1 /* illegal opcode */
182#ifdef __bfin__
183# define ILL_ILLPARAOP 2 /* illegal opcode combine */
184#endif
185#define ILL_ILLOPN 2 /* illegal operand */ 182#define ILL_ILLOPN 2 /* illegal operand */
186#define ILL_ILLADR 3 /* illegal addressing mode */ 183#define ILL_ILLADR 3 /* illegal addressing mode */
187#define ILL_ILLTRP 4 /* illegal trap */ 184#define ILL_ILLTRP 4 /* illegal trap */
188#ifdef __bfin__
189# define ILL_ILLEXCPT 4 /* unrecoverable exception */
190#endif
191#define ILL_PRVOPC 5 /* privileged opcode */ 185#define ILL_PRVOPC 5 /* privileged opcode */
192#define ILL_PRVREG 6 /* privileged register */ 186#define ILL_PRVREG 6 /* privileged register */
193#define ILL_COPROC 7 /* coprocessor error */ 187#define ILL_COPROC 7 /* coprocessor error */
194#define ILL_BADSTK 8 /* internal stack error */ 188#define ILL_BADSTK 8 /* internal stack error */
195#ifdef __bfin__ 189#define ILL_BADIADDR 9 /* unimplemented instruction address */
196# define ILL_CPLB_VI 9 /* D/I CPLB protect violation */ 190#define __ILL_BREAK 10 /* illegal break */
197# define ILL_CPLB_MISS 10 /* D/I CPLB miss */ 191#define __ILL_BNDMOD 11 /* bundle-update (modification) in progress */
198# define ILL_CPLB_MULHIT 11 /* D/I CPLB multiple hit */
199#endif
200#ifdef __tile__
201# define ILL_DBLFLT 9 /* double fault */
202# define ILL_HARDWALL 10 /* user networks hardwall violation */
203#endif
204#ifdef __ia64__
205# define ILL_BADIADDR 9 /* unimplemented instruction address */
206# define __ILL_BREAK 10 /* illegal break */
207# define __ILL_BNDMOD 11 /* bundle-update (modification) in progress */
208#endif
209#define NSIGILL 11 192#define NSIGILL 11
210 193
211/* 194/*
@@ -219,16 +202,11 @@ typedef struct siginfo {
219#define FPE_FLTRES 6 /* floating point inexact result */ 202#define FPE_FLTRES 6 /* floating point inexact result */
220#define FPE_FLTINV 7 /* floating point invalid operation */ 203#define FPE_FLTINV 7 /* floating point invalid operation */
221#define FPE_FLTSUB 8 /* subscript out of range */ 204#define FPE_FLTSUB 8 /* subscript out of range */
222#ifdef __frv__ 205#define __FPE_DECOVF 9 /* decimal overflow */
223# define FPE_MDAOVF 9 /* media overflow */ 206#define __FPE_DECDIV 10 /* decimal division by zero */
224#endif 207#define __FPE_DECERR 11 /* packed decimal error */
225#ifdef __ia64__ 208#define __FPE_INVASC 12 /* invalid ASCII digit */
226# define __FPE_DECOVF 9 /* decimal overflow */ 209#define __FPE_INVDEC 13 /* invalid decimal digit */
227# define __FPE_DECDIV 10 /* decimal division by zero */
228# define __FPE_DECERR 11 /* packed decimal error */
229# define __FPE_INVASC 12 /* invalid ASCII digit */
230# define __FPE_INVDEC 13 /* invalid decimal digit */
231#endif
232#define NSIGFPE 13 210#define NSIGFPE 13
233 211
234/* 212/*
@@ -236,11 +214,7 @@ typedef struct siginfo {
236 */ 214 */
237#define SEGV_MAPERR 1 /* address not mapped to object */ 215#define SEGV_MAPERR 1 /* address not mapped to object */
238#define SEGV_ACCERR 2 /* invalid permissions for mapped object */ 216#define SEGV_ACCERR 2 /* invalid permissions for mapped object */
239#ifdef __bfin__ 217#define SEGV_BNDERR 3 /* failed address bound checks */
240# define SEGV_STACKFLOW 3 /* stack overflow */
241#else
242# define SEGV_BNDERR 3 /* failed address bound checks */
243#endif
244#ifdef __ia64__ 218#ifdef __ia64__
245# define __SEGV_PSTKOVF 4 /* paragraph stack overflow */ 219# define __SEGV_PSTKOVF 4 /* paragraph stack overflow */
246#else 220#else
@@ -254,12 +228,8 @@ typedef struct siginfo {
254#define BUS_ADRALN 1 /* invalid address alignment */ 228#define BUS_ADRALN 1 /* invalid address alignment */
255#define BUS_ADRERR 2 /* non-existent physical address */ 229#define BUS_ADRERR 2 /* non-existent physical address */
256#define BUS_OBJERR 3 /* object specific hardware error */ 230#define BUS_OBJERR 3 /* object specific hardware error */
257#ifdef __bfin__
258# define BUS_OPFETCH 4 /* error from instruction fetch */
259#else
260/* hardware memory error consumed on a machine check: action required */ 231/* hardware memory error consumed on a machine check: action required */
261# define BUS_MCEERR_AR 4 232#define BUS_MCEERR_AR 4
262#endif
263/* hardware memory error detected in process but not consumed: action optional*/ 233/* hardware memory error detected in process but not consumed: action optional*/
264#define BUS_MCEERR_AO 5 234#define BUS_MCEERR_AO 5
265#define NSIGBUS 5 235#define NSIGBUS 5
@@ -271,12 +241,6 @@ typedef struct siginfo {
271#define TRAP_TRACE 2 /* process trace trap */ 241#define TRAP_TRACE 2 /* process trace trap */
272#define TRAP_BRANCH 3 /* process taken branch trap */ 242#define TRAP_BRANCH 3 /* process taken branch trap */
273#define TRAP_HWBKPT 4 /* hardware breakpoint/watchpoint */ 243#define TRAP_HWBKPT 4 /* hardware breakpoint/watchpoint */
274#ifdef __bfin__
275# define TRAP_STEP 1 /* single-step breakpoint */
276# define TRAP_TRACEFLOW 2 /* trace buffer overflow */
277# define TRAP_WATCHPT 3 /* watchpoint match */
278# define TRAP_ILLTRAP 4 /* illegal trap */
279#endif
280#define NSIGTRAP 4 244#define NSIGTRAP 4
281 245
282/* 246/*
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index 8b87de067bc7..8bcb186c6f67 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -737,169 +737,6 @@ __SYSCALL(__NR_statx, sys_statx)
737#define __NR_syscalls 292 737#define __NR_syscalls 292
738 738
739/* 739/*
740 * All syscalls below here should go away really,
741 * these are provided for both review and as a porting
742 * help for the C library version.
743 *
744 * Last chance: are any of these important enough to
745 * enable by default?
746 */
747#ifdef __ARCH_WANT_SYSCALL_NO_AT
748#define __NR_open 1024
749__SYSCALL(__NR_open, sys_open)
750#define __NR_link 1025
751__SYSCALL(__NR_link, sys_link)
752#define __NR_unlink 1026
753__SYSCALL(__NR_unlink, sys_unlink)
754#define __NR_mknod 1027
755__SYSCALL(__NR_mknod, sys_mknod)
756#define __NR_chmod 1028
757__SYSCALL(__NR_chmod, sys_chmod)
758#define __NR_chown 1029
759__SYSCALL(__NR_chown, sys_chown)
760#define __NR_mkdir 1030
761__SYSCALL(__NR_mkdir, sys_mkdir)
762#define __NR_rmdir 1031
763__SYSCALL(__NR_rmdir, sys_rmdir)
764#define __NR_lchown 1032
765__SYSCALL(__NR_lchown, sys_lchown)
766#define __NR_access 1033
767__SYSCALL(__NR_access, sys_access)
768#define __NR_rename 1034
769__SYSCALL(__NR_rename, sys_rename)
770#define __NR_readlink 1035
771__SYSCALL(__NR_readlink, sys_readlink)
772#define __NR_symlink 1036
773__SYSCALL(__NR_symlink, sys_symlink)
774#define __NR_utimes 1037
775__SYSCALL(__NR_utimes, sys_utimes)
776#define __NR3264_stat 1038
777__SC_3264(__NR3264_stat, sys_stat64, sys_newstat)
778#define __NR3264_lstat 1039
779__SC_3264(__NR3264_lstat, sys_lstat64, sys_newlstat)
780
781#undef __NR_syscalls
782#define __NR_syscalls (__NR3264_lstat+1)
783#endif /* __ARCH_WANT_SYSCALL_NO_AT */
784
785#ifdef __ARCH_WANT_SYSCALL_NO_FLAGS
786#define __NR_pipe 1040
787__SYSCALL(__NR_pipe, sys_pipe)
788#define __NR_dup2 1041
789__SYSCALL(__NR_dup2, sys_dup2)
790#define __NR_epoll_create 1042
791__SYSCALL(__NR_epoll_create, sys_epoll_create)
792#define __NR_inotify_init 1043
793__SYSCALL(__NR_inotify_init, sys_inotify_init)
794#define __NR_eventfd 1044
795__SYSCALL(__NR_eventfd, sys_eventfd)
796#define __NR_signalfd 1045
797__SYSCALL(__NR_signalfd, sys_signalfd)
798
799#undef __NR_syscalls
800#define __NR_syscalls (__NR_signalfd+1)
801#endif /* __ARCH_WANT_SYSCALL_NO_FLAGS */
802
803#if (__BITS_PER_LONG == 32 || defined(__SYSCALL_COMPAT)) && \
804 defined(__ARCH_WANT_SYSCALL_OFF_T)
805#define __NR_sendfile 1046
806__SYSCALL(__NR_sendfile, sys_sendfile)
807#define __NR_ftruncate 1047
808__SYSCALL(__NR_ftruncate, sys_ftruncate)
809#define __NR_truncate 1048
810__SYSCALL(__NR_truncate, sys_truncate)
811#define __NR_stat 1049
812__SYSCALL(__NR_stat, sys_newstat)
813#define __NR_lstat 1050
814__SYSCALL(__NR_lstat, sys_newlstat)
815#define __NR_fstat 1051
816__SYSCALL(__NR_fstat, sys_newfstat)
817#define __NR_fcntl 1052
818__SYSCALL(__NR_fcntl, sys_fcntl)
819#define __NR_fadvise64 1053
820#define __ARCH_WANT_SYS_FADVISE64
821__SYSCALL(__NR_fadvise64, sys_fadvise64)
822#define __NR_newfstatat 1054
823#define __ARCH_WANT_SYS_NEWFSTATAT
824__SYSCALL(__NR_newfstatat, sys_newfstatat)
825#define __NR_fstatfs 1055
826__SYSCALL(__NR_fstatfs, sys_fstatfs)
827#define __NR_statfs 1056
828__SYSCALL(__NR_statfs, sys_statfs)
829#define __NR_lseek 1057
830__SYSCALL(__NR_lseek, sys_lseek)
831#define __NR_mmap 1058
832__SYSCALL(__NR_mmap, sys_mmap)
833
834#undef __NR_syscalls
835#define __NR_syscalls (__NR_mmap+1)
836#endif /* 32 bit off_t syscalls */
837
838#ifdef __ARCH_WANT_SYSCALL_DEPRECATED
839#define __NR_alarm 1059
840#define __ARCH_WANT_SYS_ALARM
841__SYSCALL(__NR_alarm, sys_alarm)
842#define __NR_getpgrp 1060
843#define __ARCH_WANT_SYS_GETPGRP
844__SYSCALL(__NR_getpgrp, sys_getpgrp)
845#define __NR_pause 1061
846#define __ARCH_WANT_SYS_PAUSE
847__SYSCALL(__NR_pause, sys_pause)
848#define __NR_time 1062
849#define __ARCH_WANT_SYS_TIME
850#define __ARCH_WANT_COMPAT_SYS_TIME
851__SYSCALL(__NR_time, sys_time)
852#define __NR_utime 1063
853#define __ARCH_WANT_SYS_UTIME
854__SYSCALL(__NR_utime, sys_utime)
855
856#define __NR_creat 1064
857__SYSCALL(__NR_creat, sys_creat)
858#define __NR_getdents 1065
859#define __ARCH_WANT_SYS_GETDENTS
860__SYSCALL(__NR_getdents, sys_getdents)
861#define __NR_futimesat 1066
862__SYSCALL(__NR_futimesat, sys_futimesat)
863#define __NR_select 1067
864#define __ARCH_WANT_SYS_SELECT
865__SYSCALL(__NR_select, sys_select)
866#define __NR_poll 1068
867__SYSCALL(__NR_poll, sys_poll)
868#define __NR_epoll_wait 1069
869__SYSCALL(__NR_epoll_wait, sys_epoll_wait)
870#define __NR_ustat 1070
871__SYSCALL(__NR_ustat, sys_ustat)
872#define __NR_vfork 1071
873__SYSCALL(__NR_vfork, sys_vfork)
874#define __NR_oldwait4 1072
875__SYSCALL(__NR_oldwait4, sys_wait4)
876#define __NR_recv 1073
877__SYSCALL(__NR_recv, sys_recv)
878#define __NR_send 1074
879__SYSCALL(__NR_send, sys_send)
880#define __NR_bdflush 1075
881__SYSCALL(__NR_bdflush, sys_bdflush)
882#define __NR_umount 1076
883__SYSCALL(__NR_umount, sys_oldumount)
884#define __ARCH_WANT_SYS_OLDUMOUNT
885#define __NR_uselib 1077
886__SYSCALL(__NR_uselib, sys_uselib)
887#define __NR__sysctl 1078
888__SYSCALL(__NR__sysctl, sys_sysctl)
889
890#define __NR_fork 1079
891#ifdef CONFIG_MMU
892__SYSCALL(__NR_fork, sys_fork)
893#else
894__SYSCALL(__NR_fork, sys_ni_syscall)
895#endif /* CONFIG_MMU */
896
897#undef __NR_syscalls
898#define __NR_syscalls (__NR_fork+1)
899
900#endif /* __ARCH_WANT_SYSCALL_DEPRECATED */
901
902/*
903 * 32 bit systems traditionally used different 740 * 32 bit systems traditionally used different
904 * syscalls for off_t and loff_t arguments, while 741 * syscalls for off_t and loff_t arguments, while
905 * 64 bit systems only need the off_t version. 742 * 64 bit systems only need the off_t version.
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index 3bf73fb58045..e2535d6dcec7 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -420,9 +420,6 @@ typedef struct elf64_shdr {
420#define NT_ARM_HW_WATCH 0x403 /* ARM hardware watchpoint registers */ 420#define NT_ARM_HW_WATCH 0x403 /* ARM hardware watchpoint registers */
421#define NT_ARM_SYSTEM_CALL 0x404 /* ARM system call number */ 421#define NT_ARM_SYSTEM_CALL 0x404 /* ARM system call number */
422#define NT_ARM_SVE 0x405 /* ARM Scalable Vector Extension registers */ 422#define NT_ARM_SVE 0x405 /* ARM Scalable Vector Extension registers */
423#define NT_METAG_CBUF 0x500 /* Metag catch buffer registers */
424#define NT_METAG_RPIPE 0x501 /* Metag read pipeline state */
425#define NT_METAG_TLS 0x502 /* Metag TLS pointer */
426#define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */ 423#define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */
427 424
428/* Note header in a PT_NOTE section */ 425/* Note header in a PT_NOTE section */