Commit 3edd5365 authored by Thomas Weißschuh's avatar Thomas Weißschuh
Browse files

tools/nolibc: move prctl() to sys/prctl.h 



This is the location regular userspace expects this definition.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250515-nolibc-sys-v1-3-74f82eea3b59@weissschuh.net
parent 6e7c805a

tools/include/nolibc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ all_files := \ 
		sys/ioctl.h \

		sys/mman.h \

		sys/mount.h \

		sys/prctl.h \

		sys/random.h \

		sys/stat.h \

		sys/syscall.h \

tools/include/nolibc/nolibc.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
#include "sys/ioctl.h"

#include "sys/mman.h"

#include "sys/mount.h"

#include "sys/prctl.h"

#include "sys/random.h"

#include "sys/stat.h"

#include "sys/syscall.h"

tools/include/nolibc/sys.h

+0 −21
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/auxvec.h>

#include <linux/fcntl.h> /* for O_* and AT_* */

#include <linux/stat.h>  /* for statx() */

#include <linux/prctl.h>

#include <linux/resource.h>

#include <linux/utsname.h>
@@ -697,26 +696,6 @@ int pipe(int pipefd[2]) 
}





/*

 * int prctl(int option, unsigned long arg2, unsigned long arg3,

 *                       unsigned long arg4, unsigned long arg5);

 */



static __attribute__((unused))

int sys_prctl(int option, unsigned long arg2, unsigned long arg3,

		          unsigned long arg4, unsigned long arg5)

{

	return my_syscall5(__NR_prctl, option, arg2, arg3, arg4, arg5);

}



static __attribute__((unused))

int prctl(int option, unsigned long arg2, unsigned long arg3,

		      unsigned long arg4, unsigned long arg5)

{

	return __sysret(sys_prctl(option, arg2, arg3, arg4, arg5));

}





/*

 * int pivot_root(const char *new, const char *old);

 */

tools/include/nolibc/sys/prctl.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */

/*

 * Prctl definitions for NOLIBC

 * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>

 */



/* make sure to include all global symbols */

#include "../nolibc.h"



#ifndef _NOLIBC_SYS_PRCTL_H

#define _NOLIBC_SYS_PRCTL_H



#include "../sys.h"



#include <linux/prctl.h>



/*

 * int prctl(int option, unsigned long arg2, unsigned long arg3,

 *                       unsigned long arg4, unsigned long arg5);

 */



static __attribute__((unused))

int sys_prctl(int option, unsigned long arg2, unsigned long arg3,

			  unsigned long arg4, unsigned long arg5)

{

	return my_syscall5(__NR_prctl, option, arg2, arg3, arg4, arg5);

}



static __attribute__((unused))

int prctl(int option, unsigned long arg2, unsigned long arg3,

		      unsigned long arg4, unsigned long arg5)

{

	return __sysret(sys_prctl(option, arg2, arg3, arg4, arg5));

}



#endif /* _NOLIBC_SYS_PRCTL_H */