Commit 18f90d37 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools arch uapi: Copy missing unistd.h headers for arc, hexagon and riscv 



Since those were introduced in:

  c8ce48f0 ("asm-generic: Make time32 syscall numbers optional")

But when the asm-generic/unistd.h was sync'ed with tools/ in:

  1a787fc5 ("tools headers uapi: Sync copy of asm-generic/unistd.h with the kernel sources")

I forgot to copy the files for the architectures that define
__ARCH_WANT_TIME32_SYSCALLS, so the perf build was breaking there, as
reported by Vineet Gupta for the ARC architecture.

After updating my ARC container to use the glibc based toolchain + cross
building libnuma, zlib and elfutils, I finally managed to reproduce the
problem and verify that this now is fixed and will not regress as will
be tested before each pull req sent upstream.

Reported-by: default avatarVineet Gupta <Vineet.Gupta1@synopsys.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jiri Olsa <jolsa@kernel.org>
CC: linux-snps-arc@lists.infradead.org
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/r/20190426193531.GC28586@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c638417e

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

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



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



/*

 * 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_RENAMEAT

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SET_GET_RLIMIT

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_TIME32_SYSCALLS



#define sys_mmap2 sys_mmap_pgoff



#include <asm-generic/unistd.h>



#define NR_syscalls	__NR_syscalls



/* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */

#define __NR_sysfs		(__NR_arch_specific_syscall + 3)



/* ARC specific syscall */

#define __NR_cacheflush		(__NR_arch_specific_syscall + 0)

#define __NR_arc_settls		(__NR_arch_specific_syscall + 1)

#define __NR_arc_gettls		(__NR_arch_specific_syscall + 2)

#define __NR_arc_usr_cmpxchg	(__NR_arch_specific_syscall + 4)



__SYSCALL(__NR_cacheflush, sys_cacheflush)

__SYSCALL(__NR_arc_settls, sys_arc_settls)

__SYSCALL(__NR_arc_gettls, sys_arc_gettls)

__SYSCALL(__NR_arc_usr_cmpxchg, sys_arc_usr_cmpxchg)

__SYSCALL(__NR_sysfs, sys_sysfs)



#undef __SYSCALL



#endif

tools/arch/hexagon/include/uapi/asm/unistd.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Syscall support for Hexagon

 *

 * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA.

 */



/*

 *  The kernel pulls this unistd.h in three different ways:

 *  1.  the "normal" way which gets all the __NR defines

 *  2.  with __SYSCALL defined to produce function declarations

 *  3.  with __SYSCALL defined to produce syscall table initialization

 *  See also:  syscalltab.c

 */



#define sys_mmap2 sys_mmap_pgoff

#define __ARCH_WANT_RENAMEAT

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SET_GET_RLIMIT

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_TIME32_SYSCALLS



#include <asm-generic/unistd.h>

tools/arch/riscv/include/uapi/asm/unistd.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Copyright (C) 2018 David Abdurachmanov <david.abdurachmanov@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifdef __LP64__

#define __ARCH_WANT_NEW_STAT

#define __ARCH_WANT_SET_GET_RLIMIT

#endif /* __LP64__ */



#include <asm-generic/unistd.h>



/*

 * Allows the instruction cache to be flushed from userspace.  Despite RISC-V

 * having a direct 'fence.i' instruction available to userspace (which we

 * can't trap!), that's not actually viable when running on Linux because the

 * kernel might schedule a process on another hart.  There is no way for

 * userspace to handle this without invoking the kernel (as it doesn't know the

 * thread->hart mappings), so we've defined a RISC-V specific system call to

 * flush the instruction cache.

 *

 * __NR_riscv_flush_icache is defined to flush the instruction cache over an

 * address range, with the flush applying to either all threads or just the

 * caller.  We don't currently do anything with the address range, that's just

 * in there for forwards compatibility.

 */

#ifndef __NR_riscv_flush_icache

#define __NR_riscv_flush_icache (__NR_arch_specific_syscall + 15)

#endif

__SYSCALL(__NR_riscv_flush_icache, sys_riscv_flush_icache)

CRA Git | Maintained and supported by SUSTech CRA and CCSE