Commit ed141f28 authored by Russell King's avatar Russell King
Browse files

Merge branch 'syscalls' into for-linus 

Conflicts:
	arch/arm/include/asm/unistd.h
	arch/arm/include/uapi/asm/unistd.h
	arch/arm/kernel/calls.S
parents 41884629 219622b7

arch/arm/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -311,8 +311,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/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 */

arch/arm/include/uapi/asm/Kbuild

+3 −0
Original line number Diff line number Diff line
@@ -18,3 +18,6 @@ header-y += stat.h 
header-y += statfs.h

header-y += swab.h

header-y += unistd.h

genhdr-y += unistd-common.h

genhdr-y += unistd-oabi.h

genhdr-y += unistd-eabi.h