From: Linus Torvalds Date: Sun, 14 Oct 2012 00:18:53 +0000 (-0700) Subject: Merge branch 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm X-Git-Tag: v3.7-rc1~5 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/3d6ee36dfb2d40c72071f68173f67c728a0e19f3?hp=-c Merge branch 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm Pull ARM update from Russell King: "This is the final round of stuff for ARM, left until the end of the merge window to reduce the number of conflicts. This set contains the ARM part of David Howells UAPI changes, and a fix to the ordering of 'select' statements in ARM Kconfig files (see the appropriate commit for why this happened - thanks to Andrew Morton for pointing out the problem.) I've left this as long as I dare for this window to avoid conflicts, and I regenerated the config patch yesterday, posting it to our mailing list for review and testing. I have several acks which include successful test reports for it. However, today I notice we've got new conflicts with previously unseen code... though that conflict should be trivial (it's my changes vs a one liner.)" * 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm: ARM: config: make sure that platforms are ordered by option string ARM: config: sort select statements alphanumerically UAPI: (Scripted) Disintegrate arch/arm/include/asm Fix up fairly conflict in arch/arm/Kconfig (the select re-organization vs recent addition of GENERIC_KERNEL_EXECVE) --- 3d6ee36dfb2d40c72071f68173f67c728a0e19f3 diff --combined arch/arm/Kconfig index 431c3753145a,1bc092eb42e6..261fdd085bb9 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -1,59 -1,57 +1,58 @@@ config ARM bool default y + select ARCH_BINFMT_ELF_RANDOMIZE_PIE + select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAVE_CUSTOM_GPIO_H - select HAVE_AOUT - select HAVE_DMA_API_DEBUG - select HAVE_IDE if PCI || ISA || PCMCIA - select HAVE_DMA_ATTRS - select HAVE_DMA_CONTIGUOUS if MMU - select HAVE_MEMBLOCK - select RTC_LIB - select SYS_SUPPORTS_APM_EMULATION + select ARCH_WANT_IPC_PARSE_VERSION + select CPU_PM if (SUSPEND || CPU_IDLE) + select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI) - select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE - select HAVE_OPROFILE if (HAVE_PERF_EVENTS) + select GENERIC_CLOCKEVENTS_BROADCAST if SMP + select GENERIC_IRQ_PROBE + select GENERIC_IRQ_SHOW + select GENERIC_KERNEL_THREAD ++ select GENERIC_KERNEL_EXECVE + select GENERIC_PCI_IOMAP + select GENERIC_SMP_IDLE_THREAD + select GENERIC_STRNCPY_FROM_USER + select GENERIC_STRNLEN_USER + select HARDIRQS_SW_RESEND + select HAVE_AOUT select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK - select HAVE_SYSCALL_TRACEPOINTS - select HAVE_KPROBES if !XIP_KERNEL - select HAVE_KRETPROBES if (HAVE_KPROBES) - select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) - select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) + select HAVE_BPF_JIT + select HAVE_C_RECORDMCOUNT + select HAVE_DEBUG_KMEMLEAK + select HAVE_DMA_API_DEBUG + select HAVE_DMA_ATTRS + select HAVE_DMA_CONTIGUOUS if MMU select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) + select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL) - select ARCH_BINFMT_ELF_RANDOMIZE_PIE + select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) select HAVE_GENERIC_DMA_COHERENT - select HAVE_DEBUG_KMEMLEAK + select HAVE_GENERIC_HARDIRQS + select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)) + select HAVE_IDE if PCI || ISA || PCMCIA + select HAVE_IRQ_WORK select HAVE_KERNEL_GZIP - select HAVE_KERNEL_LZO select HAVE_KERNEL_LZMA + select HAVE_KERNEL_LZO select HAVE_KERNEL_XZ - select HAVE_IRQ_WORK + select HAVE_KPROBES if !XIP_KERNEL + select HAVE_KRETPROBES if (HAVE_KPROBES) + select HAVE_MEMBLOCK + select HAVE_OPROFILE if (HAVE_PERF_EVENTS) select HAVE_PERF_EVENTS - select PERF_USE_VMALLOC select HAVE_REGS_AND_STACK_ACCESS_API - select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)) - select HAVE_C_RECORDMCOUNT - select HAVE_GENERIC_HARDIRQS - select HARDIRQS_SW_RESEND - select GENERIC_IRQ_PROBE - select GENERIC_IRQ_SHOW + select HAVE_SYSCALL_TRACEPOINTS select HAVE_UID16 - select ARCH_WANT_IPC_PARSE_VERSION - select HARDIRQS_SW_RESEND - select CPU_PM if (SUSPEND || CPU_IDLE) - select GENERIC_PCI_IOMAP - select HAVE_BPF_JIT - select GENERIC_SMP_IDLE_THREAD select KTIME_SCALAR - select GENERIC_CLOCKEVENTS_BROADCAST if SMP - select GENERIC_STRNCPY_FROM_USER - select GENERIC_STRNLEN_USER - select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN - select GENERIC_KERNEL_THREAD - select GENERIC_KERNEL_EXECVE + select PERF_USE_VMALLOC + select RTC_LIB + select SYS_SUPPORTS_APM_EMULATION help The ARM series is a line of low-power-consumption RISC chip designs licensed by ARM Ltd and targeted at embedded applications and @@@ -69,9 -67,9 +68,9 @@@ config NEED_SG_DMA_LENGT bool config ARM_DMA_USE_IOMMU - select NEED_SG_DMA_LENGTH - select ARM_HAS_SG_CHAIN bool + select ARM_HAS_SG_CHAIN + select NEED_SG_DMA_LENGTH config HAVE_PWM bool @@@ -263,69 -261,69 +262,69 @@@ choic config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" + depends on MMU select ARM_PATCH_PHYS_VIRT select AUTO_ZRELADDR select COMMON_CLK select MULTI_IRQ_HANDLER select SPARSE_IRQ select USE_OF - depends on MMU config ARCH_INTEGRATOR bool "ARM Ltd. Integrator family" - select ARM_AMBA select ARCH_HAS_CPUFREQ + select ARM_AMBA select COMMON_CLK select COMMON_CLK_VERSATILE + select GENERIC_CLOCKEVENTS select HAVE_TCM select ICST - select GENERIC_CLOCKEVENTS + select MULTI_IRQ_HANDLER + select NEED_MACH_MEMORY_H select PLAT_VERSATILE select PLAT_VERSATILE_FPGA_IRQ - select NEED_MACH_MEMORY_H select SPARSE_IRQ - select MULTI_IRQ_HANDLER help Support for ARM's Integrator platform. config ARCH_REALVIEW bool "ARM Ltd. RealView family" + select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA + select ARM_TIMER_SP804 select COMMON_CLK select COMMON_CLK_VERSATILE - select ICST select GENERIC_CLOCKEVENTS - select ARCH_WANT_OPTIONAL_GPIOLIB - select PLAT_VERSATILE - select PLAT_VERSATILE_CLCD - select ARM_TIMER_SP804 select GPIO_PL061 if GPIOLIB + select ICST select NEED_MACH_MEMORY_H + select PLAT_VERSATILE + select PLAT_VERSATILE_CLCD help This enables support for ARM Ltd RealView boards. config ARCH_VERSATILE bool "ARM Ltd. Versatile family" + select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA + select ARM_TIMER_SP804 select ARM_VIC select CLKDEV_LOOKUP + select GENERIC_CLOCKEVENTS select HAVE_MACH_CLKDEV select ICST - select GENERIC_CLOCKEVENTS - select ARCH_WANT_OPTIONAL_GPIOLIB select PLAT_VERSATILE - select PLAT_VERSATILE_CLOCK select PLAT_VERSATILE_CLCD + select PLAT_VERSATILE_CLOCK select PLAT_VERSATILE_FPGA_IRQ - select ARM_TIMER_SP804 help This enables support for ARM Ltd Versatile board. config ARCH_AT91 bool "Atmel AT91" select ARCH_REQUIRE_GPIOLIB - select HAVE_CLK select CLKDEV_LOOKUP + select HAVE_CLK select IRQ_DOMAIN select NEED_MACH_GPIO_H select NEED_MACH_IO_H if PCCARD @@@ -350,43 -348,43 +349,43 @@@ config ARCH_BCM283 This enables support for the Broadcom BCM2835 SoC. This SoC is use in the Raspberry Pi, and Roku 2 devices. - config ARCH_CLPS711X - bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" - select CPU_ARM720T - select ARCH_USES_GETTIMEOFFSET - select COMMON_CLK - select CLKDEV_LOOKUP - select NEED_MACH_MEMORY_H - help - Support for Cirrus Logic 711x/721x/731x based boards. - config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" + select ARM_GIC select CPU_V6K select GENERIC_CLOCKEVENTS - select ARM_GIC select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI help Support for Cavium Networks CNS3XXX platform. + config ARCH_CLPS711X + bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" + select ARCH_USES_GETTIMEOFFSET + select CLKDEV_LOOKUP + select COMMON_CLK + select CPU_ARM720T + select NEED_MACH_MEMORY_H + help + Support for Cirrus Logic 711x/721x/731x based boards. + config ARCH_GEMINI bool "Cortina Systems Gemini" - select CPU_FA526 select ARCH_REQUIRE_GPIOLIB select ARCH_USES_GETTIMEOFFSET + select CPU_FA526 help Support for the Cortina Systems Gemini family SoCs config ARCH_SIRF bool "CSR SiRF" - select NO_IOPORT select ARCH_REQUIRE_GPIOLIB - select GENERIC_CLOCKEVENTS select COMMON_CLK + select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select MIGHT_HAVE_CACHE_L2X0 + select NO_IOPORT select PINCTRL select PINCTRL_SIRF select USE_OF @@@ -395,12 -393,12 +394,12 @@@ config ARCH_EBSA110 bool "EBSA-110" + select ARCH_USES_GETTIMEOFFSET select CPU_SA110 select ISA - select NO_IOPORT - select ARCH_USES_GETTIMEOFFSET select NEED_MACH_IO_H select NEED_MACH_MEMORY_H + select NO_IOPORT help This is an evaluation board for the StrongARM processor available from Digital. It has limited hardware on-board, including an @@@ -409,13 -407,13 +408,13 @@@ config ARCH_EP93XX bool "EP93xx-based" - select CPU_ARM920T + select ARCH_HAS_HOLES_MEMORYMODEL + select ARCH_REQUIRE_GPIOLIB + select ARCH_USES_GETTIMEOFFSET select ARM_AMBA select ARM_VIC select CLKDEV_LOOKUP - select ARCH_REQUIRE_GPIOLIB - select ARCH_HAS_HOLES_MEMORYMODEL - select ARCH_USES_GETTIMEOFFSET + select CPU_ARM920T select NEED_MACH_MEMORY_H help This enables support for the Cirrus EP93xx series of CPUs. @@@ -434,10 -432,10 +433,10 @@@ config ARCH_FOOTBRIDG config ARCH_MXC bool "Freescale MXC/iMX-based" - select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO + select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select MULTI_IRQ_HANDLER select SPARSE_IRQ @@@ -447,11 -445,11 +446,11 @@@ config ARCH_MXS bool "Freescale MXS-based" - select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO select COMMON_CLK + select GENERIC_CLOCKEVENTS select HAVE_CLK_PREPARE select MULTI_IRQ_HANDLER select PINCTRL @@@ -462,43 -460,43 +461,43 @@@ config ARCH_NETX bool "Hilscher NetX based" + select ARM_VIC select CLKSRC_MMIO select CPU_ARM926T - select ARM_VIC select GENERIC_CLOCKEVENTS help This enables support for systems based on the Hilscher NetX Soc config ARCH_H720X bool "Hynix HMS720x-based" + select ARCH_USES_GETTIMEOFFSET select CPU_ARM720T select ISA_DMA_API - select ARCH_USES_GETTIMEOFFSET help This enables support for systems based on the Hynix HMS720x config ARCH_IOP13XX bool "IOP13xx-based" depends on MMU - select CPU_XSC3 - select PLAT_IOP - select PCI select ARCH_SUPPORTS_MSI - select VMSPLIT_1G + select CPU_XSC3 select NEED_MACH_MEMORY_H select NEED_RET_TO_USER + select PCI + select PLAT_IOP + select VMSPLIT_1G help Support for Intel's IOP13XX (XScale) family of processors. config ARCH_IOP32X bool "IOP32x-based" depends on MMU + select ARCH_REQUIRE_GPIOLIB select CPU_XSCALE select NEED_MACH_GPIO_H select NEED_RET_TO_USER - select PLAT_IOP select PCI - select ARCH_REQUIRE_GPIOLIB + select PLAT_IOP help Support for Intel's 80219 and IOP32X (XScale) family of processors. @@@ -506,12 -504,12 +505,12 @@@ config ARCH_IOP33X bool "IOP33x-based" depends on MMU + select ARCH_REQUIRE_GPIOLIB select CPU_XSCALE select NEED_MACH_GPIO_H select NEED_RET_TO_USER - select PLAT_IOP select PCI - select ARCH_REQUIRE_GPIOLIB + select PLAT_IOP help Support for Intel's IOP33X (XScale) family of processors. @@@ -519,20 -517,20 +518,20 @@@ config ARCH_IXP4X bool "IXP4xx-based" depends on MMU select ARCH_HAS_DMA_SET_COHERENT_MASK + select ARCH_REQUIRE_GPIOLIB select CLKSRC_MMIO select CPU_XSCALE - select ARCH_REQUIRE_GPIOLIB + select DMABOUNCE if PCI select GENERIC_CLOCKEVENTS select MIGHT_HAVE_PCI select NEED_MACH_IO_H - select DMABOUNCE if PCI help Support for Intel's IXP4XX (XScale) family of processors. config ARCH_DOVE bool "Marvell Dove" - select CPU_V7 select ARCH_REQUIRE_GPIOLIB + select CPU_V7 select GENERIC_CLOCKEVENTS select MIGHT_HAVE_PCI select PLAT_ORION_LEGACY @@@ -542,36 -540,21 +541,21 @@@ config ARCH_KIRKWOOD bool "Marvell Kirkwood" - select CPU_FEROCEON - select PCI select ARCH_REQUIRE_GPIOLIB + select CPU_FEROCEON select GENERIC_CLOCKEVENTS + select PCI select PLAT_ORION_LEGACY help Support for the following Marvell Kirkwood series SoCs: 88F6180, 88F6192 and 88F6281. - config ARCH_LPC32XX - bool "NXP LPC32XX" - select CLKSRC_MMIO - select CPU_ARM926T - select ARCH_REQUIRE_GPIOLIB - select HAVE_IDE - select ARM_AMBA - select USB_ARCH_HAS_OHCI - select CLKDEV_LOOKUP - select GENERIC_CLOCKEVENTS - select USE_OF - select HAVE_PWM - help - Support for the NXP LPC32XX family of processors - config ARCH_MV78XX0 bool "Marvell MV78xx0" - select CPU_FEROCEON - select PCI select ARCH_REQUIRE_GPIOLIB + select CPU_FEROCEON select GENERIC_CLOCKEVENTS + select PCI select PLAT_ORION_LEGACY help Support for the following Marvell MV78xx0 series SoCs: @@@ -580,10 -563,10 +564,10 @@@ config ARCH_ORION5X bool "Marvell Orion" depends on MMU - select CPU_FEROCEON - select PCI select ARCH_REQUIRE_GPIOLIB + select CPU_FEROCEON select GENERIC_CLOCKEVENTS + select PCI select PLAT_ORION_LEGACY help Support for the following Marvell Orion 5x series SoCs: @@@ -595,33 -578,33 +579,33 @@@ config ARCH_MM depends on MMU select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP + select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GPIO_PXA select IRQ_DOMAIN + select NEED_MACH_GPIO_H select PLAT_PXA select SPARSE_IRQ - select GENERIC_ALLOCATOR - select NEED_MACH_GPIO_H help Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. config ARCH_KS8695 bool "Micrel/Kendin KS8695" - select CPU_ARM922T select ARCH_REQUIRE_GPIOLIB - select NEED_MACH_MEMORY_H select CLKSRC_MMIO + select CPU_ARM922T select GENERIC_CLOCKEVENTS + select NEED_MACH_MEMORY_H help Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based System-on-Chip devices. config ARCH_W90X900 bool "Nuvoton W90X900 CPU" - select CPU_ARM926T select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO + select CPU_ARM926T select GENERIC_CLOCKEVENTS help Support for Nuvoton (Winbond logic dept.) ARM9 processor, @@@ -632,18 -615,33 +616,33 @@@ + config ARCH_LPC32XX + bool "NXP LPC32XX" + select ARCH_REQUIRE_GPIOLIB + select ARM_AMBA + select CLKDEV_LOOKUP + select CLKSRC_MMIO + select CPU_ARM926T + select GENERIC_CLOCKEVENTS + select HAVE_IDE + select HAVE_PWM + select USB_ARCH_HAS_OHCI + select USE_OF + help + Support for the NXP LPC32XX family of processors + config ARCH_TEGRA bool "NVIDIA Tegra" + select ARCH_HAS_CPUFREQ select CLKDEV_LOOKUP select CLKSRC_MMIO + select COMMON_CLK select GENERIC_CLOCKEVENTS select GENERIC_GPIO select HAVE_CLK select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 - select ARCH_HAS_CPUFREQ select USE_OF - select COMMON_CLK help This enables support for NVIDIA Tegra based systems (Tegra APX, Tegra 6xx and Tegra 2 series). @@@ -651,29 -649,29 +650,29 @@@ config ARCH_PXA bool "PXA2xx/PXA3xx-based" depends on MMU - select ARCH_MTD_XIP select ARCH_HAS_CPUFREQ + select ARCH_MTD_XIP + select ARCH_REQUIRE_GPIOLIB + select ARM_CPU_SUSPEND if PM + select AUTO_ZRELADDR select CLKDEV_LOOKUP select CLKSRC_MMIO - select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS select GPIO_PXA - select PLAT_PXA - select SPARSE_IRQ - select AUTO_ZRELADDR - select MULTI_IRQ_HANDLER - select ARM_CPU_SUSPEND if PM select HAVE_IDE + select MULTI_IRQ_HANDLER select NEED_MACH_GPIO_H + select PLAT_PXA + select SPARSE_IRQ help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. config ARCH_MSM bool "Qualcomm MSM" - select HAVE_CLK - select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP + select GENERIC_CLOCKEVENTS + select HAVE_CLK help Support for Qualcomm MSM/QSD based systems. This runs on the apps processor of the MSM/QSD and depends on a shared memory @@@ -683,50 -681,50 +682,50 @@@ config ARCH_SHMOBILE bool "Renesas SH-Mobile / R-Mobile" - select HAVE_CLK select CLKDEV_LOOKUP + select GENERIC_CLOCKEVENTS + select HAVE_CLK select HAVE_MACH_CLKDEV select HAVE_SMP - select GENERIC_CLOCKEVENTS select MIGHT_HAVE_CACHE_L2X0 - select NO_IOPORT - select SPARSE_IRQ select MULTI_IRQ_HANDLER - select PM_GENERIC_DOMAINS if PM select NEED_MACH_MEMORY_H + select NO_IOPORT + select PM_GENERIC_DOMAINS if PM + select SPARSE_IRQ help Support for Renesas's SH-Mobile and R-Mobile ARM platforms. config ARCH_RPC bool "RiscPC" select ARCH_ACORN - select FIQ select ARCH_MAY_HAVE_PC_FDC - select HAVE_PATA_PLATFORM - select ISA_DMA_API - select NO_IOPORT select ARCH_SPARSEMEM_ENABLE select ARCH_USES_GETTIMEOFFSET + select FIQ select HAVE_IDE + select HAVE_PATA_PLATFORM + select ISA_DMA_API select NEED_MACH_IO_H select NEED_MACH_MEMORY_H + select NO_IOPORT help On the Acorn Risc-PC, Linux can support the internal IDE disk and CD-ROM interface, serial and parallel port, and the floppy drive. config ARCH_SA1100 bool "SA1100-based" - select CLKSRC_MMIO - select CPU_SA1100 - select ISA - select ARCH_SPARSEMEM_ENABLE - select ARCH_MTD_XIP select ARCH_HAS_CPUFREQ + select ARCH_MTD_XIP + select ARCH_REQUIRE_GPIOLIB + select ARCH_SPARSEMEM_ENABLE + select CLKDEV_LOOKUP + select CLKSRC_MMIO select CPU_FREQ + select CPU_SA1100 select GENERIC_CLOCKEVENTS - select CLKDEV_LOOKUP - select ARCH_REQUIRE_GPIOLIB select HAVE_IDE + select ISA select NEED_MACH_GPIO_H select NEED_MACH_MEMORY_H select SPARSE_IRQ @@@ -735,14 -733,14 +734,14 @@@ config ARCH_S3C24XX bool "Samsung S3C24XX SoCs" - select GENERIC_GPIO select ARCH_HAS_CPUFREQ - select HAVE_CLK - select CLKDEV_LOOKUP select ARCH_USES_GETTIMEOFFSET + select CLKDEV_LOOKUP + select GENERIC_GPIO + select HAVE_CLK select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C_RTC if RTC_CLASS select NEED_MACH_GPIO_H select NEED_MACH_IO_H help @@@ -753,38 -751,38 +752,38 @@@ config ARCH_S3C64XX bool "Samsung S3C64XX" - select PLAT_SAMSUNG - select CPU_V6 + select ARCH_HAS_CPUFREQ + select ARCH_REQUIRE_GPIOLIB + select ARCH_USES_GETTIMEOFFSET select ARM_VIC + select CLKDEV_LOOKUP + select CPU_V6 select HAVE_CLK + select HAVE_S3C2410_I2C if I2C + select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_TCM - select CLKDEV_LOOKUP + select NEED_MACH_GPIO_H select NO_IOPORT - select ARCH_USES_GETTIMEOFFSET - select ARCH_HAS_CPUFREQ - select ARCH_REQUIRE_GPIOLIB + select PLAT_SAMSUNG + select S3C_DEV_NAND + select S3C_GPIO_TRACK select SAMSUNG_CLKSRC + select SAMSUNG_GPIOLIB_4BIT select SAMSUNG_IRQ_VIC_TIMER - select S3C_GPIO_TRACK - select S3C_DEV_NAND select USB_ARCH_HAS_OHCI - select SAMSUNG_GPIOLIB_4BIT - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C2410_WATCHDOG if WATCHDOG - select NEED_MACH_GPIO_H help Samsung S3C64XX series based systems config ARCH_S5P64X0 bool "Samsung S5P6440 S5P6450" - select CPU_V6 - select GENERIC_GPIO - select HAVE_CLK select CLKDEV_LOOKUP select CLKSRC_MMIO - select HAVE_S3C2410_WATCHDOG if WATCHDOG + select CPU_V6 select GENERIC_CLOCKEVENTS + select GENERIC_GPIO + select HAVE_CLK select HAVE_S3C2410_I2C if I2C + select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_S3C_RTC if RTC_CLASS select NEED_MACH_GPIO_H help @@@ -793,50 -791,50 +792,50 @@@ config ARCH_S5PC100 bool "Samsung S5PC100" - select GENERIC_GPIO - select HAVE_CLK + select ARCH_USES_GETTIMEOFFSET select CLKDEV_LOOKUP select CPU_V7 - select ARCH_USES_GETTIMEOFFSET + select GENERIC_GPIO + select HAVE_CLK select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C_RTC if RTC_CLASS select NEED_MACH_GPIO_H help Samsung S5PC100 series based systems config ARCH_S5PV210 bool "Samsung S5PV210/S5PC110" - select CPU_V7 - select ARCH_SPARSEMEM_ENABLE + select ARCH_HAS_CPUFREQ select ARCH_HAS_HOLES_MEMORYMODEL - select GENERIC_GPIO - select HAVE_CLK + select ARCH_SPARSEMEM_ENABLE select CLKDEV_LOOKUP select CLKSRC_MMIO - select ARCH_HAS_CPUFREQ + select CPU_V7 select GENERIC_CLOCKEVENTS + select GENERIC_GPIO + select HAVE_CLK select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C_RTC if RTC_CLASS select NEED_MACH_GPIO_H select NEED_MACH_MEMORY_H help Samsung S5PV210/S5PC110 series based systems config ARCH_EXYNOS - bool "SAMSUNG EXYNOS" - select CPU_V7 - select ARCH_SPARSEMEM_ENABLE + bool "Samsung EXYNOS" + select ARCH_HAS_CPUFREQ select ARCH_HAS_HOLES_MEMORYMODEL - select GENERIC_GPIO - select HAVE_CLK + select ARCH_SPARSEMEM_ENABLE select CLKDEV_LOOKUP - select ARCH_HAS_CPUFREQ + select CPU_V7 select GENERIC_CLOCKEVENTS - select HAVE_S3C_RTC if RTC_CLASS + select GENERIC_GPIO + select HAVE_CLK select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C_RTC if RTC_CLASS select NEED_MACH_GPIO_H select NEED_MACH_MEMORY_H help @@@ -844,13 -842,13 +843,13 @@@ config ARCH_SHARK bool "Shark" + select ARCH_USES_GETTIMEOFFSET select CPU_SA110 select ISA select ISA_DMA - select ZONE_DMA - select PCI - select ARCH_USES_GETTIMEOFFSET select NEED_MACH_MEMORY_H + select PCI + select ZONE_DMA help Support for the StrongARM based Digital DNARD machine, also known as "Shark" (). @@@ -858,17 -856,17 +857,17 @@@ config ARCH_U300 bool "ST-Ericsson U300 Series" depends on MMU - select CLKSRC_MMIO - select CPU_ARM926T - select HAVE_TCM + select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select ARM_PATCH_PHYS_VIRT select ARM_VIC - select GENERIC_CLOCKEVENTS select CLKDEV_LOOKUP + select CLKSRC_MMIO select COMMON_CLK + select CPU_ARM926T + select GENERIC_CLOCKEVENTS select GENERIC_GPIO - select ARCH_REQUIRE_GPIOLIB + select HAVE_TCM select SPARSE_IRQ help Support for ST-Ericsson U300 series mobile platforms. @@@ -876,12 -874,12 +875,12 @@@ config ARCH_U8500 bool "ST-Ericsson U8500 Series" depends on MMU - select CPU_V7 + select ARCH_HAS_CPUFREQ + select ARCH_REQUIRE_GPIOLIB select ARM_AMBA - select GENERIC_CLOCKEVENTS select CLKDEV_LOOKUP - select ARCH_REQUIRE_GPIOLIB - select ARCH_HAS_CPUFREQ + select CPU_V7 + select GENERIC_CLOCKEVENTS select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 help @@@ -889,78 -887,78 +888,78 @@@ config ARCH_NOMADIK bool "STMicroelectronics Nomadik" + select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select ARM_VIC - select CPU_ARM926T select COMMON_CLK + select CPU_ARM926T select GENERIC_CLOCKEVENTS + select MIGHT_HAVE_CACHE_L2X0 select PINCTRL select PINCTRL_STN8815 - select MIGHT_HAVE_CACHE_L2X0 - select ARCH_REQUIRE_GPIOLIB help Support for the Nomadik platform by ST-Ericsson + config PLAT_SPEAR + bool "ST SPEAr" + select ARCH_REQUIRE_GPIOLIB + select ARM_AMBA + select CLKDEV_LOOKUP + select CLKSRC_MMIO + select COMMON_CLK + select GENERIC_CLOCKEVENTS + select HAVE_CLK + help + Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). + config ARCH_DAVINCI bool "TI DaVinci" - select GENERIC_CLOCKEVENTS + select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_REQUIRE_GPIOLIB - select ZONE_DMA - select HAVE_IDE select CLKDEV_LOOKUP select GENERIC_ALLOCATOR + select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP - select ARCH_HAS_HOLES_MEMORYMODEL + select HAVE_IDE select NEED_MACH_GPIO_H + select ZONE_DMA help Support for TI's DaVinci platform. config ARCH_OMAP bool "TI OMAP" depends on MMU - select HAVE_CLK - select ARCH_REQUIRE_GPIOLIB select ARCH_HAS_CPUFREQ - select CLKSRC_MMIO - select GENERIC_CLOCKEVENTS select ARCH_HAS_HOLES_MEMORYMODEL - select NEED_MACH_GPIO_H - help - Support for TI's OMAP platform (OMAP1/2/3/4). - - config PLAT_SPEAR - bool "ST SPEAr" - select ARM_AMBA select ARCH_REQUIRE_GPIOLIB - select CLKDEV_LOOKUP - select COMMON_CLK select CLKSRC_MMIO select GENERIC_CLOCKEVENTS select HAVE_CLK + select NEED_MACH_GPIO_H help - Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). + Support for TI's OMAP platform (OMAP1/2/3/4). config ARCH_VT8500 bool "VIA/WonderMedia 85xx" - select CPU_ARM926T - select GENERIC_GPIO select ARCH_HAS_CPUFREQ - select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB - select USE_OF + select CLKDEV_LOOKUP select COMMON_CLK + select CPU_ARM926T + select GENERIC_CLOCKEVENTS + select GENERIC_GPIO select HAVE_CLK - select CLKDEV_LOOKUP + select USE_OF help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. config ARCH_ZYNQ bool "Xilinx Zynq ARM Cortex A9 Platform" + select ARM_AMBA + select ARM_GIC + select CLKDEV_LOOKUP select CPU_V7 select GENERIC_CLOCKEVENTS - select CLKDEV_LOOKUP - select ARM_GIC - select ARM_AMBA select ICST select MIGHT_HAVE_CACHE_L2X0 select USE_OF @@@ -975,33 -973,33 +974,33 @@@ comment "CPU Core family selection config ARCH_MULTI_V4 bool "ARMv4 based platforms (FA526, StrongARM)" - select ARCH_MULTI_V4_V5 depends on !ARCH_MULTI_V6_V7 + select ARCH_MULTI_V4_V5 config ARCH_MULTI_V4T bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" - select ARCH_MULTI_V4_V5 depends on !ARCH_MULTI_V6_V7 + select ARCH_MULTI_V4_V5 config ARCH_MULTI_V5 bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" - select ARCH_MULTI_V4_V5 depends on !ARCH_MULTI_V6_V7 + select ARCH_MULTI_V4_V5 config ARCH_MULTI_V4_V5 bool config ARCH_MULTI_V6 bool "ARMv6 based platforms (ARM11, Scorpion, ...)" - select CPU_V6 select ARCH_MULTI_V6_V7 + select CPU_V6 config ARCH_MULTI_V7 bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)" - select CPU_V7 - select ARCH_VEXPRESS default y select ARCH_MULTI_V6_V7 + select ARCH_VEXPRESS + select CPU_V7 config ARCH_MULTI_V6_V7 bool @@@ -1138,9 -1136,9 +1137,9 @@@ config PLAT_IO config PLAT_ORION bool select CLKSRC_MMIO + select COMMON_CLK select GENERIC_IRQ_CHIP select IRQ_DOMAIN - select COMMON_CLK config PLAT_ORION_LEGACY bool @@@ -1498,8 -1496,8 +1497,8 @@@ config SM depends on GENERIC_CLOCKEVENTS depends on HAVE_SMP depends on MMU - select USE_GENERIC_SMP_HELPERS select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP + select USE_GENERIC_SMP_HELPERS help This enables support for systems with more than one CPU. If you have a system with only one CPU, like most personal computers, say N. If @@@ -1858,9 -1856,9 +1857,9 @@@ menu "Boot options config USE_OF bool "Flattened Device Tree support" + select IRQ_DOMAIN select OF select OF_EARLY_FLATTREE - select IRQ_DOMAIN help Include support for flattened device tree machine descriptions. @@@ -2142,8 -2140,8 +2141,8 @@@ config CPU_FREQ_PX bool depends on CPU_FREQ && ARCH_PXA && PXA25x default y - select CPU_FREQ_TABLE select CPU_FREQ_DEFAULT_GOV_USERSPACE + select CPU_FREQ_TABLE config CPU_FREQ_S3C bool diff --combined arch/arm/include/asm/unistd.h index 91819ad54424,202bc3a2ddc5..8f60b6e6bd41 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h @@@ -13,447 -13,10 +13,10 @@@ #ifndef __ASM_ARM_UNISTD_H #define __ASM_ARM_UNISTD_H - #define __NR_OABI_SYSCALL_BASE 0x900000 + #include - #if defined(__thumb__) || defined(__ARM_EABI__) - #define __NR_SYSCALL_BASE 0 - #else - #define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE - #endif - - /* - * This file contains the system call numbers. - */ - - #define __NR_restart_syscall (__NR_SYSCALL_BASE+ 0) - #define __NR_exit (__NR_SYSCALL_BASE+ 1) - #define __NR_fork (__NR_SYSCALL_BASE+ 2) - #define __NR_read (__NR_SYSCALL_BASE+ 3) - #define __NR_write (__NR_SYSCALL_BASE+ 4) - #define __NR_open (__NR_SYSCALL_BASE+ 5) - #define __NR_close (__NR_SYSCALL_BASE+ 6) - /* 7 was sys_waitpid */ - #define __NR_creat (__NR_SYSCALL_BASE+ 8) - #define __NR_link (__NR_SYSCALL_BASE+ 9) - #define __NR_unlink (__NR_SYSCALL_BASE+ 10) - #define __NR_execve (__NR_SYSCALL_BASE+ 11) - #define __NR_chdir (__NR_SYSCALL_BASE+ 12) - #define __NR_time (__NR_SYSCALL_BASE+ 13) - #define __NR_mknod (__NR_SYSCALL_BASE+ 14) - #define __NR_chmod (__NR_SYSCALL_BASE+ 15) - #define __NR_lchown (__NR_SYSCALL_BASE+ 16) - /* 17 was sys_break */ - /* 18 was sys_stat */ - #define __NR_lseek (__NR_SYSCALL_BASE+ 19) - #define __NR_getpid (__NR_SYSCALL_BASE+ 20) - #define __NR_mount (__NR_SYSCALL_BASE+ 21) - #define __NR_umount (__NR_SYSCALL_BASE+ 22) - #define __NR_setuid (__NR_SYSCALL_BASE+ 23) - #define __NR_getuid (__NR_SYSCALL_BASE+ 24) - #define __NR_stime (__NR_SYSCALL_BASE+ 25) - #define __NR_ptrace (__NR_SYSCALL_BASE+ 26) - #define __NR_alarm (__NR_SYSCALL_BASE+ 27) - /* 28 was sys_fstat */ - #define __NR_pause (__NR_SYSCALL_BASE+ 29) - #define __NR_utime (__NR_SYSCALL_BASE+ 30) - /* 31 was sys_stty */ - /* 32 was sys_gtty */ - #define __NR_access (__NR_SYSCALL_BASE+ 33) - #define __NR_nice (__NR_SYSCALL_BASE+ 34) - /* 35 was sys_ftime */ - #define __NR_sync (__NR_SYSCALL_BASE+ 36) - #define __NR_kill (__NR_SYSCALL_BASE+ 37) - #define __NR_rename (__NR_SYSCALL_BASE+ 38) - #define __NR_mkdir (__NR_SYSCALL_BASE+ 39) - #define __NR_rmdir (__NR_SYSCALL_BASE+ 40) - #define __NR_dup (__NR_SYSCALL_BASE+ 41) - #define __NR_pipe (__NR_SYSCALL_BASE+ 42) - #define __NR_times (__NR_SYSCALL_BASE+ 43) - /* 44 was sys_prof */ - #define __NR_brk (__NR_SYSCALL_BASE+ 45) - #define __NR_setgid (__NR_SYSCALL_BASE+ 46) - #define __NR_getgid (__NR_SYSCALL_BASE+ 47) - /* 48 was sys_signal */ - #define __NR_geteuid (__NR_SYSCALL_BASE+ 49) - #define __NR_getegid (__NR_SYSCALL_BASE+ 50) - #define __NR_acct (__NR_SYSCALL_BASE+ 51) - #define __NR_umount2 (__NR_SYSCALL_BASE+ 52) - /* 53 was sys_lock */ - #define __NR_ioctl (__NR_SYSCALL_BASE+ 54) - #define __NR_fcntl (__NR_SYSCALL_BASE+ 55) - /* 56 was sys_mpx */ - #define __NR_setpgid (__NR_SYSCALL_BASE+ 57) - /* 58 was sys_ulimit */ - /* 59 was sys_olduname */ - #define __NR_umask (__NR_SYSCALL_BASE+ 60) - #define __NR_chroot (__NR_SYSCALL_BASE+ 61) - #define __NR_ustat (__NR_SYSCALL_BASE+ 62) - #define __NR_dup2 (__NR_SYSCALL_BASE+ 63) - #define __NR_getppid (__NR_SYSCALL_BASE+ 64) - #define __NR_getpgrp (__NR_SYSCALL_BASE+ 65) - #define __NR_setsid (__NR_SYSCALL_BASE+ 66) - #define __NR_sigaction (__NR_SYSCALL_BASE+ 67) - /* 68 was sys_sgetmask */ - /* 69 was sys_ssetmask */ - #define __NR_setreuid (__NR_SYSCALL_BASE+ 70) - #define __NR_setregid (__NR_SYSCALL_BASE+ 71) - #define __NR_sigsuspend (__NR_SYSCALL_BASE+ 72) - #define __NR_sigpending (__NR_SYSCALL_BASE+ 73) - #define __NR_sethostname (__NR_SYSCALL_BASE+ 74) - #define __NR_setrlimit (__NR_SYSCALL_BASE+ 75) - #define __NR_getrlimit (__NR_SYSCALL_BASE+ 76) /* Back compat 2GB limited rlimit */ - #define __NR_getrusage (__NR_SYSCALL_BASE+ 77) - #define __NR_gettimeofday (__NR_SYSCALL_BASE+ 78) - #define __NR_settimeofday (__NR_SYSCALL_BASE+ 79) - #define __NR_getgroups (__NR_SYSCALL_BASE+ 80) - #define __NR_setgroups (__NR_SYSCALL_BASE+ 81) - #define __NR_select (__NR_SYSCALL_BASE+ 82) - #define __NR_symlink (__NR_SYSCALL_BASE+ 83) - /* 84 was sys_lstat */ - #define __NR_readlink (__NR_SYSCALL_BASE+ 85) - #define __NR_uselib (__NR_SYSCALL_BASE+ 86) - #define __NR_swapon (__NR_SYSCALL_BASE+ 87) - #define __NR_reboot (__NR_SYSCALL_BASE+ 88) - #define __NR_readdir (__NR_SYSCALL_BASE+ 89) - #define __NR_mmap (__NR_SYSCALL_BASE+ 90) - #define __NR_munmap (__NR_SYSCALL_BASE+ 91) - #define __NR_truncate (__NR_SYSCALL_BASE+ 92) - #define __NR_ftruncate (__NR_SYSCALL_BASE+ 93) - #define __NR_fchmod (__NR_SYSCALL_BASE+ 94) - #define __NR_fchown (__NR_SYSCALL_BASE+ 95) - #define __NR_getpriority (__NR_SYSCALL_BASE+ 96) - #define __NR_setpriority (__NR_SYSCALL_BASE+ 97) - /* 98 was sys_profil */ - #define __NR_statfs (__NR_SYSCALL_BASE+ 99) - #define __NR_fstatfs (__NR_SYSCALL_BASE+100) - /* 101 was sys_ioperm */ - #define __NR_socketcall (__NR_SYSCALL_BASE+102) - #define __NR_syslog (__NR_SYSCALL_BASE+103) - #define __NR_setitimer (__NR_SYSCALL_BASE+104) - #define __NR_getitimer (__NR_SYSCALL_BASE+105) - #define __NR_stat (__NR_SYSCALL_BASE+106) - #define __NR_lstat (__NR_SYSCALL_BASE+107) - #define __NR_fstat (__NR_SYSCALL_BASE+108) - /* 109 was sys_uname */ - /* 110 was sys_iopl */ - #define __NR_vhangup (__NR_SYSCALL_BASE+111) - /* 112 was sys_idle */ - #define __NR_syscall (__NR_SYSCALL_BASE+113) /* syscall to call a syscall! */ - #define __NR_wait4 (__NR_SYSCALL_BASE+114) - #define __NR_swapoff (__NR_SYSCALL_BASE+115) - #define __NR_sysinfo (__NR_SYSCALL_BASE+116) - #define __NR_ipc (__NR_SYSCALL_BASE+117) - #define __NR_fsync (__NR_SYSCALL_BASE+118) - #define __NR_sigreturn (__NR_SYSCALL_BASE+119) - #define __NR_clone (__NR_SYSCALL_BASE+120) - #define __NR_setdomainname (__NR_SYSCALL_BASE+121) - #define __NR_uname (__NR_SYSCALL_BASE+122) - /* 123 was sys_modify_ldt */ - #define __NR_adjtimex (__NR_SYSCALL_BASE+124) - #define __NR_mprotect (__NR_SYSCALL_BASE+125) - #define __NR_sigprocmask (__NR_SYSCALL_BASE+126) - /* 127 was sys_create_module */ - #define __NR_init_module (__NR_SYSCALL_BASE+128) - #define __NR_delete_module (__NR_SYSCALL_BASE+129) - /* 130 was sys_get_kernel_syms */ - #define __NR_quotactl (__NR_SYSCALL_BASE+131) - #define __NR_getpgid (__NR_SYSCALL_BASE+132) - #define __NR_fchdir (__NR_SYSCALL_BASE+133) - #define __NR_bdflush (__NR_SYSCALL_BASE+134) - #define __NR_sysfs (__NR_SYSCALL_BASE+135) - #define __NR_personality (__NR_SYSCALL_BASE+136) - /* 137 was sys_afs_syscall */ - #define __NR_setfsuid (__NR_SYSCALL_BASE+138) - #define __NR_setfsgid (__NR_SYSCALL_BASE+139) - #define __NR__llseek (__NR_SYSCALL_BASE+140) - #define __NR_getdents (__NR_SYSCALL_BASE+141) - #define __NR__newselect (__NR_SYSCALL_BASE+142) - #define __NR_flock (__NR_SYSCALL_BASE+143) - #define __NR_msync (__NR_SYSCALL_BASE+144) - #define __NR_readv (__NR_SYSCALL_BASE+145) - #define __NR_writev (__NR_SYSCALL_BASE+146) - #define __NR_getsid (__NR_SYSCALL_BASE+147) - #define __NR_fdatasync (__NR_SYSCALL_BASE+148) - #define __NR__sysctl (__NR_SYSCALL_BASE+149) - #define __NR_mlock (__NR_SYSCALL_BASE+150) - #define __NR_munlock (__NR_SYSCALL_BASE+151) - #define __NR_mlockall (__NR_SYSCALL_BASE+152) - #define __NR_munlockall (__NR_SYSCALL_BASE+153) - #define __NR_sched_setparam (__NR_SYSCALL_BASE+154) - #define __NR_sched_getparam (__NR_SYSCALL_BASE+155) - #define __NR_sched_setscheduler (__NR_SYSCALL_BASE+156) - #define __NR_sched_getscheduler (__NR_SYSCALL_BASE+157) - #define __NR_sched_yield (__NR_SYSCALL_BASE+158) - #define __NR_sched_get_priority_max (__NR_SYSCALL_BASE+159) - #define __NR_sched_get_priority_min (__NR_SYSCALL_BASE+160) - #define __NR_sched_rr_get_interval (__NR_SYSCALL_BASE+161) - #define __NR_nanosleep (__NR_SYSCALL_BASE+162) - #define __NR_mremap (__NR_SYSCALL_BASE+163) - #define __NR_setresuid (__NR_SYSCALL_BASE+164) - #define __NR_getresuid (__NR_SYSCALL_BASE+165) - /* 166 was sys_vm86 */ - /* 167 was sys_query_module */ - #define __NR_poll (__NR_SYSCALL_BASE+168) - #define __NR_nfsservctl (__NR_SYSCALL_BASE+169) - #define __NR_setresgid (__NR_SYSCALL_BASE+170) - #define __NR_getresgid (__NR_SYSCALL_BASE+171) - #define __NR_prctl (__NR_SYSCALL_BASE+172) - #define __NR_rt_sigreturn (__NR_SYSCALL_BASE+173) - #define __NR_rt_sigaction (__NR_SYSCALL_BASE+174) - #define __NR_rt_sigprocmask (__NR_SYSCALL_BASE+175) - #define __NR_rt_sigpending (__NR_SYSCALL_BASE+176) - #define __NR_rt_sigtimedwait (__NR_SYSCALL_BASE+177) - #define __NR_rt_sigqueueinfo (__NR_SYSCALL_BASE+178) - #define __NR_rt_sigsuspend (__NR_SYSCALL_BASE+179) - #define __NR_pread64 (__NR_SYSCALL_BASE+180) - #define __NR_pwrite64 (__NR_SYSCALL_BASE+181) - #define __NR_chown (__NR_SYSCALL_BASE+182) - #define __NR_getcwd (__NR_SYSCALL_BASE+183) - #define __NR_capget (__NR_SYSCALL_BASE+184) - #define __NR_capset (__NR_SYSCALL_BASE+185) - #define __NR_sigaltstack (__NR_SYSCALL_BASE+186) - #define __NR_sendfile (__NR_SYSCALL_BASE+187) - /* 188 reserved */ - /* 189 reserved */ - #define __NR_vfork (__NR_SYSCALL_BASE+190) - #define __NR_ugetrlimit (__NR_SYSCALL_BASE+191) /* SuS compliant getrlimit */ - #define __NR_mmap2 (__NR_SYSCALL_BASE+192) - #define __NR_truncate64 (__NR_SYSCALL_BASE+193) - #define __NR_ftruncate64 (__NR_SYSCALL_BASE+194) - #define __NR_stat64 (__NR_SYSCALL_BASE+195) - #define __NR_lstat64 (__NR_SYSCALL_BASE+196) - #define __NR_fstat64 (__NR_SYSCALL_BASE+197) - #define __NR_lchown32 (__NR_SYSCALL_BASE+198) - #define __NR_getuid32 (__NR_SYSCALL_BASE+199) - #define __NR_getgid32 (__NR_SYSCALL_BASE+200) - #define __NR_geteuid32 (__NR_SYSCALL_BASE+201) - #define __NR_getegid32 (__NR_SYSCALL_BASE+202) - #define __NR_setreuid32 (__NR_SYSCALL_BASE+203) - #define __NR_setregid32 (__NR_SYSCALL_BASE+204) - #define __NR_getgroups32 (__NR_SYSCALL_BASE+205) - #define __NR_setgroups32 (__NR_SYSCALL_BASE+206) - #define __NR_fchown32 (__NR_SYSCALL_BASE+207) - #define __NR_setresuid32 (__NR_SYSCALL_BASE+208) - #define __NR_getresuid32 (__NR_SYSCALL_BASE+209) - #define __NR_setresgid32 (__NR_SYSCALL_BASE+210) - #define __NR_getresgid32 (__NR_SYSCALL_BASE+211) - #define __NR_chown32 (__NR_SYSCALL_BASE+212) - #define __NR_setuid32 (__NR_SYSCALL_BASE+213) - #define __NR_setgid32 (__NR_SYSCALL_BASE+214) - #define __NR_setfsuid32 (__NR_SYSCALL_BASE+215) - #define __NR_setfsgid32 (__NR_SYSCALL_BASE+216) - #define __NR_getdents64 (__NR_SYSCALL_BASE+217) - #define __NR_pivot_root (__NR_SYSCALL_BASE+218) - #define __NR_mincore (__NR_SYSCALL_BASE+219) - #define __NR_madvise (__NR_SYSCALL_BASE+220) - #define __NR_fcntl64 (__NR_SYSCALL_BASE+221) - /* 222 for tux */ - /* 223 is unused */ - #define __NR_gettid (__NR_SYSCALL_BASE+224) - #define __NR_readahead (__NR_SYSCALL_BASE+225) - #define __NR_setxattr (__NR_SYSCALL_BASE+226) - #define __NR_lsetxattr (__NR_SYSCALL_BASE+227) - #define __NR_fsetxattr (__NR_SYSCALL_BASE+228) - #define __NR_getxattr (__NR_SYSCALL_BASE+229) - #define __NR_lgetxattr (__NR_SYSCALL_BASE+230) - #define __NR_fgetxattr (__NR_SYSCALL_BASE+231) - #define __NR_listxattr (__NR_SYSCALL_BASE+232) - #define __NR_llistxattr (__NR_SYSCALL_BASE+233) - #define __NR_flistxattr (__NR_SYSCALL_BASE+234) - #define __NR_removexattr (__NR_SYSCALL_BASE+235) - #define __NR_lremovexattr (__NR_SYSCALL_BASE+236) - #define __NR_fremovexattr (__NR_SYSCALL_BASE+237) - #define __NR_tkill (__NR_SYSCALL_BASE+238) - #define __NR_sendfile64 (__NR_SYSCALL_BASE+239) - #define __NR_futex (__NR_SYSCALL_BASE+240) - #define __NR_sched_setaffinity (__NR_SYSCALL_BASE+241) - #define __NR_sched_getaffinity (__NR_SYSCALL_BASE+242) - #define __NR_io_setup (__NR_SYSCALL_BASE+243) - #define __NR_io_destroy (__NR_SYSCALL_BASE+244) - #define __NR_io_getevents (__NR_SYSCALL_BASE+245) - #define __NR_io_submit (__NR_SYSCALL_BASE+246) - #define __NR_io_cancel (__NR_SYSCALL_BASE+247) - #define __NR_exit_group (__NR_SYSCALL_BASE+248) - #define __NR_lookup_dcookie (__NR_SYSCALL_BASE+249) - #define __NR_epoll_create (__NR_SYSCALL_BASE+250) - #define __NR_epoll_ctl (__NR_SYSCALL_BASE+251) - #define __NR_epoll_wait (__NR_SYSCALL_BASE+252) - #define __NR_remap_file_pages (__NR_SYSCALL_BASE+253) - /* 254 for set_thread_area */ - /* 255 for get_thread_area */ - #define __NR_set_tid_address (__NR_SYSCALL_BASE+256) - #define __NR_timer_create (__NR_SYSCALL_BASE+257) - #define __NR_timer_settime (__NR_SYSCALL_BASE+258) - #define __NR_timer_gettime (__NR_SYSCALL_BASE+259) - #define __NR_timer_getoverrun (__NR_SYSCALL_BASE+260) - #define __NR_timer_delete (__NR_SYSCALL_BASE+261) - #define __NR_clock_settime (__NR_SYSCALL_BASE+262) - #define __NR_clock_gettime (__NR_SYSCALL_BASE+263) - #define __NR_clock_getres (__NR_SYSCALL_BASE+264) - #define __NR_clock_nanosleep (__NR_SYSCALL_BASE+265) - #define __NR_statfs64 (__NR_SYSCALL_BASE+266) - #define __NR_fstatfs64 (__NR_SYSCALL_BASE+267) - #define __NR_tgkill (__NR_SYSCALL_BASE+268) - #define __NR_utimes (__NR_SYSCALL_BASE+269) - #define __NR_arm_fadvise64_64 (__NR_SYSCALL_BASE+270) - #define __NR_pciconfig_iobase (__NR_SYSCALL_BASE+271) - #define __NR_pciconfig_read (__NR_SYSCALL_BASE+272) - #define __NR_pciconfig_write (__NR_SYSCALL_BASE+273) - #define __NR_mq_open (__NR_SYSCALL_BASE+274) - #define __NR_mq_unlink (__NR_SYSCALL_BASE+275) - #define __NR_mq_timedsend (__NR_SYSCALL_BASE+276) - #define __NR_mq_timedreceive (__NR_SYSCALL_BASE+277) - #define __NR_mq_notify (__NR_SYSCALL_BASE+278) - #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279) - #define __NR_waitid (__NR_SYSCALL_BASE+280) - #define __NR_socket (__NR_SYSCALL_BASE+281) - #define __NR_bind (__NR_SYSCALL_BASE+282) - #define __NR_connect (__NR_SYSCALL_BASE+283) - #define __NR_listen (__NR_SYSCALL_BASE+284) - #define __NR_accept (__NR_SYSCALL_BASE+285) - #define __NR_getsockname (__NR_SYSCALL_BASE+286) - #define __NR_getpeername (__NR_SYSCALL_BASE+287) - #define __NR_socketpair (__NR_SYSCALL_BASE+288) - #define __NR_send (__NR_SYSCALL_BASE+289) - #define __NR_sendto (__NR_SYSCALL_BASE+290) - #define __NR_recv (__NR_SYSCALL_BASE+291) - #define __NR_recvfrom (__NR_SYSCALL_BASE+292) - #define __NR_shutdown (__NR_SYSCALL_BASE+293) - #define __NR_setsockopt (__NR_SYSCALL_BASE+294) - #define __NR_getsockopt (__NR_SYSCALL_BASE+295) - #define __NR_sendmsg (__NR_SYSCALL_BASE+296) - #define __NR_recvmsg (__NR_SYSCALL_BASE+297) - #define __NR_semop (__NR_SYSCALL_BASE+298) - #define __NR_semget (__NR_SYSCALL_BASE+299) - #define __NR_semctl (__NR_SYSCALL_BASE+300) - #define __NR_msgsnd (__NR_SYSCALL_BASE+301) - #define __NR_msgrcv (__NR_SYSCALL_BASE+302) - #define __NR_msgget (__NR_SYSCALL_BASE+303) - #define __NR_msgctl (__NR_SYSCALL_BASE+304) - #define __NR_shmat (__NR_SYSCALL_BASE+305) - #define __NR_shmdt (__NR_SYSCALL_BASE+306) - #define __NR_shmget (__NR_SYSCALL_BASE+307) - #define __NR_shmctl (__NR_SYSCALL_BASE+308) - #define __NR_add_key (__NR_SYSCALL_BASE+309) - #define __NR_request_key (__NR_SYSCALL_BASE+310) - #define __NR_keyctl (__NR_SYSCALL_BASE+311) - #define __NR_semtimedop (__NR_SYSCALL_BASE+312) - #define __NR_vserver (__NR_SYSCALL_BASE+313) - #define __NR_ioprio_set (__NR_SYSCALL_BASE+314) - #define __NR_ioprio_get (__NR_SYSCALL_BASE+315) - #define __NR_inotify_init (__NR_SYSCALL_BASE+316) - #define __NR_inotify_add_watch (__NR_SYSCALL_BASE+317) - #define __NR_inotify_rm_watch (__NR_SYSCALL_BASE+318) - #define __NR_mbind (__NR_SYSCALL_BASE+319) - #define __NR_get_mempolicy (__NR_SYSCALL_BASE+320) - #define __NR_set_mempolicy (__NR_SYSCALL_BASE+321) - #define __NR_openat (__NR_SYSCALL_BASE+322) - #define __NR_mkdirat (__NR_SYSCALL_BASE+323) - #define __NR_mknodat (__NR_SYSCALL_BASE+324) - #define __NR_fchownat (__NR_SYSCALL_BASE+325) - #define __NR_futimesat (__NR_SYSCALL_BASE+326) - #define __NR_fstatat64 (__NR_SYSCALL_BASE+327) - #define __NR_unlinkat (__NR_SYSCALL_BASE+328) - #define __NR_renameat (__NR_SYSCALL_BASE+329) - #define __NR_linkat (__NR_SYSCALL_BASE+330) - #define __NR_symlinkat (__NR_SYSCALL_BASE+331) - #define __NR_readlinkat (__NR_SYSCALL_BASE+332) - #define __NR_fchmodat (__NR_SYSCALL_BASE+333) - #define __NR_faccessat (__NR_SYSCALL_BASE+334) - #define __NR_pselect6 (__NR_SYSCALL_BASE+335) - #define __NR_ppoll (__NR_SYSCALL_BASE+336) - #define __NR_unshare (__NR_SYSCALL_BASE+337) - #define __NR_set_robust_list (__NR_SYSCALL_BASE+338) - #define __NR_get_robust_list (__NR_SYSCALL_BASE+339) - #define __NR_splice (__NR_SYSCALL_BASE+340) - #define __NR_arm_sync_file_range (__NR_SYSCALL_BASE+341) - #define __NR_sync_file_range2 __NR_arm_sync_file_range - #define __NR_tee (__NR_SYSCALL_BASE+342) - #define __NR_vmsplice (__NR_SYSCALL_BASE+343) - #define __NR_move_pages (__NR_SYSCALL_BASE+344) - #define __NR_getcpu (__NR_SYSCALL_BASE+345) - #define __NR_epoll_pwait (__NR_SYSCALL_BASE+346) - #define __NR_kexec_load (__NR_SYSCALL_BASE+347) - #define __NR_utimensat (__NR_SYSCALL_BASE+348) - #define __NR_signalfd (__NR_SYSCALL_BASE+349) - #define __NR_timerfd_create (__NR_SYSCALL_BASE+350) - #define __NR_eventfd (__NR_SYSCALL_BASE+351) - #define __NR_fallocate (__NR_SYSCALL_BASE+352) - #define __NR_timerfd_settime (__NR_SYSCALL_BASE+353) - #define __NR_timerfd_gettime (__NR_SYSCALL_BASE+354) - #define __NR_signalfd4 (__NR_SYSCALL_BASE+355) - #define __NR_eventfd2 (__NR_SYSCALL_BASE+356) - #define __NR_epoll_create1 (__NR_SYSCALL_BASE+357) - #define __NR_dup3 (__NR_SYSCALL_BASE+358) - #define __NR_pipe2 (__NR_SYSCALL_BASE+359) - #define __NR_inotify_init1 (__NR_SYSCALL_BASE+360) - #define __NR_preadv (__NR_SYSCALL_BASE+361) - #define __NR_pwritev (__NR_SYSCALL_BASE+362) - #define __NR_rt_tgsigqueueinfo (__NR_SYSCALL_BASE+363) - #define __NR_perf_event_open (__NR_SYSCALL_BASE+364) - #define __NR_recvmmsg (__NR_SYSCALL_BASE+365) - #define __NR_accept4 (__NR_SYSCALL_BASE+366) - #define __NR_fanotify_init (__NR_SYSCALL_BASE+367) - #define __NR_fanotify_mark (__NR_SYSCALL_BASE+368) - #define __NR_prlimit64 (__NR_SYSCALL_BASE+369) - #define __NR_name_to_handle_at (__NR_SYSCALL_BASE+370) - #define __NR_open_by_handle_at (__NR_SYSCALL_BASE+371) - #define __NR_clock_adjtime (__NR_SYSCALL_BASE+372) - #define __NR_syncfs (__NR_SYSCALL_BASE+373) - #define __NR_sendmmsg (__NR_SYSCALL_BASE+374) - #define __NR_setns (__NR_SYSCALL_BASE+375) - #define __NR_process_vm_readv (__NR_SYSCALL_BASE+376) - #define __NR_process_vm_writev (__NR_SYSCALL_BASE+377) - /* 378 for kcmp */ - - /* - * This may need to be greater than __NR_last_syscall+1 in order to - * account for the padding in the syscall table - */ - #ifdef __KERNEL__ #define __NR_syscalls (380) - #endif /* __KERNEL__ */ - - /* - * The following SWIs are ARM private. - */ - #define __ARM_NR_BASE (__NR_SYSCALL_BASE+0x0f0000) - #define __ARM_NR_breakpoint (__ARM_NR_BASE+1) - #define __ARM_NR_cacheflush (__ARM_NR_BASE+2) - #define __ARM_NR_usr26 (__ARM_NR_BASE+3) - #define __ARM_NR_usr32 (__ARM_NR_BASE+4) - #define __ARM_NR_set_tls (__ARM_NR_BASE+5) - - /* - * *NOTE*: This is a ghost syscall private to the kernel. Only the - * __kuser_cmpxchg code in entry-armv.S should be aware of its - * existence. Don't ever use this from user code. - */ - #ifdef __KERNEL__ #define __ARM_NR_cmpxchg (__ARM_NR_BASE+0x00fff0) - #endif - - /* - * The following syscalls are obsolete and no longer available for EABI. - */ - #if !defined(__KERNEL__) - #if defined(__ARM_EABI__) - #undef __NR_time - #undef __NR_umount - #undef __NR_stime - #undef __NR_alarm - #undef __NR_utime - #undef __NR_getrlimit - #undef __NR_select - #undef __NR_readdir - #undef __NR_mmap - #undef __NR_socketcall - #undef __NR_syscall - #undef __NR_ipc - #endif - #endif - - #ifdef __KERNEL__ #define __ARCH_WANT_STAT64 #define __ARCH_WANT_SYS_GETHOSTNAME @@@ -479,6 -42,7 +42,6 @@@ #define __ARCH_WANT_SYS_SOCKETCALL #endif #define __ARCH_WANT_SYS_EXECVE -#define __ARCH_WANT_KERNEL_EXECVE /* * "Conditional" syscalls @@@ -495,5 -59,4 +58,4 @@@ #define __IGNORE_migrate_pages #define __IGNORE_kcmp - #endif /* __KERNEL__ */ #endif /* __ASM_ARM_UNISTD_H */