Commit 66d46672 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:

 - an update for clkdev registration error detection to simplify users

 - add cpu capacity parsing from DT

 - support for larger cachelines found on UniPhier caches

 - documentation for udelay constants

 - properly tag assembly function declarations

 - remove unnecessary indirection of asm/mach-types.h

 - switch to syscall table based generation to simplify future additions
   of system calls, along with correpsonding commit for pkey syscalls

 - remove redundant sa1101 header file

 - RONX protect modules when they're in the vmalloc region

* 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: mm: allow set_memory_*() to be used on the vmalloc region
  ARM: mm: fix set_memory_*() bounds checks
  ARM: 8631/1: clkdev: Detect errors in clk_hw_register_clkdev() for mass registration
  ARM: 8629/1: vfp: properly tag assembly function declarations in C code
  ARM: 8622/3: add sysfs cpu_capacity attribute
  ARM: 8621/3: parse cpu capacity-dmips-mhz from DT
  ARM: 8623/1: mm: add ARM_L1_CACHE_SHIFT_7 for UniPhier outer cache
  ARM: Update mach-types
  ARM: sa1100: remove SA-1101 header file
  ARM: 8619/1: udelay: document the various constants
  ARM: wire up new pkey syscalls
  ARM: convert to generated system call tables
  ARM: remove indirection of asm/mach-types.h
parents 991688bf ed141f28

arch/arm/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -312,8 +312,11 @@ all: $(KBUILD_IMAGE) $(KBUILD_DTBS) 


boot := arch/arm/boot



archheaders:

	$(Q)$(MAKE) $(build)=arch/arm/tools uapi



archprepare:

	$(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h

	$(Q)$(MAKE) $(build)=arch/arm/tools kapi



# Convert bzImage to zImage

bzImage: zImage

arch/arm/include/asm/Kbuild

+3 −0
Original line number Diff line number Diff line
@@ -38,3 +38,6 @@ generic-y += termios.h 
generic-y += timex.h

generic-y += trace_clock.h

generic-y += unaligned.h



generated-y += mach-types.h

generated-y += unistd-nr.h

arch/arm/include/asm/delay.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

arch/arm/include/asm/mach-types.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <generated/mach-types.h>

arch/arm/include/asm/unistd.h

+20 −6
Original line number Diff line number Diff line
@@ -14,12 +14,7 @@ 
#define __ASM_ARM_UNISTD_H



#include <uapi/asm/unistd.h>



/*

 * 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  (400)

#include <asm/unistd-nr.h>



#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SYS_GETHOSTNAME
@@ -52,4 +47,23 @@ 
#define __IGNORE_fadvise64_64

#define __IGNORE_migrate_pages



#ifdef __ARM_EABI__

/*

 * The following syscalls are obsolete and no longer available for EABI:

 *  __NR_time

 *  __NR_umount

 *  __NR_stime

 *  __NR_alarm

 *  __NR_utime

 *  __NR_getrlimit

 *  __NR_select

 *  __NR_readdir

 *  __NR_mmap

 *  __NR_socketcall

 *  __NR_syscall

 *  __NR_ipc

 */

#define __IGNORE_getrlimit

#endif



#endif /* __ASM_ARM_UNISTD_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE