Merge branches 'clkdev', 'fixes', 'misc' and 'sa1100-base' into for-linus (41884629) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm/include/asm/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ generic-y += early_ioremap.h
		generic-y += emergency-restart.h
		generic-y += errno.h
		generic-y += exec.h
		generic-y += export.h
		generic-y += ioctl.h
		generic-y += ipcbuf.h
		generic-y += irq_regs.h

+27 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,33 @@
		#include <asm/memory.h>
		#include <asm/param.h> /* HZ */

		/*
		* Loop (or tick) based delay:
		*
		* loops = loops_per_jiffy * jiffies_per_sec * delay_us / us_per_sec
		*
		* where:
		*
		* jiffies_per_sec = HZ
		* us_per_sec = 1000000
		*
		* Therefore the constant part is HZ / 1000000 which is a small
		* fractional number. To make this usable with integer math, we
		* scale up this constant by 2^31, perform the actual multiplication,
		* and scale the result back down by 2^31 with a simple shift:
		*
		* loops = (loops_per_jiffy * delay_us * UDELAY_MULT) >> 31
		*
		* where:
		*
		* UDELAY_MULT = 2^31 * HZ / 1000000
		* = (2^31 / 1000000) * HZ
		* = 2147.483648 * HZ
		* = 2147 * HZ + 483648 * HZ / 1000000
		*
		* 31 is the biggest scale shift value that won't overflow 32 bits for
		* delay_us * UDELAY_MULT assuming HZ <= 1000 and delay_us <= 2000.
		*/
		#define MAX_UDELAY_MS 2
		#define UDELAY_MULT UL(2147 * HZ + 483648 * HZ / 1000000)
		#define UDELAY_SHIFT 31

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		* This may need to be greater than __NR_last_syscall+1 in order to
		* account for the padding in the syscall table
		*/
		#define __NR_syscalls (396)
		#define __NR_syscalls (400)

		#define __ARCH_WANT_STAT64
		#define __ARCH_WANT_SYS_GETHOSTNAME

+3 −0

Original line number	Diff line number	Diff line
		@@ -420,6 +420,9 @@
		#define __NR_copy_file_range (__NR_SYSCALL_BASE+391)
		#define __NR_preadv2 (__NR_SYSCALL_BASE+392)
		#define __NR_pwritev2 (__NR_SYSCALL_BASE+393)
		#define __NR_pkey_mprotect (__NR_SYSCALL_BASE+394)
		#define __NR_pkey_alloc (__NR_SYSCALL_BASE+395)
		#define __NR_pkey_free (__NR_SYSCALL_BASE+396)

		/*
		* The following SWIs are ARM private.

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ endif
		obj-$(CONFIG_CPU_IDLE) += cpuidle.o
		obj-$(CONFIG_ISA_DMA_API) += dma.o
		obj-$(CONFIG_FIQ) += fiq.o fiqasm.o
		obj-$(CONFIG_MODULES) += module.o
		obj-$(CONFIG_MODULES) += armksyms.o module.o
		obj-$(CONFIG_ARM_MODULE_PLTS) += module-plts.o
		obj-$(CONFIG_ISA_DMA) += dma-isa.o
		obj-$(CONFIG_PCI) += bios32.o isa.o