Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4773ef22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-fixes-for-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fix from Vineet Gupta:
 "Fix busted syscall table due to unistd header inclusion issue"

* tag 'arc-fixes-for-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: Allow conditional multiple inclusion of uapi/asm/unistd.h
parents a81ce79b 1e01c7eb

arch/arc/include/uapi/asm/unistd.h

+7 −1
Original line number Diff line number Diff line
@@ -8,7 +8,11 @@ 


/******** no-legacy-syscalls-ABI *******/



#ifndef _UAPI_ASM_ARC_UNISTD_H

/*

 * Non-typical guard macro to enable inclusion twice in ARCH sys.c

 * That is how the Generic syscall wrapper generator works

 */

#if !defined(_UAPI_ASM_ARC_UNISTD_H) || defined(__SYSCALL)

#define _UAPI_ASM_ARC_UNISTD_H



#define __ARCH_WANT_SYS_EXECVE
@@ -36,4 +40,6 @@ __SYSCALL(__NR_arc_gettls, sys_arc_gettls) 
#define __NR_sysfs		(__NR_arch_specific_syscall + 3)

__SYSCALL(__NR_sysfs, sys_sysfs)



#undef __SYSCALL



#endif