Skip to content

Commit bceb739

Browse files
committed
tools/nolibc: don't use asm/ UAPI headers
The asm/ and asm-generic/ namespaces are implementation details of the UAPI headers and not meant for direct usage. Use the equivalent headers from the linux/ namespace instead. While at it also drop the duplicate include of linux/signal.h from sys.h. Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Link: https://lore.kernel.org/r/20250307-nolibc-asm-headers-v2-1-e2a734f25d22@linutronix.de
1 parent a782d45 commit bceb739

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

tools/include/nolibc/arch-s390.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#ifndef _NOLIBC_ARCH_S390_H
77
#define _NOLIBC_ARCH_S390_H
8-
#include <asm/signal.h>
9-
#include <asm/unistd.h>
8+
#include <linux/signal.h>
9+
#include <linux/unistd.h>
1010

1111
#include "compiler.h"
1212
#include "crt.h"

tools/include/nolibc/errno.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef _NOLIBC_ERRNO_H
88
#define _NOLIBC_ERRNO_H
99

10-
#include <asm/errno.h>
10+
#include <linux/errno.h>
1111

1212
#ifndef NOLIBC_IGNORE_ERRNO
1313
#define SET_ERRNO(v) do { errno = (v); } while (0)

tools/include/nolibc/sys.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#include "std.h"
1111

1212
/* system includes */
13-
#include <asm/unistd.h>
14-
#include <asm/signal.h> /* for SIGCHLD */
15-
#include <asm/ioctls.h>
16-
#include <asm/mman.h>
13+
#include <linux/unistd.h>
14+
#include <linux/signal.h> /* for SIGCHLD */
15+
#include <linux/termios.h>
16+
#include <linux/mman.h>
1717
#include <linux/fs.h>
1818
#include <linux/loop.h>
1919
#include <linux/time.h>
@@ -23,7 +23,6 @@
2323
#include <linux/prctl.h>
2424
#include <linux/resource.h>
2525
#include <linux/utsname.h>
26-
#include <linux/signal.h>
2726

2827
#include "arch.h"
2928
#include "errno.h"

0 commit comments

Comments
 (0)