asm-generic ABI files for microblaze
Subsystems (14)
[email protected]
maintainercover asm-generic ABI files for microblaze
This is my attempt to do a generic system call ABI for all new architectures, including a port for microblaze, which has recently been merged into 2.6.30. The next architecture that is about to get merged will be score, so it would be good if they can move to the same ABI.
Please review the files and (in case of microblaze and score maintainers) test them on your architecture.
The one part I'm not yet completely happy with is signal handling, I had to massage the microblaze code quite a bit to get the old-style siginfo out of it, which may not yet work.
Sam also mentioned that it might be good to consistently use the __u32 and similar types everywhere in asm-generic exported headers, which I might be doing as a next step (including the existing files).
Special thanks to Remis Baima, who has done some significant work cleaning up my patches.
Sorry for spamming everyone with the broken mail headers. I hope this resend does fly better.
Arnd <><
--
To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 1/17 asm-generic: rename termios.h to termios-base.h
The existing asm-generic/termios.h file only contains a part of the required termios.h contents. This renames it to termios-base.h and changes all users, so we can add a full termios.h file for new archtitectures.
---
arch/avr32/include/asm/termios.h | 2 1 + 1 - 0 ! arch/frv/include/asm/termios.h | 2 1 + 1 - 0 ! arch/microblaze/include/asm/termios.h | 2 1 + 1 - 0 ! arch/powerpc/include/asm/termios.h | 2 1 + 1 - 0 ! arch/s390/include/asm/termios.h | 2 1 + 1 - 0 ! include/asm-generic/termios-base.h | 77 77 + 0 - 0 ! include/asm-generic/termios.h | 77 0 + 77 - 0 ! 7 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 include/asm-generic/termios-base.h
arch/avr32/include/asm/termios.h +1 -1
@@ -55,7 +55,7 @@ struct termio {*/ #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0" -#include <asm-generic/termios.h> +#include <asm-generic/termios-base.h> #endif /* __KERNEL__ */
arch/frv/include/asm/termios.h +1 -1
@@ -52,7 +52,7 @@ struct termio {/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ #ifdef __KERNEL__ -#include <asm-generic/termios.h> +#include <asm-generic/termios-base.h> #endif #endif /* _ASM_TERMIOS_H */
arch/powerpc/include/asm/termios.h +1 -1
@@ -78,7 +78,7 @@ struct termio {#ifdef __KERNEL__ -#include <asm-generic/termios.h> +#include <asm-generic/termios-base.h> #endif /* __KERNEL__ */
arch/s390/include/asm/termios.h +1 -1
@@ -60,7 +60,7 @@ struct termio {#define user_termios_to_kernel_termios (k, u) copy_from_user(k, u, sizeof(struct termios2))#define kernel_termios_to_user_termios (u, k) copy_to_user(u, k, sizeof(struct termios2)) -#include <asm-generic/termios.h> +#include <asm-generic/termios-base.h> #endif /* __KERNEL__ */
include/asm-generic/termios-base.h new file +77 -0
77 lines not on this page · raw message
include/asm-generic/termios.h deleted +0 -77
77 lines not on this page · raw message
arch/microblaze/include/asm/termios.h +1 -1
@@ -81,7 +81,7 @@ struct termio {#ifdef __KERNEL__ -#include <asm-generic/termios.h> +#include <asm-generic/termios-base.h> #endif /* __KERNEL__ */
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 2/17 asm-generic: rename signal.h to signal-defs.h
In reply to [email protected]The existing asm-generic/signal.h is incomplete and included by some architectures. New architectures should be able to use a generic version, so rename the existing file and change all users, which lets us add the new file.
---
arch/alpha/include/asm/signal.h | 2 1 + 1 - 0 ! arch/arm/include/asm/signal.h | 2 1 + 1 - 0 ! arch/avr32/include/asm/signal.h | 2 1 + 1 - 0 ! arch/blackfin/include/asm/signal.h | 2 1 + 1 - 0 ! arch/cris/include/asm/signal.h | 2 1 + 1 - 0 ! arch/h8300/include/asm/signal.h | 2 1 + 1 - 0 ! arch/ia64/include/asm/signal.h | 2 1 + 1 - 0 ! arch/m32r/include/asm/signal.h | 2 1 + 1 - 0 ! arch/m68k/include/asm/signal.h | 2 1 + 1 - 0 ! arch/microblaze/include/asm/signal.h | 2 1 + 1 - 0 ! arch/mips/include/asm/signal.h | 2 1 + 1 - 0 ! arch/mn10300/include/asm/signal.h | 2 1 + 1 - 0 ! arch/powerpc/include/asm/signal.h | 2 1 + 1 - 0 ! arch/s390/include/asm/signal.h | 2 1 + 1 - 0 ! arch/sh/include/asm/signal.h | 2 1 + 1 - 0 ! arch/sparc/include/asm/signal.h | 2 1 + 1 - 0 ! arch/x86/include/asm/signal.h | 2 1 + 1 - 0 ! include/asm-generic/Kbuild | 2 1 + 1 - 0 ! include/asm-generic/signal-defs.h | 28 28 + 0 - 0 ! include/asm-generic/signal.h | 28 0 + 28 - 0 ! 20 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 include/asm-generic/signal-defs.h
arch/alpha/include/asm/signal.h +1 -1
@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;#define SIG_UNBLOCK 2/* for unblocking signals */ #define SIG_SETMASK 3/* for setting the signal mask */ -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct osf_sigaction {
arch/arm/include/asm/signal.h +1 -1
@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/avr32/include/asm/signal.h +1 -1
@@ -112,7 +112,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/blackfin/include/asm/signal.h +1 -1
@@ -104,7 +104,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/cris/include/asm/signal.h +1 -1
@@ -106,7 +106,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/h8300/include/asm/signal.h +1 -1
@@ -105,7 +105,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/ia64/include/asm/signal.h +1 -1
@@ -114,7 +114,7 @@#endif /* __KERNEL__ */ -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> # ifndef __ASSEMBLY__
arch/m68k/include/asm/signal.h +1 -1
@@ -103,7 +103,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/mips/include/asm/signal.h +1 -1
@@ -109,7 +109,7 @@ typedef unsigned long old_sigset_t; /*#define SIG_UNBLOCK 2/* for unblocking signals */ #define SIG_SETMASK 3/* for setting the signal mask */ -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> struct sigaction {unsigned int sa_flags;
arch/mn10300/include/asm/signal.h +1 -1
@@ -115,7 +115,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/powerpc/include/asm/signal.h +1 -1
@@ -94,7 +94,7 @@ typedef struct {#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> struct old_sigaction {__sighandler_t sa_handler;
arch/s390/include/asm/signal.h +1 -1
@@ -115,7 +115,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/sh/include/asm/signal.h +1 -1
@@ -106,7 +106,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/sparc/include/asm/signal.h +1 -1
@@ -176,7 +176,7 @@ struct sigstack {#define SA_STATIC_ALLOC 0x8000#endif -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> struct __new_sigaction {__sighandler_t sa_handler;
arch/x86/include/asm/signal.h +1 -1
@@ -117,7 +117,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifndef __ASSEMBLY__
include/asm-generic/signal-defs.h new file +28 -0
@@ -0,0 +1,28 @@ +#ifndef __ASM_GENERIC_SIGNAL_DEFS_H +#define __ASM_GENERIC_SIGNAL_DEFS_H + +#include <linux/compiler.h> + +#ifndef SIG_BLOCK +#define SIG_BLOCK 0/* for blocking signals */ +#endif +#ifndef SIG_UNBLOCK +#define SIG_UNBLOCK 1/* for unblocking signals */ +#endif +#ifndef SIG_SETMASK +#define SIG_SETMASK 2/* for setting the signal mask */ +#endif + +#ifndef __ASSEMBLY__ +typedef void __signalfn_t (int ); +typedef __signalfn_t __user *__sighandler_t ; + +typedef void __restorefn_t (void ); +typedef __restorefn_t __user *__sigrestore_t ; + +#define SIG_DFL ((__force __sighandler_t)0)/* default signal handling */ +#define SIG_IGN ((__force __sighandler_t)1)/* ignore signal */ +#define SIG_ERR ((__force __sighandler_t)-1)/* error return from signal */ +#endif + +#endif /* __ASM_GENERIC_SIGNAL_DEFS_H */
include/asm-generic/signal.h deleted +0 -28
@@ -1,28 +0,0 @@ -#ifndef __ASM_GENERIC_SIGNAL_H -#define __ASM_GENERIC_SIGNAL_H - -#include <linux/compiler.h> - -#ifndef SIG_BLOCK -#define SIG_BLOCK 0/* for blocking signals */ -#endif -#ifndef SIG_UNBLOCK -#define SIG_UNBLOCK 1/* for unblocking signals */ -#endif -#ifndef SIG_SETMASK -#define SIG_SETMASK 2/* for setting the signal mask */ -#endif - -#ifndef __ASSEMBLY__ -typedef void __signalfn_t (int ); -typedef __signalfn_t __user *__sighandler_t ; - -typedef void __restorefn_t (void ); -typedef __restorefn_t __user *__sigrestore_t ; - -#define SIG_DFL ((__force __sighandler_t)0)/* default signal handling */ -#define SIG_IGN ((__force __sighandler_t)1)/* ignore signal */ -#define SIG_ERR ((__force __sighandler_t)-1)/* error return from signal */ -#endif - -#endif /* __ASM_GENERIC_SIGNAL_H */
arch/m32r/include/asm/signal.h +1 -1
@@ -107,7 +107,7 @@ typedef unsigned long sigset_t;#define MINSIGSTKSZ 2048#define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction {
arch/microblaze/include/asm/signal.h +1 -1
@@ -90,7 +90,7 @@# ifndef __ASSEMBLY__# include <linux/types.h> -# include <asm-generic/signal.h> +# include <asm-generic/signal-defs.h> /* Avoid too many header ordering problems. */ struct siginfo ;
include/asm-generic/Kbuild +1 -1
@@ -4,7 +4,7 @@ header-y += fcntl.h header-y += ioctl.h header-y += mman.h header-y += poll.h -header-y += signal.h +header-y += signal-defs.h header-y += statfs.h unifdef-y += int-l64.h
[email protected]
maintainerRFC 3/17 asm-generic: rename mman.h to mman-common.h
In reply to [email protected]The existing asm-generic/mman.h is incomplete and included by some architectures. New architectures should be able to use a generic version, so rename the existing file and change all users, which lets us add the new file.
---
arch/arm/include/asm/mman.h | 2 1 + 1 - 0 ! arch/avr32/include/asm/mman.h | 2 1 + 1 - 0 ! arch/cris/include/asm/mman.h | 2 1 + 1 - 0 ! arch/frv/include/asm/mman.h | 2 1 + 1 - 0 ! arch/h8300/include/asm/mman.h | 2 1 + 1 - 0 ! arch/ia64/include/asm/mman.h | 2 1 + 1 - 0 ! arch/m32r/include/asm/mman.h | 2 1 + 1 - 0 ! arch/m68k/include/asm/mman.h | 2 1 + 1 - 0 ! arch/mn10300/include/asm/mman.h | 2 1 + 1 - 0 ! arch/powerpc/include/asm/mman.h | 2 1 + 1 - 0 ! arch/s390/include/asm/mman.h | 2 1 + 1 - 0 ! arch/sh/include/asm/mman.h | 2 1 + 1 - 0 ! arch/sparc/include/asm/mman.h | 2 1 + 1 - 0 ! arch/x86/include/asm/mman.h | 2 1 + 1 - 0 ! include/asm-generic/Kbuild | 2 1 + 1 - 0 ! include/asm-generic/mman-common.h | 41 41 + 0 - 0 ! include/asm-generic/mman.h | 41 0 + 41 - 0 ! 17 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 include/asm-generic/mman-common.h
arch/arm/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef __ARM_MMAN_H__#define __ARM_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
arch/avr32/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef __ASM_AVR32_MMAN_H__#define __ASM_AVR32_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
arch/cris/include/asm/mman.h +1 -1
@@ -3,7 +3,7 @@/* verbatim copy of asm-i386/ version */ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
arch/frv/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef __ASM_MMAN_H__#define __ASM_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
arch/h8300/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef __H8300_MMAN_H__#define __H8300_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
arch/ia64/include/asm/mman.h +1 -1
@@ -8,7 +8,7 @@* David Mosberger-Tang <[email protected]>, Hewlett-Packard Co */ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x00100/* stack-like segment */ #define MAP_GROWSUP 0x00200/* register stack-like segment */
arch/m68k/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef __M68K_MMAN_H__#define __M68K_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
arch/mn10300/include/asm/mman.h +1 -1
@@ -12,7 +12,7 @@#ifndef _ASM_MMAN_H#define _ASM_MMAN_H -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
arch/powerpc/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef _ASM_POWERPC_MMAN_H#define _ASM_POWERPC_MMAN_H -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> /* * This program is free software; you can redistribute it and/or
arch/s390/include/asm/mman.h +1 -1
@@ -9,7 +9,7 @@#ifndef __S390_MMAN_H__#define __S390_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
arch/sh/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef __ASM_SH_MMAN_H#define __ASM_SH_MMAN_H -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
arch/sparc/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef __SPARC_MMAN_H__#define __SPARC_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> /* SunOS'ified... */
arch/x86/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef _ASM_X86_MMAN_H#define _ASM_X86_MMAN_H -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_32BIT 0x40/* only give out 32bit addresses */
include/asm-generic/mman-common.h new file +41 -0
41 lines not on this page · raw message
include/asm-generic/mman.h deleted +0 -41
41 lines not on this page · raw message
arch/m32r/include/asm/mman.h +1 -1
@@ -1,7 +1,7 @@#ifndef __M32R_MMAN_H__#define __M32R_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */
include/asm-generic/Kbuild +1 -1
@@ -2,7 +2,7 @@ header-y += errno-base.h header-y += errno.h header-y += fcntl.h header-y += ioctl.h -header-y += mman.h +header-y += mman-common.h header-y += poll.h header-y += signal-defs.h header-y += statfs.h
[email protected]
maintainerRFC 4/17 asm-generic: introduce asm/bitsperlong.h
In reply to [email protected]This provides a reliable way for asm-generic/types.h and other files to find out if it is running on a 32 or 64 bit platform.
We cannot use CONFIG_64BIT for this in headers that are included from user space because CONFIG symbols are not available there. We also cannot do it inside of asm/types.h because some headers need the word size but cannot include types.h.
The solution is to introduce a new header <asm/bitsperlong.h> that defines both __BITS_PER_LONG for user space and BITS_PER_LONG for usage in the kernel. The asm-generic version falls back to 32 bit unless the architecture overrides it, which I did for all 64 bit platforms.
---
arch/alpha/include/asm/bitsperlong.h | 8 8 + 0 - 0 ! arch/alpha/include/asm/types.h | 3 0 + 3 - 0 ! arch/arm/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/avr32/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/blackfin/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/cris/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/frv/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/h8300/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/ia64/include/asm/bitsperlong.h | 8 8 + 0 - 0 ! arch/ia64/include/asm/types.h | 7 0 + 7 - 0 ! arch/m32r/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/m68k/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/m68knommu/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/microblaze/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/mips/include/asm/bitsperlong.h | 8 8 + 0 - 0 ! arch/mips/include/asm/types.h | 3 0 + 3 - 0 ! arch/mn10300/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/parisc/include/asm/bitsperlong.h | 20 20 + 0 - 0 ! arch/parisc/include/asm/types.h | 8 0 + 8 - 0 ! arch/powerpc/include/asm/bitsperlong.h | 12 12 + 0 - 0 ! arch/powerpc/include/asm/types.h | 9 0 + 9 - 0 ! arch/s390/include/asm/bitsperlong.h | 13 13 + 0 - 0 ! arch/s390/include/asm/types.h | 6 0 + 6 - 0 ! arch/sh/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! arch/sparc/include/asm/bitsperlong.h | 13 13 + 0 - 0 ! arch/sparc/include/asm/types.h | 4 0 + 4 - 0 ! arch/x86/include/asm/bitsperlong.h | 13 13 + 0 - 0 ! arch/x86/include/asm/types.h | 6 0 + 6 - 0 ! arch/xtensa/include/asm/bitsperlong.h | 1 1 + 0 - 0 ! include/asm-generic/bitsperlong.h | 32 32 + 0 - 0 ! include/asm-generic/int-l64.h | 2 2 + 0 - 0 ! include/asm-generic/int-ll64.h | 2 2 + 0 - 0 ! 32 files changed, 144 insertions(+), 46 deletions(-)
arch/alpha/include/asm/types.h +0 -3
@@ -25,9 +25,6 @@ typedef unsigned int umode_t;* These aren't exported outside the kernel to avoid name space clashes */ #ifdef __KERNEL__ - -#define BITS_PER_LONG 64 -#ifndef __ASSEMBLY__typedef u64 dma_addr_t ;
arch/ia64/include/asm/types.h +0 -7
@@ -19,10 +19,6 @@# define __IA64_UL (x) (x)# define __IA64_UL_CONST (x) x -# ifdef __KERNEL__ -# define BITS_PER_LONG 64 -# endif -#else # define __IA64_UL (x) ((unsigned long)(x))# define __IA64_UL_CONST (x) x##UL
@@ -34,10 +30,7 @@ typedef unsigned int umode_t;*/ # ifdef __KERNEL__ -#define BITS_PER_LONG 64 -/* DMA addresses are 64-bits wide, in general. */ -typedef u64 dma_addr_t ;# endif /* __KERNEL__ */
arch/mips/include/asm/types.h +0 -3
@@ -31,9 +31,6 @@ typedef unsigned short umode_t;* These aren't exported outside the kernel to avoid name space clashes */ #ifdef __KERNEL__ - -#define BITS_PER_LONG _MIPS_SZLONG -#ifndef __ASSEMBLY__#if (defined(CONFIG_HIGHMEM ) && defined(CONFIG_64BIT_PHYS_ADDR )) \
arch/parisc/include/asm/types.h +0 -8
@@ -14,14 +14,6 @@ typedef unsigned short umode_t;*/ #ifdef __KERNEL__ -#ifdef CONFIG_64BIT -#define BITS_PER_LONG 64 -#define SHIFT_PER_LONG 6 -#else -#define BITS_PER_LONG 32 -#define SHIFT_PER_LONG 5 -#endif -#ifndef __ASSEMBLY__/* Dma addresses are 32-bits wide. */
arch/powerpc/include/asm/types.h +0 -9
@@ -40,15 +40,6 @@ typedef struct {#endif /* __ASSEMBLY__ */ #ifdef __KERNEL__ -/* -* These aren't exported outside the kernel to avoid name space clashes -*/ -#ifdef __powerpc64__ -#define BITS_PER_LONG 64 -#else -#define BITS_PER_LONG 32 -#endif -#ifndef __ASSEMBLY__typedef __vector128 vector128 ;
arch/s390/include/asm/types.h +0 -6
@@ -28,12 +28,6 @@ typedef __signed__ long saddr_t;*/ #ifdef __KERNEL__ -#ifndef __s390x__ -#define BITS_PER_LONG 32 -#else -#define BITS_PER_LONG 64 -#endif -#ifndef __ASSEMBLY__typedef u64 dma64_addr_t ;
arch/sparc/include/asm/types.h +0 -4
@@ -21,8 +21,6 @@ typedef unsigned short umode_t;#ifdef __KERNEL__ -#define BITS_PER_LONG 64 -#ifndef __ASSEMBLY__/* Dma addresses come in generic and 64-bit flavours. */
@@ -46,8 +44,6 @@ typedef unsigned short umode_t;#ifdef __KERNEL__ -#define BITS_PER_LONG 32 -#ifndef __ASSEMBLY__typedef u32 dma_addr_t ;
arch/x86/include/asm/types.h +0 -6
@@ -14,12 +14,6 @@ typedef unsigned short umode_t;*/ #ifdef __KERNEL__ -#ifdef CONFIG_X86_32 -# define BITS_PER_LONG 32 -#else -# define BITS_PER_LONG 64 -#endif -#ifndef __ASSEMBLY__typedef u64 dma64_addr_t ;
arch/alpha/include/asm/bitsperlong.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef __ASM_ALPHA_BITSPERLONG_H +#define __ASM_ALPHA_BITSPERLONG_H + +#define __BITS_PER_LONG 64 + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_ALPHA_BITSPERLONG_H */
arch/ia64/include/asm/bitsperlong.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef __ASM_IA64_BITSPERLONG_H +#define __ASM_IA64_BITSPERLONG_H + +#define __BITS_PER_LONG 64 + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_IA64_BITSPERLONG_H */
arch/mips/include/asm/bitsperlong.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef __ASM_MIPS_BITSPERLONG_H +#define __ASM_MIPS_BITSPERLONG_H + +#define __BITS_PER_LONG _MIPS_SZLONG + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_MIPS_BITSPERLONG_H */
arch/parisc/include/asm/bitsperlong.h new file +20 -0
@@ -0,0 +1,20 @@ +#ifndef __ASM_PARISC_BITSPERLONG_H +#define __ASM_PARISC_BITSPERLONG_H + +/* +* using CONFIG_* outside of __KERNEL__ is wrong, +* __LP64__ was also removed from headers, so what +* is the right approach on parisc? +* -arnd +*/ +#if (defined(__KERNEL__) && defined(CONFIG_64BIT )) || defined (__LP64__) +#define __BITS_PER_LONG 64 +#define SHIFT_PER_LONG 6 +#else +#define __BITS_PER_LONG 32 +#define SHIFT_PER_LONG 5 +#endif + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_PARISC_BITSPERLONG_H */
arch/powerpc/include/asm/bitsperlong.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef __ASM_POWERPC_BITSPERLONG_H +#define __ASM_POWERPC_BITSPERLONG_H + +#if defined(__powerpc64__) +# define __BITS_PER_LONG 64 +#else +# define __BITS_PER_LONG 32 +#endif + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_POWERPC_BITSPERLONG_H */
arch/s390/include/asm/bitsperlong.h new file +13 -0
@@ -0,0 +1,13 @@ +#ifndef __ASM_S390_BITSPERLONG_H +#define __ASM_S390_BITSPERLONG_H + +#ifndef __s390x__ +#define __BITS_PER_LONG 32 +#else +#define __BITS_PER_LONG 64 +#endif + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_S390_BITSPERLONG_H */ +
arch/sparc/include/asm/bitsperlong.h new file +13 -0
@@ -0,0 +1,13 @@ +#ifndef __ASM_ALPHA_BITSPERLONG_H +#define __ASM_ALPHA_BITSPERLONG_H + +#if defined(__sparc__) && defined(__arch64__) +#define __BITS_PER_LONG 64 +#else +#define __BITS_PER_LONG 32 +#endif + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_ALPHA_BITSPERLONG_H */ +
arch/x86/include/asm/bitsperlong.h new file +13 -0
@@ -0,0 +1,13 @@ +#ifndef __ASM_X86_BITSPERLONG_H +#define __ASM_X86_BITSPERLONG_H + +#ifdef __x86_64__ +# define __BITS_PER_LONG 64 +#else +# define __BITS_PER_LONG 32 +#endif + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_X86_BITSPERLONG_H */ +
include/asm-generic/bitsperlong.h new file +32 -0
@@ -0,0 +1,32 @@ +#ifndef __ASM_GENERIC_BITS_PER_LONG +#define __ASM_GENERIC_BITS_PER_LONG + +/* +* There seems to be no way of detecting this automatically from user +* space, so 64 bit architectures should override this in their +* bitsperlong.h. In particular, an architecture that supports +* both 32 and 64 bit user space must not rely on CONFIG_64BIT +* to decide it, but rather check a compiler provided macro. +*/ +#ifndef __BITS_PER_LONG +#define __BITS_PER_LONG 32 +#endif + +#ifdef __KERNEL__ + +#ifdef CONFIG_64BIT +#define BITS_PER_LONG 64 +#else +#define BITS_PER_LONG 32 +#endif /* CONFIG_64BIT */ + +/* +* FIXME: The check currently breaks x86-64 build, so it's +* temporarily disabled. Please fix x86-64 and reenable +*/ +#if 0 &&BITS_PER_LONG != __BITS_PER_LONG +#error Inconsistent word size. Check asm/bitsperlong.h +#endif + +#endif /* __KERNEL__ */ +#endif /* __ASM_GENERIC_BITS_PER_LONG */
include/asm-generic/int-l64.h +2 -0
@@ -8,6 +8,8 @@#ifndef _ASM_GENERIC_INT_L64_H#define _ASM_GENERIC_INT_L64_H +#include <asm/bitsperlong.h> +#ifndef __ASSEMBLY__/* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
include/asm-generic/int-ll64.h +2 -0
@@ -8,6 +8,8 @@#ifndef _ASM_GENERIC_INT_LL64_H#define _ASM_GENERIC_INT_LL64_H +#include <asm/bitsperlong.h> +#ifndef __ASSEMBLY__/* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
arch/arm/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/avr32/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/blackfin/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/cris/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/frv/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/h8300/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/m32r/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/m68k/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/m68knommu/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/microblaze/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/mn10300/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/sh/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
arch/xtensa/include/asm/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 5/17 asm-generic: add complete termios.h
In reply to [email protected]On most architectures, asm/termios.h is a straight copy from the x86 version. This adds a cleaned up copy of that version so that everybody can migrate to the common copy.
The existing asm-generic/termios.h was an incomplete file and missing some bug fixes that went into a few of the architectures.
---
include/asm-generic/Kbuild | 1 1 + 0 - 0 !
include/asm-generic/termios.h | 154 154 + 0 - 0 !
2 files changed, 155 insertions(+) create mode 100644 include/asm-generic/termios-base.h
include/asm-generic/Kbuild +1 -0
@@ -6,6 +6,7 @@ header-y += mman-common.h header-y += poll.h header-y += signal-defs.h header-y += statfs.h +header-y += termios.h unifdef-y += int-l64.h unifdef-y += int-ll64.h
include/asm-generic/termios.h new file +154 -0
154 lines not on this page · raw message
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 6/17 asm-generic: add a complete signal.h
In reply to [email protected]There used to be an asm-generic/signal.h, but not one that could be used out of the box. This renames the existing file to asm-generic/signal-defs.h and adds a new asm-generic/signal.h with common definitions for sigaction and sigaltstack, but not for the old-style signal handlers.
New architectures should only implement rt-signals and use this generic header.
---
---
include/asm-generic/Kbuild | 1 1 + 0 - 0 !
include/asm-generic/signal.h | 131 131 + 0 - 0 !
2 files changed, 132 insertions(+)
include/asm-generic/signal.h new file +131 -0
@@ -0,0 +1,131 @@ +#ifndef __ASM_GENERIC_SIGNAL_H +#define __ASM_GENERIC_SIGNAL_H + +#include <linux/types.h> + +#define _NSIG 64 +#define _NSIG_BPW __BITS_PER_LONG +#define _NSIG_WORDS (_NSIG / _NSIG_BPW) + +#define SIGHUP 1 +#define SIGINT 2 +#define SIGQUIT 3 +#define SIGILL 4 +#define SIGTRAP 5 +#define SIGABRT 6 +#define SIGIOT 6 +#define SIGBUS 7 +#define SIGFPE 8 +#define SIGKILL 9 +#define SIGUSR1 10 +#define SIGSEGV 11 +#define SIGUSR2 12 +#define SIGPIPE 13 +#define SIGALRM 14 +#define SIGTERM 15 +#define SIGSTKFLT 16 +#define SIGCHLD 17 +#define SIGCONT 18 +#define SIGSTOP 19 +#define SIGTSTP 20 +#define SIGTTIN 21 +#define SIGTTOU 22 +#define SIGURG 23 +#define SIGXCPU 24 +#define SIGXFSZ 25 +#define SIGVTALRM 26 +#define SIGPROF 27 +#define SIGWINCH 28 +#define SIGIO 29 +#define SIGPOLL SIGIO +/* +#define SIGLOST 29 +*/ +#define SIGPWR 30 +#define SIGSYS 31 +#define SIGUNUSED 31 + +/* These should not be considered constants from userland. */ +#define SIGRTMIN 32 +#ifndef SIGRTMAX +#define SIGRTMAX _NSIG +#endif + +/* +* SA_FLAGS values: +* +* SA_ONSTACK indicates that a registered stack_t will be used. +* SA_RESTART flag to get restarting signals (which were the default long ago) +* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. +* SA_RESETHAND clears the handler when the signal is delivered. +* SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. +* SA_NODEFER prevents the current signal from being masked in the handler. +* +* SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single +* Unix names RESETHAND and NODEFER respectively. +*/ +#define SA_NOCLDSTOP 0x00000001 +#define SA_NOCLDWAIT 0x00000002 +#define SA_SIGINFO 0x00000004 +#define SA_ONSTACK 0x08000000 +#define SA_RESTART 0x10000000 +#define SA_NODEFER 0x40000000 +#define SA_RESETHAND 0x80000000 + +#define SA_NOMASK SA_NODEFER +#define SA_ONESHOT SA_RESETHAND + +/* +* New architectures should not define the obsolete +* SA_RESTORER 0x04000000 +*/ + +/* +* sigaltstack controls +*/ +#define SS_ONSTACK 1 +#define SS_DISABLE 2 + +#define MINSIGSTKSZ 2048 +#define SIGSTKSZ 8192 + +#ifndef __ASSEMBLY__ +typedef struct { +unsigned long sig[_NSIG_WORDS]; +}sigset_t ; + +/* not actually used, but required for linux/syscalls.h */ +typedef unsigned long old_sigset_t ; + +#include <asm-generic/signal-defs.h> + +struct sigaction { +__sighandler_t sa_handler; +unsigned long sa_flags; +#ifdef SA_RESTORER +__sigrestore_t sa_restorer; +#endif +sigset_t sa_mask;/* mask last for extensibility */ +}; + +struct k_sigaction { +struct sigaction sa; +}; + +typedef struct sigaltstack { +void __user *ss_sp; +int ss_flags; +size_t ss_size; +}stack_t ; + +#ifdef __KERNEL__ + +#include <asm/sigcontext.h> +#undef __HAVE_ARCH_SIG_BITOPS + +#define ptrace_signal_deliver (regs, cookie) do { } while (0) + +#endif /* __KERNEL__ */ +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_GENERIC_SIGNAL_H */
include/asm-generic/Kbuild +1 -0
@@ -5,6 +5,7 @@ header-y += ioctl.h header-y += mman-common.h header-y += poll.h header-y += signal-defs.h +header-y += signal.h header-y += statfs.h header-y += termios.h
[email protected]
maintainerRFC 7/17 asm-generic: make generic mman.h header generic
In reply to [email protected]The existing asm-generic/mman.h file is missing some definitions if you want to use it out of the box. This renames the old file and adds a new one based on the x86 implementation that can be used for most architectures that copied from x86.
---
---
include/asm-generic/Kbuild | 1 1 + 0 - 0 !
include/asm-generic/mman.h | 18 18 + 0 - 0 !
2 files changed, 19 insertions(+)
include/asm-generic/mman.h new file +18 -0
@@ -0,0 +1,18 @@ +#ifndef __ASM_GENERIC_MMAN_H +#define __ASM_GENERIC_MMAN_H + +#include <asm-generic/mman-common.h> + +#define MAP_GROWSDOWN 0x0100/* stack-like segment */ +#define MAP_DENYWRITE 0x0800/* ETXTBSY */ +#define MAP_EXECUTABLE 0x1000/* mark it as an executable */ +#define MAP_LOCKED 0x2000/* pages are locked */ +#define MAP_NORESERVE 0x4000/* don't check for reservations */ +#define MAP_POPULATE 0x8000/* populate (prefault) pagetables */ +#define MAP_NONBLOCK 0x10000/* do not block on IO */ +#define MAP_STACK 0x20000/* give out an address that is best suited for process/thread stacks */ + +#define MCL_CURRENT 1/* lock all current mappings */ +#define MCL_FUTURE 2/* lock all future mappings */ + +#endif /* __ASM_GENERIC_MMAN_H */
include/asm-generic/Kbuild +1 -0
@@ -3,6 +3,7 @@ header-y += errno.h header-y += fcntl.h header-y += ioctl.h header-y += mman-common.h +header-y += mman.h header-y += poll.h header-y += signal-defs.h header-y += signal.h
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 8/17 asm-generic: provide generic sysv ipc headers
In reply to [email protected]The ipc64 data structures were originally meant to be architecture specific so that each architecture could add their own optimizations for padding.
In the end, most of them just copied the x86 version, and most got that wrong. UClibc expects the x86 anyway, so we might just declare that the default and get rid of the extra copies.
---
include/asm-generic/Kbuild | 5 5 + 0 - 0 ! include/asm-generic/ipcbuf.h | 33 33 + 0 - 0 ! include/asm-generic/msgbuf.h | 47 47 + 0 - 0 ! include/asm-generic/sembuf.h | 38 38 + 0 - 0 ! include/asm-generic/shmbuf.h | 59 59 + 0 - 0 ! include/asm-generic/shmparam.h | 6 6 + 0 - 0 ! 6 files changed, 188 insertions(+) create mode 100644 include/asm-generic/ipcbuf.h create mode 100644 include/asm-generic/msgbuf.h create mode 100644 include/asm-generic/sembuf.h create mode 100644 include/asm-generic/shmbuf.h create mode 100644 include/asm-generic/shmparam.h
include/asm-generic/Kbuild +5 -0
@@ -2,9 +2,14 @@ header-y += errno-base.h header-y += errno.h header-y += fcntl.h header-y += ioctl.h +header-y += ipcbuf.h header-y += mman-common.h header-y += mman.h +header-y += msgbuf.h header-y += poll.h +header-y += sembuf.h +header-y += shmbuf.h +header-y += shmparam.h header-y += signal-defs.h header-y += signal.h header-y += statfs.h
include/asm-generic/ipcbuf.h new file +33 -0
@@ -0,0 +1,33 @@ +#ifndef __ASM_GENERIC_IPCBUF_H +#define __ASM_GENERIC_IPCBUF_H + +/* +* The generic ipc64_perm structure: +* Note extra padding because this structure is passed back and forth +* between kernel and user space. +* +* ipc64_perm was originally meant to be architecture specific, but +* everyone just ended up making identical copies without specific +* optimizations, so we may just as well all use the same one. +* +* Pad space is left for: +* - 32-bit mode_t on architectures that only had 16 bit +* - 32-bit seq +* - 2 miscellaneous 32-bit values +*/ + +struct ipc64_perm { +__kernel_key_t key; +__kernel_uid32_t uid; +__kernel_gid32_t gid; +__kernel_uid32_t cuid; +__kernel_gid32_t cgid; +__kernel_mode_t mode; +unsigned short __pad1; +unsigned short seq; +unsigned short __pad2; +unsigned long __unused1; +unsigned long __unused2; +}; + +#endif /* __ASM_GENERIC_IPCBUF_H */
include/asm-generic/msgbuf.h new file +47 -0
47 lines not on this page · raw message
include/asm-generic/sembuf.h new file +38 -0
@@ -0,0 +1,38 @@ +#ifndef __ASM_GENERIC_SEMBUF_H +#define __ASM_GENERIC_SEMBUF_H + +#include <asm/bitsperlong.h> + +/* +* The semid64_ds structure for x86 architecture. +* Note extra padding because this structure is passed back and forth +* between kernel and user space. +* +* semid64_ds was originally meant to be architecture specific, but +* everyone just ended up making identical copies without specific +* optimizations, so we may just as well all use the same one. +* +* 64 bit architectures typically define a 64 bit __kernel_time_t, +* so they do not need the first two padding words. +* On big-endian systems, the padding is in the wrong place. +* +* Pad space is left for: +* - 64-bit time_t to solve y2038 problem +* - 2 miscellaneous 32-bit values +*/ +struct semid64_ds { +struct ipc64_perm sem_perm;/* permissions .. see ipc.h */ +__kernel_time_t sem_otime;/* last semop time */ +#if __BITS_PER_LONG !=64 +unsigned long __unused1; +#endif +__kernel_time_t sem_ctime;/* last change time */ +#if __BITS_PER_LONG !=64 +unsigned long __unused2; +#endif +unsigned long sem_nsems;/* no. of semaphores in array */ +unsigned long __unused3; +unsigned long __unused4; +}; + +#endif /* __ASM_GENERIC_SEMBUF_H */
include/asm-generic/shmbuf.h new file +59 -0
59 lines not on this page · raw message
include/asm-generic/shmparam.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef __ASM_GENERIC_SHMPARAM_H +#define __ASM_GENERIC_SHMPARAM_H + +#define SHMLBA PAGE_SIZE/* attach addr a multiple of this */ + +#endif /* _ASM_GENERIC_SHMPARAM_H */
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 9/17 asm-generic: provide a common types.h
In reply to [email protected]Practically all 32 bit architectures can use the same definitions in asm/types.h, so make that the default.
---
include/asm-generic/Kbuild | 1 1 + 0 - 0 !
include/asm-generic/types.h | 42 42 + 0 - 0 !
2 files changed, 43 insertions(+) create mode 100644 include/asm-generic/types.h
include/asm-generic/Kbuild +1 -0
@@ -14,6 +14,7 @@ header-y += signal-defs.h header-y += signal.h header-y += statfs.h header-y += termios.h +header-y += types.h unifdef-y += int-l64.h unifdef-y += int-ll64.h
include/asm-generic/types.h new file +42 -0
42 lines not on this page · raw message
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 10/17 asm-generic: provide generic ABI headers
In reply to [email protected]These header files are typically copied from an existing architecture into any new one, slightly modified and then remain untouched until the end of time in the name of ABI stability.
To make it easier for future architectures, provide a sane generic version here. In cases where multiple architectures already use identical code, I used the most common version. In cases like stat.h that are more or less broken everywhere, I provide a version that is meant to be ideal for new architectures.
---
include/asm-generic/Kbuild | 12 12 + 0 - 0 ! include/asm-generic/auxvec.h | 8 8 + 0 - 0 ! include/asm-generic/ioctls.h | 110 110 + 0 - 0 ! include/asm-generic/param.h | 24 24 + 0 - 0 ! include/asm-generic/posix_types.h | 166 166 + 0 - 0 ! include/asm-generic/setup.h | 6 6 + 0 - 0 ! include/asm-generic/socket.h | 60 60 + 0 - 0 ! include/asm-generic/sockios.h | 13 13 + 0 - 0 ! include/asm-generic/stat.h | 72 72 + 0 - 0 ! include/asm-generic/swab.h | 18 18 + 0 - 0 ! include/asm-generic/termbits.h | 198 198 + 0 - 0 ! include/asm-generic/ucontext.h | 12 12 + 0 - 0 ! 12 files changed, 699 insertions(+) create mode 100644 include/asm-generic/auxvec.h create mode 100644 include/asm-generic/ioctls.h create mode 100644 include/asm-generic/param.h create mode 100644 include/asm-generic/posix_types.h create mode 100644 include/asm-generic/setup.h create mode 100644 include/asm-generic/socket.h create mode 100644 include/asm-generic/sockios.h create mode 100644 include/asm-generic/stat.h create mode 100644 include/asm-generic/termbits.h create mode 100644 include/asm-generic/ucontext.h
include/asm-generic/Kbuild +12 -0
@@ -1,20 +1,32 @@ +header-y += auxvec.h +header-y += byteorder.h header-y += errno-base.h header-y += errno.h header-y += fcntl.h header-y += ioctl.h +header-y += ioctls.h header-y += ipcbuf.h header-y += mman-common.h header-y += mman.h header-y += msgbuf.h +header-y += param.h header-y += poll.h +header-y += posix_types.h header-y += sembuf.h +header-y += setup.h header-y += shmbuf.h header-y += shmparam.h header-y += signal-defs.h header-y += signal.h +header-y += socket.h +header-y += sockios.h +header-y += stat.h header-y += statfs.h +header-y += swab.h +header-y += termbits.h header-y += termios.h header-y += types.h +header-y += ucontext.h unifdef-y += int-l64.h unifdef-y += int-ll64.h
include/asm-generic/auxvec.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef __ASM_GENERIC_AUXVEC_H +#define __ASM_GENERIC_AUXVEC_H +/* +* Not all architectures need their own auxvec.h, the most +* common definitions are already in linux/auxvec.h. +*/ + +#endif /* __ASM_GENERIC_AUXVEC_H */
include/asm-generic/ioctls.h new file +110 -0
110 lines not on this page · raw message
include/asm-generic/param.h new file +24 -0
@@ -0,0 +1,24 @@ +#ifndef __ASM_GENERIC_PARAM_H +#define __ASM_GENERIC_PARAM_H + +#ifdef __KERNEL__ +# define HZ CONFIG_HZ/* Internal kernel timer frequency */ +# define USER_HZ 100/* some user interfaces are */ +# define CLOCKS_PER_SEC (USER_HZ)/* in "ticks" like times() */ +#endif + +#ifndef HZ +#define HZ 100 +#endif + +#ifndef EXEC_PAGESIZE +#define EXEC_PAGESIZE 4096 +#endif + +#ifndef NOGROUP +#define NOGROUP (-1) +#endif + +#define MAXHOSTNAMELEN 64/* max length of hostname */ + +#endif /* __ASM_GENERIC_PARAM_H */
include/asm-generic/posix_types.h new file +166 -0
166 lines not on this page · raw message
include/asm-generic/setup.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef __ASM_GENERIC_SETUP_H +#define __ASM_GENERIC_SETUP_H + +#define COMMAND_LINE_SIZE 512 + +#endif /* __ASM_GENERIC_SETUP_H */
include/asm-generic/socket.h new file +60 -0
60 lines not on this page · raw message
include/asm-generic/sockios.h new file +13 -0
@@ -0,0 +1,13 @@ +#ifndef __ASM_GENERIC_SOCKIOS_H +#define __ASM_GENERIC_SOCKIOS_H + +/* Socket-level I/O control calls. */ +#define FIOSETOWN 0x8901 +#define SIOCSPGRP 0x8902 +#define FIOGETOWN 0x8903 +#define SIOCGPGRP 0x8904 +#define SIOCATMARK 0x8905 +#define SIOCGSTAMP 0x8906/* Get stamp (timeval) */ +#define SIOCGSTAMPNS 0x8907/* Get stamp (timespec) */ + +#endif /* __ASM_GENERIC_SOCKIOS_H */
include/asm-generic/stat.h new file +72 -0
72 lines not on this page · raw message
include/asm-generic/termbits.h new file +198 -0
198 lines not on this page · raw message
include/asm-generic/ucontext.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef __ASM_GENERIC_UCONTEXT_H +#define __ASM_GENERIC_UCONTEXT_H + +struct ucontext { +unsigned long uc_flags; +struct ucontext *uc_link; +stack_t uc_stack; +struct sigcontext uc_mcontext; +sigset_t uc_sigmask;/* mask last for extensibility */ +}; + +#endif /* __ASM_GENERIC_UCONTEXT_H */
include/asm-generic/swab.h new file +18 -0
@@ -0,0 +1,18 @@ +#ifndef _ASM_GENERIC_SWAB_H +#define _ASM_GENERIC_SWAB_H + +#include <asm/bitsperlong.h> + +/* +* 32 bit architectures typically (but not always) want to +* set __SWAB_64_THRU_32__. In user space, this is only +* valid if the compiler supports 64 bit data types. +*/ + +#if __BITS_PER_LONG ==32 +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) +#define __SWAB_64_THRU_32__ +#endif +#endif + +#endif /* _ASM_GENERIC_SWAB_H */
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 11/17 asm-generic: add a generic unistd.h
In reply to [email protected]A new architecture should only define a minimal set of system calls while still providing the full functionality. This version of unistd.h has gone through intensive review to make sure that by default it only enables syscalls that do not already have a more featureful replacement.
It is modeled after the x86-64 version of unistd.h, which unifies the syscall number definition and the actual system call table in a single file, in order to keep them synchronized much more easily.
This first version still keeps legacy system call definitions around, guarded by various #ifdefs, and with numbers larger than 1024. The idea behind this is to make it easier for new architectures to transition from a full list to the reduced set. In particular, the new microblaze architecture that should migrate to using the generic ABI headers can at least use an existing uClibc source tree without major rewrites during the conversion.
---
include/asm-generic/Kbuild | 1 1 + 0 - 0 ! include/asm-generic/unistd.h | 841 841 + 0 - 0 ! scripts/checksyscalls.sh | 92 89 + 3 - 0 ! 3 files changed, 931 insertions(+), 3 deletions(-) create mode 100644 include/asm-generic/unistd.h
include/asm-generic/unistd.h new file +841 -0
@@ -0,0 +1,841 @@ +#if !defined(_ASM_GENERIC_UNISTD_H) || defined(__SYSCALL) +#define _ASM_GENERIC_UNISTD_H + +#include <asm/bitsperlong.h> + +/* +* This file contains the system call numbers, based on the +* layout of the x86-64 architecture, which embeds the +* pointer to the syscall in the table. +* +* As a basic principle, no duplication of functionality +* should be added, e.g. we don't use lseek when llseek +* is present. New architectures should use this file +* and implement the less feature-full calls in user space. +*/ + +#ifndef __SYSCALL +#define __SYSCALL (x, y) +#endif + +#if __BITS_PER_LONG ==32 +#define __SC_3264 (_nr, _32, _64) __SYSCALL(_nr, _32) +#else +#define __SC_3264 (_nr, _32, _64) __SYSCALL(_nr, _64) +#endif + +#define __NR_io_setup 0 +__SYSCALL(__NR_io_setup, sys_io_setup) +#define __NR_io_destroy 1 +__SYSCALL(__NR_io_destroy, sys_io_destroy) +#define __NR_io_submit 2 +__SYSCALL(__NR_io_submit, sys_io_submit) +#define __NR_io_cancel 3 +__SYSCALL(__NR_io_cancel, sys_io_cancel) +#define __NR_io_getevents 4 +__SYSCALL (__NR_io_getevents, sys_io_getevents) + +/* fs/xattr.c */ +#define __NR_setxattr 5 +__SYSCALL(__NR_setxattr, sys_setxattr) +#define __NR_lsetxattr 6 +__SYSCALL(__NR_lsetxattr, sys_lsetxattr) +#define __NR_fsetxattr 7 +__SYSCALL(__NR_fsetxattr, sys_fsetxattr) +#define __NR_getxattr 8 +__SYSCALL(__NR_getxattr, sys_getxattr) +#define __NR_lgetxattr 9 +__SYSCALL(__NR_lgetxattr, sys_lgetxattr) +#define __NR_fgetxattr 10 +__SYSCALL(__NR_fgetxattr, sys_fgetxattr) +#define __NR_listxattr 11 +__SYSCALL(__NR_listxattr, sys_listxattr) +#define __NR_llistxattr 12 +__SYSCALL(__NR_llistxattr, sys_llistxattr) +#define __NR_flistxattr 13 +__SYSCALL(__NR_flistxattr, sys_flistxattr) +#define __NR_removexattr 14 +__SYSCALL(__NR_removexattr, sys_removexattr) +#define __NR_lremovexattr 15 +__SYSCALL(__NR_lremovexattr, sys_lremovexattr) +#define __NR_fremovexattr 16 +__SYSCALL (__NR_fremovexattr, sys_fremovexattr) + +/* fs/dcache.c */ +#define __NR_getcwd 17 +__SYSCALL (__NR_getcwd, sys_getcwd) + +/* fs/cookies.c */ +#define __NR_lookup_dcookie 18 +__SYSCALL (__NR_lookup_dcookie, sys_lookup_dcookie) + +/* fs/eventfd.c */ +#define __NR_eventfd2 19 +__SYSCALL (__NR_eventfd2, sys_eventfd2) + +/* fs/eventpoll.c */ +#define __NR_epoll_create1 20 +__SYSCALL(__NR_epoll_create1, sys_epoll_create1) +#define __NR_epoll_ctl 21 +__SYSCALL(__NR_epoll_ctl, sys_epoll_ctl) +#define __NR_epoll_pwait 22 +__SYSCALL (__NR_epoll_pwait, sys_epoll_pwait) + +/* fs/fcntl.c */ +#define __NR_dup 23 +__SYSCALL(__NR_dup, sys_dup) +#define __NR_dup3 24 +__SYSCALL(__NR_dup3, sys_dup3) +#define __NR3264_fcntl 25 +__SC_3264 (__NR3264_fcntl, sys_fcntl64, sys_fcntl) + +/* fs/inotify_user.c */ +#define __NR_inotify_init1 26 +__SYSCALL(__NR_inotify_init1, sys_inotify_init1) +#define __NR_inotify_add_watch 27 +__SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch) +#define __NR_inotify_rm_watch 28 +__SYSCALL (__NR_inotify_rm_watch, sys_inotify_rm_watch) + +/* fs/ioctl.c */ +#define __NR_ioctl 29 +__SYSCALL (__NR_ioctl, sys_ioctl) + +/* fs/ioprio.c */ +#define __NR_ioprio_set 30 +__SYSCALL(__NR_ioprio_set, sys_ioprio_set) +#define __NR_ioprio_get 31 +__SYSCALL (__NR_ioprio_get, sys_ioprio_get) + +/* fs/locks.c */ +#define __NR_flock 32 +__SYSCALL (__NR_flock, sys_flock) + +/* fs/namei.c */ +#define __NR_mknodat 33 +__SYSCALL(__NR_mknodat, sys_mknodat) +#define __NR_mkdirat 34 +__SYSCALL(__NR_mkdirat, sys_mkdirat) +#define __NR_unlinkat 35 +__SYSCALL(__NR_unlinkat, sys_unlinkat) +#define __NR_symlinkat 36 +__SYSCALL(__NR_symlinkat, sys_symlinkat) +#define __NR_linkat 37 +__SYSCALL(__NR_linkat, sys_linkat) +#define __NR_renameat 38 +__SYSCALL (__NR_renameat, sys_renameat) + +/* fs/namespace.c */ +#define __NR_umount2 39 +__SYSCALL(__NR_umount2, sys_umount) +#define __NR_mount 40 +__SYSCALL(__NR_mount, sys_mount) +#define __NR_pivot_root 41 +__SYSCALL (__NR_pivot_root, sys_pivot_root) + +/* fs/nfsctl.c */ +#define __NR_nfsservctl 42 +__SYSCALL (__NR_nfsservctl, sys_nfsservctl) + +/* fs/open.c */ +#define __NR3264_statfs 43 +__SC_3264(__NR3264_statfs, sys_statfs64, sys_statfs) +#define __NR3264_fstatfs 44 +__SC_3264(__NR3264_fstatfs, sys_fstatfs64, sys_fstatfs) +#define __NR3264_truncate 45 +__SC_3264(__NR3264_truncate, sys_truncate64, sys_truncate) +#define __NR3264_ftruncate 46 +__SC_3264(__NR3264_ftruncate, sys_ftruncate64, sys_ftruncate) + +#define __NR_fallocate 47 +__SYSCALL(__NR_fallocate, sys_fallocate) +#define __NR_faccessat 48 +__SYSCALL(__NR_faccessat, sys_faccessat) +#define __NR_chdir 49 +__SYSCALL(__NR_chdir, sys_chdir) +#define __NR_fchdir 50 +__SYSCALL(__NR_fchdir, sys_fchdir) +#define __NR_chroot 51 +__SYSCALL(__NR_chroot, sys_chroot) +#define __NR_fchmod 52 +__SYSCALL(__NR_fchmod, sys_fchmod) +#define __NR_fchmodat 53 +__SYSCALL(__NR_fchmodat, sys_fchmodat) +#define __NR_fchownat 54 +__SYSCALL(__NR_fchownat, sys_fchownat) +#define __NR_fchown 55 +__SYSCALL(__NR_fchown, sys_fchown) +#define __NR_openat 56 +__SYSCALL(__NR_openat, sys_openat) +#define __NR_close 57 +__SYSCALL(__NR_close, sys_close) +#define __NR_vhangup 58 +__SYSCALL (__NR_vhangup, sys_vhangup) + +/* fs/pipe.c */ +#define __NR_pipe2 59 +__SYSCALL (__NR_pipe2, sys_pipe2) + +/* fs/quota.c */ +#define __NR_quotactl 60 +__SYSCALL (__NR_quotactl, sys_quotactl) + +/* fs/readdir.c */ +#define __NR_getdents64 61 +__SYSCALL (__NR_getdents64, sys_getdents64) + +/* fs/read_write.c */ +#define __NR3264_lseek 62 +__SC_3264(__NR3264_lseek, sys_llseek, sys_lseek) +#define __NR_read 63 +__SYSCALL(__NR_read, sys_read) +#define __NR_write 64 +__SYSCALL(__NR_write, sys_write) +#define __NR_readv 65 +__SYSCALL(__NR_readv, sys_readv) +#define __NR_writev 66 +__SYSCALL(__NR_writev, sys_writev) +#define __NR_pread64 67 +__SYSCALL(__NR_pread64, sys_pread64) +#define __NR_pwrite64 68 +__SYSCALL(__NR_pwrite64, sys_pwrite64) +#define __NR_preadv 69 +__SYSCALL(__NR_preadv, sys_preadv) +#define __NR_pwritev 70 +__SYSCALL (__NR_pwritev, sys_pwritev) + +/* fs/sendfile.c */ +#define __NR3264_sendfile 71 +__SC_3264 (__NR3264_sendfile, sys_sendfile64, sys_sendfile) + +/* fs/select.c */ +#define __NR_pselect6 72 +__SYSCALL(__NR_pselect6, sys_pselect6) +#define __NR_ppoll 73 +__SYSCALL (__NR_ppoll, sys_ppoll) + +/* fs/signalfd.c */ +#define __NR_signalfd4 74 +__SYSCALL (__NR_signalfd4, sys_signalfd4) + +/* fs/splice.c */ +#define __NR_vmsplice 75 +__SYSCALL(__NR_vmsplice, sys_vmsplice) +#define __NR_splice 76 +__SYSCALL(__NR_splice, sys_splice) +#define __NR_tee 77 +__SYSCALL (__NR_tee, sys_tee) + +/* fs/stat.c */ +#define __NR_readlinkat 78 +__SYSCALL(__NR_readlinkat, sys_readlinkat) +#define __NR3264_fstatat 79 +__SC_3264(__NR3264_fstatat, sys_fstatat64, sys_newfstatat) +#define __NR3264_fstat 80 +__SC_3264 (__NR3264_fstat, sys_fstat64, sys_newfstat) + +/* fs/sync.c */ +#define __NR_sync 81 +__SYSCALL(__NR_sync, sys_sync) +#define __NR_fsync 82 +__SYSCALL(__NR_fsync, sys_fsync) +#define __NR_fdatasync 83 +__SYSCALL(__NR_fdatasync, sys_fdatasync) +#define __NR_sync_file_range 84 +__SYSCALL (__NR_sync_file_range, sys_sync_file_range)/* .long sys_sync_file_range2, */ + +/* fs/timerfd.c */ +#define __NR_timerfd_create 85 +__SYSCALL(__NR_timerfd_create, sys_timerfd_create) +#define __NR_timerfd_settime 86 +__SYSCALL(__NR_timerfd_settime, sys_timerfd_settime) +#define __NR_timerfd_gettime 87 +__SYSCALL (__NR_timerfd_gettime, sys_timerfd_gettime) + +/* fs/utimes.c */ +#define __NR_utimensat 88 +__SYSCALL (__NR_utimensat, sys_utimensat) + +/* kernel/acct.c */ +#define __NR_acct 89 +__SYSCALL (__NR_acct, sys_acct) + +/* kernel/capability.c */ +#define __NR_capget 90 +__SYSCALL(__NR_capget, sys_capget) +#define __NR_capset 91 +__SYSCALL (__NR_capset, sys_capset) + +/* kernel/exec_domain.c */ +#define __NR_personality 92 +__SYSCALL (__NR_personality, sys_personality) + +/* kernel/exit.c */ +#define __NR_exit 93 +__SYSCALL(__NR_exit, sys_exit) +#define __NR_exit_group 94 +__SYSCALL(__NR_exit_group, sys_exit_group) +#define __NR_waitid 95 +__SYSCALL (__NR_waitid, sys_waitid) + +/* kernel/fork.c */ +#define __NR_set_tid_address 96 +__SYSCALL(__NR_set_tid_address, sys_set_tid_address) +#define __NR_unshare 97 +__SYSCALL (__NR_unshare, sys_unshare) + +/* kernel/futex.c */ +#define __NR_futex 98 +__SYSCALL(__NR_futex, sys_futex) +#define __NR_set_robust_list 99 +__SYSCALL(__NR_set_robust_list, sys_set_robust_list) +#define __NR_get_robust_list 100 +__SYSCALL (__NR_get_robust_list, sys_get_robust_list) + +/* kernel/hrtimer.c */ +#define __NR_nanosleep 101 +__SYSCALL (__NR_nanosleep, sys_nanosleep) + +/* kernel/itimer.c */ +#define __NR_getitimer 102 +__SYSCALL(__NR_getitimer, sys_getitimer) +#define __NR_setitimer 103 +__SYSCALL (__NR_setitimer, sys_setitimer) + +/* kernel/kexec.c */ +#define __NR_kexec_load 104 +__SYSCALL (__NR_kexec_load, sys_kexec_load) + +/* kernel/module.c */ +#define __NR_init_module 105 +__SYSCALL(__NR_init_module, sys_init_module) +#define __NR_delete_module 106 +__SYSCALL (__NR_delete_module, sys_delete_module) + +/* kernel/posix-timers.c */ +#define __NR_timer_create 107 +__SYSCALL(__NR_timer_create, sys_timer_create) +#define __NR_timer_gettime 108 +__SYSCALL(__NR_timer_gettime, sys_timer_gettime) +#define __NR_timer_getoverrun 109 +__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun) +#define __NR_timer_settime 110 +__SYSCALL(__NR_timer_settime, sys_timer_settime) +#define __NR_timer_delete 111 +__SYSCALL(__NR_timer_delete, sys_timer_delete) +#define __NR_clock_settime 112 +__SYSCALL(__NR_clock_settime, sys_clock_settime) +#define __NR_clock_gettime 113 +__SYSCALL(__NR_clock_gettime, sys_clock_gettime) +#define __NR_clock_getres 114 +__SYSCALL(__NR_clock_getres, sys_clock_getres) +#define __NR_clock_nanosleep 115 +__SYSCALL (__NR_clock_nanosleep, sys_clock_nanosleep) + +/* kernel/printk.c */ +#define __NR_syslog 116 +__SYSCALL (__NR_syslog, sys_syslog) + +/* kernel/ptrace.c */ +#define __NR_ptrace 117 +__SYSCALL (__NR_ptrace, sys_ptrace) + +/* kernel/sched.c */ +#define __NR_sched_setparam 118 +__SYSCALL(__NR_sched_setparam, sys_sched_setparam) +#define __NR_sched_setscheduler 119 +__SYSCALL(__NR_sched_setscheduler, sys_sched_setscheduler) +#define __NR_sched_getscheduler 120 +__SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler) +#define __NR_sched_getparam 121 +__SYSCALL(__NR_sched_getparam, sys_sched_getparam) +#define __NR_sched_setaffinity 122 +__SYSCALL(__NR_sched_setaffinity, sys_sched_setaffinity) +#define __NR_sched_getaffinity 123 +__SYSCALL(__NR_sched_getaffinity, sys_sched_getaffinity) +#define __NR_sched_yield 124 +__SYSCALL(__NR_sched_yield, sys_sched_yield) +#define __NR_sched_get_priority_max 125 +__SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max) +#define __NR_sched_get_priority_min 126 +__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min) +#define __NR_sched_rr_get_interval 127 +__SYSCALL (__NR_sched_rr_get_interval, sys_sched_rr_get_interval) + +/* kernel/signal.c */ +#define __NR_restart_syscall 128 +__SYSCALL(__NR_restart_syscall, sys_restart_syscall) +#define __NR_kill 129 +__SYSCALL(__NR_kill, sys_kill) +#define __NR_tkill 130 +__SYSCALL(__NR_tkill, sys_tkill) +#define __NR_tgkill 131 +__SYSCALL(__NR_tgkill, sys_tgkill) +#define __NR_sigaltstack 132 +__SYSCALL(__NR_sigaltstack, sys_sigaltstack) +#define __NR_rt_sigsuspend 133 +__SYSCALL(__NR_rt_sigsuspend, sys_rt_sigsuspend) /* __ARCH_WANT_SYS_RT_SIGSUSPEND */ +#define __NR_rt_sigaction 134 +__SYSCALL(__NR_rt_sigaction, sys_rt_sigaction) /* __ARCH_WANT_SYS_RT_SIGACTION */ +#define __NR_rt_sigprocmask 135 +__SYSCALL(__NR_rt_sigprocmask, sys_rt_sigprocmask) +#define __NR_rt_sigpending 136 +__SYSCALL(__NR_rt_sigpending, sys_rt_sigpending) +#define __NR_rt_sigtimedwait 137 +__SYSCALL(__NR_rt_sigtimedwait, sys_rt_sigtimedwait) +#define __NR_rt_sigqueueinfo 138 +__SYSCALL(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo) +#define __NR_rt_sigreturn 139 +__SYSCALL (__NR_rt_sigreturn, sys_rt_sigreturn)/* sys_rt_sigreturn_wrapper, */ + +/* kernel/sys.c */ +#define __NR_setpriority 140 +__SYSCALL(__NR_setpriority, sys_setpriority) +#define __NR_getpriority 141 +__SYSCALL(__NR_getpriority, sys_getpriority) +#define __NR_reboot 142 +__SYSCALL(__NR_reboot, sys_reboot) +#define __NR_setregid 143 +__SYSCALL(__NR_setregid, sys_setregid) +#define __NR_setgid 144 +__SYSCALL(__NR_setgid, sys_setgid) +#define __NR_setreuid 145 +__SYSCALL(__NR_setreuid, sys_setreuid) +#define __NR_setuid 146 +__SYSCALL(__NR_setuid, sys_setuid) +#define __NR_setresuid 147 +__SYSCALL(__NR_setresuid, sys_setresuid) +#define __NR_getresuid 148 +__SYSCALL(__NR_getresuid, sys_getresuid) +#define __NR_setresgid 149 +__SYSCALL(__NR_setresgid, sys_setresgid) +#define __NR_getresgid 150 +__SYSCALL(__NR_getresgid, sys_getresgid) +#define __NR_setfsuid 151 +__SYSCALL(__NR_setfsuid, sys_setfsuid) +#define __NR_setfsgid 152 +__SYSCALL(__NR_setfsgid, sys_setfsgid) +#define __NR_times 153 +__SYSCALL(__NR_times, sys_times) +#define __NR_setpgid 154 +__SYSCALL(__NR_setpgid, sys_setpgid) +#define __NR_getpgid 155 +__SYSCALL(__NR_getpgid, sys_getpgid) +#define __NR_getsid 156 +__SYSCALL(__NR_getsid, sys_getsid) +#define __NR_setsid 157 +__SYSCALL(__NR_setsid, sys_setsid) +#define __NR_getgroups 158 +__SYSCALL(__NR_getgroups, sys_getgroups) +#define __NR_setgroups 159 +__SYSCALL(__NR_setgroups, sys_setgroups) +#define __NR_uname 160 +__SYSCALL(__NR_uname, sys_newuname) +#define __NR_sethostname 161 +__SYSCALL(__NR_sethostname, sys_sethostname) +#define __NR_setdomainname 162 +__SYSCALL(__NR_setdomainname, sys_setdomainname) +#define __NR_getrlimit 163 +__SYSCALL(__NR_getrlimit, sys_getrlimit) +#define __NR_setrlimit 164 +__SYSCALL(__NR_setrlimit, sys_setrlimit) +#define __NR_getrusage 165 +__SYSCALL(__NR_getrusage, sys_getrusage) +#define __NR_umask 166 +__SYSCALL(__NR_umask, sys_umask) +#define __NR_prctl 167 +__SYSCALL(__NR_prctl, sys_prctl) +#define __NR_getcpu 168 +__SYSCALL (__NR_getcpu, sys_getcpu) + +/* kernel/time.c */ +#define __NR_gettimeofday 169 +__SYSCALL(__NR_gettimeofday, sys_gettimeofday) +#define __NR_settimeofday 170 +__SYSCALL(__NR_settimeofday, sys_settimeofday) +#define __NR_adjtimex 171 +__SYSCALL (__NR_adjtimex, sys_adjtimex) + +/* kernel/timer.c */ +#define __NR_getpid 172 +__SYSCALL(__NR_getpid, sys_getpid) +#define __NR_getppid 173 +__SYSCALL(__NR_getppid, sys_getppid) +#define __NR_getuid 174 +__SYSCALL(__NR_getuid, sys_getuid) +#define __NR_geteuid 175 +__SYSCALL(__NR_geteuid, sys_geteuid) +#define __NR_getgid 176 +__SYSCALL(__NR_getgid, sys_getgid) +#define __NR_getegid 177 +__SYSCALL(__NR_getegid, sys_getegid) +#define __NR_gettid 178 +__SYSCALL(__NR_gettid, sys_gettid) +#define __NR_sysinfo 179 +__SYSCALL (__NR_sysinfo, sys_sysinfo) + +/* ipc/mqueue.c */ +#define __NR_mq_open 180 +__SYSCALL(__NR_mq_open, sys_mq_open) +#define __NR_mq_unlink 181 +__SYSCALL(__NR_mq_unlink, sys_mq_unlink) +#define __NR_mq_timedsend 182 +__SYSCALL(__NR_mq_timedsend, sys_mq_timedsend) +#define __NR_mq_timedreceive 183 +__SYSCALL(__NR_mq_timedreceive, sys_mq_timedreceive) +#define __NR_mq_notify 184 +__SYSCALL(__NR_mq_notify, sys_mq_notify) +#define __NR_mq_getsetattr 185 +__SYSCALL (__NR_mq_getsetattr, sys_mq_getsetattr) + +/* ipc/msg.c */ +#define __NR_msgget 186 +__SYSCALL(__NR_msgget, sys_msgget) +#define __NR_msgctl 187 +__SYSCALL(__NR_msgctl, sys_msgctl) +#define __NR_msgrcv 188 +__SYSCALL(__NR_msgrcv, sys_msgrcv) +#define __NR_msgsnd 189 +__SYSCALL (__NR_msgsnd, sys_msgsnd) + +/* ipc/sem.c */ +#define __NR_semget 190 +__SYSCALL(__NR_semget, sys_semget) +#define __NR_semctl 191 +__SYSCALL(__NR_semctl, sys_semctl) +#define __NR_semtimedop 192 +__SYSCALL(__NR_semtimedop, sys_semtimedop) +#define __NR_semop 193 +__SYSCALL (__NR_semop, sys_semop) + +/* ipc/shm.c */ +#define __NR_shmget 194 +__SYSCALL(__NR_shmget, sys_shmget) +#define __NR_shmctl 195 +__SYSCALL(__NR_shmctl, sys_shmctl) +#define __NR_shmat 196 +__SYSCALL(__NR_shmat, sys_shmat) +#define __NR_shmdt 197 +__SYSCALL (__NR_shmdt, sys_shmdt) + +/* net/socket.c */ +#define __NR_socket 198 +__SYSCALL(__NR_socket, sys_socket) +#define __NR_socketpair 199 +__SYSCALL(__NR_socketpair, sys_socketpair) +#define __NR_bind 200 +__SYSCALL(__NR_bind, sys_bind) +#define __NR_listen 201 +__SYSCALL(__NR_listen, sys_listen) +#define __NR_accept 202 +__SYSCALL(__NR_accept, sys_accept) +#define __NR_connect 203 +__SYSCALL(__NR_connect, sys_connect) +#define __NR_getsockname 204 +__SYSCALL(__NR_getsockname, sys_getsockname) +#define __NR_getpeername 205 +__SYSCALL(__NR_getpeername, sys_getpeername) +#define __NR_sendto 206 +__SYSCALL(__NR_sendto, sys_sendto) +#define __NR_recvfrom 207 +__SYSCALL(__NR_recvfrom, sys_recvfrom) +#define __NR_setsockopt 208 +__SYSCALL(__NR_setsockopt, sys_setsockopt) +#define __NR_getsockopt 209 +__SYSCALL(__NR_getsockopt, sys_getsockopt) +#define __NR_shutdown 210 +__SYSCALL(__NR_shutdown, sys_shutdown) +#define __NR_sendmsg 211 +__SYSCALL(__NR_sendmsg, sys_sendmsg) +#define __NR_recvmsg 212 +__SYSCALL (__NR_recvmsg, sys_recvmsg) + +/* mm/filemap.c */ +#define __NR_readahead 213 +__SYSCALL (__NR_readahead, sys_readahead) + +/* mm/nommu.c, also with MMU */ +#define __NR_brk 214 +__SYSCALL(__NR_brk, sys_brk) +#define __NR_munmap 215 +__SYSCALL(__NR_munmap, sys_munmap) +#define __NR_mremap 216 +__SYSCALL (__NR_mremap, sys_mremap) + +/* security/keys/keyctl.c */ +#define __NR_add_key 217 +__SYSCALL(__NR_add_key, sys_add_key) +#define __NR_request_key 218 +__SYSCALL(__NR_request_key, sys_request_key) +#define __NR_keyctl 219 +__SYSCALL (__NR_keyctl, sys_keyctl) + +/* arch/example/kernel/sys_example.c */ +#define __NR_clone 220 +__SYSCALL(__NR_clone, sys_clone) /* .long sys_clone_wrapper */ +#define __NR_execve 221 +__SYSCALL(__NR_execve, sys_execve) /* .long sys_execve_wrapper */ + +#define __NR3264_mmap 222 +__SC_3264 (__NR3264_mmap, sys_mmap2, sys_mmap) +/* mm/fadvise.c */ +#define __NR3264_fadvise64 223 +__SC_3264 (__NR3264_fadvise64, sys_fadvise64_64, sys_fadvise64) + +/* mm/, CONFIG_MMU only */ +#ifndef __ARCH_NOMMU +#define __NR_swapon 224 +__SYSCALL(__NR_swapon, sys_swapon) +#define __NR_swapoff 225 +__SYSCALL(__NR_swapoff, sys_swapoff) +#define __NR_mprotect 226 +__SYSCALL(__NR_mprotect, sys_mprotect) +#define __NR_msync 227 +__SYSCALL(__NR_msync, sys_msync) +#define __NR_mlock 228 +__SYSCALL(__NR_mlock, sys_mlock) +#define __NR_munlock 229 +__SYSCALL(__NR_munlock, sys_munlock) +#define __NR_mlockall 230 +__SYSCALL(__NR_mlockall, sys_mlockall) +#define __NR_munlockall 231 +__SYSCALL(__NR_munlockall, sys_munlockall) +#define __NR_mincore 232 +__SYSCALL(__NR_mincore, sys_mincore) +#define __NR_madvise 233 +__SYSCALL(__NR_madvise, sys_madvise) +#define __NR_remap_file_pages 234 +__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages) +#define __NR_mbind 235 +__SYSCALL(__NR_mbind, sys_mbind) +#define __NR_get_mempolicy 236 +__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy) +#define __NR_set_mempolicy 237 +__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy) +#define __NR_migrate_pages 238 +__SYSCALL(__NR_migrate_pages, sys_migrate_pages) +#define __NR_move_pages 239 +__SYSCALL(__NR_move_pages, sys_move_pages) +#endif + +#undef __NR_syscalls +#define __NR_syscalls 240 + +/* +* All syscalls below here should go away really, +* these are provided for both review and as a porting +* help for the C library version. +* +* Last chance: are any of these important enought to +* enable by default? +*/ +#ifdef __ARCH_WANT_SYSCALL_NO_AT +#define __NR_open 1024 +__SYSCALL(__NR_open, sys_open) +#define __NR_link 1025 +__SYSCALL(__NR_link, sys_link) +#define __NR_unlink 1026 +__SYSCALL(__NR_unlink, sys_unlink) +#define __NR_mknod 1027 +__SYSCALL(__NR_mknod, sys_mknod) +#define __NR_chmod 1028 +__SYSCALL(__NR_chmod, sys_chmod) +#define __NR_chown 1029 +__SYSCALL(__NR_chown, sys_chown) +#define __NR_mkdir 1030 +__SYSCALL(__NR_mkdir, sys_mkdir) +#define __NR_rmdir 1031 +__SYSCALL(__NR_rmdir, sys_rmdir) +#define __NR_lchown 1032 +__SYSCALL(__NR_lchown, sys_lchown) +#define __NR_access 1033 +__SYSCALL(__NR_access, sys_access) +#define __NR_rename 1034 +__SYSCALL(__NR_rename, sys_rename) +#define __NR_readlink 1035 +__SYSCALL(__NR_readlink, sys_readlink) +#define __NR_symlink 1036 +__SYSCALL(__NR_symlink, sys_symlink) +#define __NR_utimes 1037 +__SYSCALL(__NR_utimes, sys_utimes) +#define __NR3264_stat 1038 +__SC_3264(__NR3264_stat, sys_stat64, sys_newstat) +#define __NR3264_lstat 1039 +__SC_3264(__NR3264_lstat, sys_lstat64, sys_newlstat) + +#undef __NR_syscalls +#define __NR_syscalls (__NR3264_lstat+1) +#endif /* __ARCH_WANT_SYSCALL_NO_AT */ + +#ifdef __ARCH_WANT_SYSCALL_NO_FLAGS +#define __NR_pipe 1040 +__SYSCALL(__NR_pipe, sys_pipe) +#define __NR_dup2 1041 +__SYSCALL(__NR_dup2, sys_dup2) +#define __NR_epoll_create 1042 +__SYSCALL(__NR_epoll_create, sys_epoll_create) +#define __NR_inotify_init 1043 +__SYSCALL(__NR_inotify_init, sys_inotify_init) +#define __NR_eventfd 1044 +__SYSCALL(__NR_eventfd, sys_eventfd) +#define __NR_signalfd 1045 +__SYSCALL(__NR_signalfd, sys_signalfd) + +#undef __NR_syscalls +#define __NR_syscalls (__NR_signalfd+1) +#endif /* __ARCH_WANT_SYSCALL_NO_FLAGS */ + +#if __BITS_PER_LONG ==32 && defined(__ARCH_WANT_SYSCALL_OFF_T) +#define __NR_sendfile 1046 +__SYSCALL(__NR_sendfile, sys_sendfile) +#define __NR_ftruncate 1047 +__SYSCALL(__NR_ftruncate, sys_ftruncate) +#define __NR_truncate 1048 +__SYSCALL(__NR_truncate, sys_truncate) +#define __NR_stat 1049 +__SYSCALL(__NR_stat, sys_newstat) +#define __NR_lstat 1050 +__SYSCALL(__NR_lstat, sys_newlstat) +#define __NR_fstat 1051 +__SYSCALL(__NR_fstat, sys_newfstat) +#define __NR_fcntl 1052 +__SYSCALL(__NR_fcntl, sys_fcntl) +#define __NR_fadvise64 1053 +#define __ARCH_WANT_SYS_FADVISE64 +__SYSCALL(__NR_fadvise64, sys_fadvise64) +#define __NR_newfstatat 1054 +#define __ARCH_WANT_SYS_NEWFSTATAT +__SYSCALL(__NR_newfstatat, sys_newfstatat) +#define __NR_fstatfs 1055 +__SYSCALL(__NR_fstatfs, sys_fstatfs) +#define __NR_statfs 1056 +__SYSCALL(__NR_statfs, sys_statfs) +#define __NR_lseek 1057 +__SYSCALL(__NR_lseek, sys_lseek) +#define __NR_mmap 1058 +__SYSCALL(__NR_mmap, sys_mmap) + +#undef __NR_syscalls +#define __NR_syscalls (__NR_mmap+1) +#endif /* 32 bit off_t syscalls */ + +#ifdef __ARCH_WANT_SYSCALL_DEPRECATED +#define __NR_alarm 1059 +#define __ARCH_WANT_SYS_ALARM +__SYSCALL(__NR_alarm, sys_alarm) +#define __NR_getpgrp 1060 +#define __ARCH_WANT_SYS_GETPGRP +__SYSCALL(__NR_getpgrp, sys_getpgrp) +#define __NR_pause 1061 +#define __ARCH_WANT_SYS_PAUSE +__SYSCALL(__NR_pause, sys_pause) +#define __NR_time 1062 +#define __ARCH_WANT_SYS_TIME +__SYSCALL(__NR_time, sys_time) +#define __NR_utime 1063 +#define __ARCH_WANT_SYS_UTIME +__SYSCALL(__NR_utime, sys_utime) + +#define __NR_creat 1064 +__SYSCALL(__NR_creat, sys_creat) +#define __NR_getdents 1065 +#define __ARCH_WANT_SYS_GETDENTS +__SYSCALL(__NR_getdents, sys_getdents) +#define __NR_futimesat 1066 +__SYSCALL(__NR_futimesat, sys_futimesat) +#define __NR_select 1067 +#define __ARCH_WANT_SYS_SELECT +__SYSCALL(__NR_select, sys_select) +#define __NR_poll 1068 +__SYSCALL(__NR_poll, sys_poll) +#define __NR_epoll_wait 1069 +__SYSCALL(__NR_epoll_wait, sys_epoll_wait) +#define __NR_ustat 1070 +__SYSCALL(__NR_ustat, sys_ustat) +#define __NR_vfork 1071 +__SYSCALL(__NR_vfork, sys_vfork) +#define __NR_wait4 1072 +__SYSCALL(__NR_wait4, sys_wait4) + +#define __NR_fork 1073 +#ifdef CONFIG_MMU +__SYSCALL(__NR_fork, sys_fork) +#else +__SYSCALL(__NR_fork, sys_ni_syscall) +#endif /* CONFIG_MMU */ + +#undef __NR_syscalls +#define __NR_syscalls (__NR_fork+1) + +#endif /* __ARCH_WANT_SYSCALL_DEPRECATED */ + +/* +* 32 bit systems traditionally used different +* syscalls for off_t and loff_t arguments, while +* 64 bit systems only need the off_t version. +* For new 32 bit platforms, there is no need to +* implement the old 32 bit off_t syscalls, so +* they take different names. +* Here we map the numbers so that both versions +* use the same syscall table layout. +*/ +#if __BITS_PER_LONG ==64 +#define __NR_fcntl __NR3264_fcntl +#define __NR_statfs __NR3264_statfs +#define __NR_fstatfs __NR3264_fstatfs +#define __NR_truncate __NR3264_truncate +#define __NR_ftruncate __NR3264_truncate +#define __NR_lseek __NR3264_lseek +#define __NR_sendfile __NR3264_sendfile +#define __NR_newfstatat __NR3264_fstatat +#define __NR_fstat __NR3264_fstat +#define __NR_mmap __NR3264_mmap +#define __NR_fadvise64 __NR3264_fadvise64 +#ifdef __NR3264_stat +#define __NR_stat __NR3264_stat +#define __NR_lstat __NR3264_lstat +#endif +#else +#define __NR_fcntl64 __NR3264_fcntl +#define __NR_statfs64 __NR3264_statfs +#define __NR_fstatfs64 __NR3264_fstatfs +#define __NR_truncate64 __NR3264_truncate +#define __NR_ftruncate64 __NR3264_truncate +#define __NR_llseek __NR3264_lseek +#define __NR_sendfile64 __NR3264_sendfile +#define __NR_fstatat64 __NR3264_fstatat +#define __NR_fstat64 __NR3264_fstat +#define __NR_mmap2 __NR3264_mmap +#define __NR_fadvise64_64 __NR3264_fadvise64 +#ifdef __NR3264_stat +#define __NR_stat64 __NR3264_stat +#define __NR_lstat64 __NR3264_lstat +#endif +#endif + +#ifdef __KERNEL__ + +/* +* These are required system calls, we should +* invert the logic eventually and let them +* be selected by default. +*/ +#if __BITS_PER_LONG ==32 +#define __ARCH_WANT_STAT64 +#define __ARCH_WANT_SYS_LLSEEK +#endif +#define __ARCH_WANT_SYS_RT_SIGACTION +#define __ARCH_WANT_SYS_RT_SIGSUSPEND + +/* +* "Conditional" syscalls +* +* What we want is __attribute__((weak,alias("sys_ni_syscall"))), +* but it doesn't work on all toolchains, so we just do it by hand +*/ +#ifndef cond_syscall +#define cond_syscall (x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +#endif + +#endif /* __KERNEL__ */ +#endif /* _ASM_GENERIC_UNISTD_H */
include/asm-generic/Kbuild +1 -0
@@ -27,6 +27,7 @@ header-y += termbits.h header-y += termios.h header-y += types.h header-y += ucontext.h +header-y += unistd.h unifdef-y += int-l64.h unifdef-y += int-ll64.h
scripts/checksyscalls.sh +89 -3
130 lines not on this page · raw message
[email protected]
maintainerRFC 12/17 asm-generic: add generic unaligned.h
In reply to [email protected]This implementation can be used by any architecture as a generic way to provide the unaligned helpers. Many architectures can override this by using linux/unaligned/access_ok.h.
---
include/asm-generic/unaligned.h | 30 30 + 0 - 0 !
1 file changed, 30 insertions(+) create mode 100644 include/asm-generic/unaligned.h
include/asm-generic/unaligned.h new file +30 -0
@@ -0,0 +1,30 @@ +#ifndef __ASM_GENERIC_UNALIGNED_H +#define __ASM_GENERIC_UNALIGNED_H + +/* +* This is the most generic implementation of unaligned accesses +* and should work almost anywhere. +* +* If an architecture can handle unaligned accesses in hardware, +* it may want to use the linux/unaligned/access_ok.h implementation +* instead. +*/ +#include <asm/byteorder.h> + +#if defined(__LITTLE_ENDIAN) +# include <linux/unaligned/le_struct.h> +# include <linux/unaligned/be_byteshift.h> +# include <linux/unaligned/generic.h> +# define get_unaligned __get_unaligned_le +# define put_unaligned __put_unaligned_le +#elif defined(__BIG_ENDIAN) +# include <linux/unaligned/be_struct.h> +# include <linux/unaligned/le_byteshift.h> +# include <linux/unaligned/generic.h> +# define get_unaligned __get_unaligned_be +# define put_unaligned __put_unaligned_be +#else +# error need to define endianess +#endif + +#endif /* __ASM_GENERIC_UNALIGNED_H */
[email protected]
maintainerRFC 13/17 ipc: use __ARCH_WANT_IPC_PARSE_VERSION in ipc/util.h
In reply to [email protected]The definition of ipc_parse_version depends on __ARCH_WANT_IPC_PARSE_VERSION, but the header file declares it conditionally based on the architecture.
Use the macro consistently to make it easier to add new architectures.
---
ipc/util.h | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)
ipc/util.h +1 -1
@@ -128,7 +128,7 @@ void ipc_update_perm(struct ipc64_perm *struct kern_ipc_perm *ipcctl_pre_down (struct ipc_ids *ids,int id,int cmd,struct ipc64_perm *perm,int extra_perm); -#if defined(__ia64__) || defined(__x86_64__) || defined(__hppa__) || defined(__XTENSA__) +#ifndef __ARCH_WANT_IPC_PARSE_VERSION/* On IA-64, we always use the "64-bit version" of the IPC structures. */ # define ipc_parse_version (cmd) IPC_64#else
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 14/17 syscalls.h add the missing sys_pipe2 declaration
In reply to [email protected]In order to build the generic syscall table, we need a declaration for every system call. sys_pipe2 was added without a proper declaration, so add this to syscalls.h now.
---
include/linux/syscalls.h | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)
include/linux/syscalls.h +1 -0
@@ -433,6 +433,7 @@ asmlinkage long sys_fcntl(unsigned int fasmlinkage long sys_fcntl64 (unsigned int fd,unsigned int cmd,unsigned long arg);#endif +asmlinkage long sys_pipe2 (int __user *fildes,int flags);asmlinkage long sys_dup (unsigned int fildes);asmlinkage long sys_dup2 (unsigned int oldfd,unsigned int newfd);asmlinkage long sys_dup3 (unsigned int oldfd,unsigned int newfd,int flags);
[email protected]
maintainerRFC 15/17 microblaze: fall back on generic header files for the ABI
In reply to [email protected]Almost all of the ABI relevant header files now have generic versions, so use those now in order to reduce the amount of architecture specific code.
---
arch/microblaze/include/asm/ioctls.h | 92 1 + 91 - 0 ! arch/microblaze/include/asm/ipcbuf.h | 37 1 + 36 - 0 ! arch/microblaze/include/asm/mman.h | 24 0 + 24 - 0 ! arch/microblaze/include/asm/msgbuf.h | 32 1 + 31 - 0 ! arch/microblaze/include/asm/param.h | 31 1 + 30 - 0 ! arch/microblaze/include/asm/posix_types.h | 80 14 + 66 - 0 ! arch/microblaze/include/asm/sembuf.h | 35 1 + 34 - 0 ! arch/microblaze/include/asm/shmbuf.h | 43 1 + 42 - 0 ! arch/microblaze/include/asm/siginfo.h | 14 0 + 14 - 0 ! arch/microblaze/include/asm/socket.h | 70 1 + 69 - 0 ! arch/microblaze/include/asm/sockios.h | 24 1 + 23 - 0 ! arch/microblaze/include/asm/stat.h | 74 1 + 73 - 0 ! arch/microblaze/include/asm/termbits.h | 204 1 + 203 - 0 ! arch/microblaze/include/asm/termios.h | 89 1 + 88 - 0 ! arch/microblaze/include/asm/types.h | 39 1 + 38 - 0 ! arch/microblaze/include/asm/ucontext.h | 23 1 + 22 - 0 ! 16 files changed, 27 insertions(+), 884 deletions(-)
arch/microblaze/include/asm/ioctls.h +1 -91
@@ -1,91 +1 @@ -/* -* Copyright (C) 2006 Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_IOCTLS_H -#define _ASM_MICROBLAZE_IOCTLS_H - -#include <linux/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -#define TIOCTTYGSTRUCT 0x5426/* For debugging only */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -/* Get Pty Number (of pty-mux device) */ -#define TIOCGPTN _IOR('T', 0x30, unsigned int) -#define TIOCSPTLCK _IOW('T', 0x31, int)/* Lock/unlock Pty */ - -#define FIONCLEX 0x5450/* these numbers need to be adjusted. */ -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ - -#define FIOQSIZE 0x545E - -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ - -#endif /* _ASM_MICROBLAZE_IOCTLS_H */ +#include <asm-generic/ioctls.h>
arch/microblaze/include/asm/ipcbuf.h +1 -36
@@ -1,36 +1 @@ -/* -* Copyright (C) 2006 Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_IPCBUF_H -#define _ASM_MICROBLAZE_IPCBUF_H - -/* -* The user_ipc_perm structure for microblaze architecture. -* Note extra padding because this structure is passed back and forth -* between kernel and user space. -* -* Pad space is left for: -* - 32-bit mode_t and seq -* - 2 miscellaneous 32-bit values -*/ - -struct ipc64_perm { -__kernel_key_t key; -__kernel_uid32_t uid; -__kernel_gid32_t gid; -__kernel_uid32_t cuid; -__kernel_gid32_t cgid; -__kernel_mode_t mode; -unsigned short __pad1; -unsigned short seq; -unsigned short __pad2; -unsigned long __unused1; -unsigned long __unused2; -}; - -#endif /* _ASM_MICROBLAZE_IPCBUF_H */ +#include <asm-generic/ipcbuf.h>
arch/microblaze/include/asm/mman.h +0 -24
@@ -1,25 +1 @@ -/* -* Copyright (C) 2006 Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_MMAN_H -#define _ASM_MICROBLAZE_MMAN_H -#include <asm-generic/mman.h> - -#define MAP_GROWSDOWN 0x0100/* stack-like segment */ -#define MAP_DENYWRITE 0x0800/* ETXTBSY */ -#define MAP_EXECUTABLE 0x1000/* mark it as an executable */ -#define MAP_LOCKED 0x2000/* pages are locked */ -#define MAP_NORESERVE 0x4000/* don't check for reservations */ -#define MAP_POPULATE 0x8000/* populate (prefault) pagetables */ -#define MAP_NONBLOCK 0x10000/* do not block on IO */ - -#define MCL_CURRENT 1/* lock all current mappings */ -#define MCL_FUTURE 2/* lock all future mappings */ - -#endif /* _ASM_MICROBLAZE_MMAN_H */
arch/microblaze/include/asm/msgbuf.h +1 -31
@@ -1,31 +1 @@ -#ifndef _ASM_MICROBLAZE_MSGBUF_H -#define _ASM_MICROBLAZE_MSGBUF_H - -/* -* The msqid64_ds structure for microblaze architecture. -* Note extra padding because this structure is passed back and forth -* between kernel and user space. -* -* Pad space is left for: -* - 64-bit time_t to solve y2038 problem -* - 2 miscellaneous 32-bit values -*/ - -struct msqid64_ds { -struct ipc64_perm msg_perm; -__kernel_time_t msg_stime;/* last msgsnd time */ -unsigned long __unused1; -__kernel_time_t msg_rtime;/* last msgrcv time */ -unsigned long __unused2; -__kernel_time_t msg_ctime;/* last change time */ -unsigned long __unused3; -unsigned long msg_cbytes;/* current number of bytes on queue */ -unsigned long msg_qnum;/* number of messages in queue */ -unsigned long msg_qbytes;/* max number of bytes on queue */ -__kernel_pid_t msg_lspid;/* pid of last msgsnd */ -__kernel_pid_t msg_lrpid;/* last receive pid */ -unsigned long __unused4; -unsigned long __unused5; -}; - -#endif /* _ASM_MICROBLAZE_MSGBUF_H */ +#include <asm-generic/msgbuf.h>
arch/microblaze/include/asm/param.h +1 -30
@@ -1,30 +1 @@ -/* -* Copyright (C) 2006 Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_PARAM_H -#define _ASM_MICROBLAZE_PARAM_H - -#ifdef __KERNEL__ -#define HZ CONFIG_HZ/* internal kernel timer frequency */ -#define USER_HZ 100/* for user interfaces in "ticks" */ -#define CLOCKS_PER_SEC (USER_HZ)/* frequency at which times() counts */ -#endif /* __KERNEL__ */ - -#ifndef HZ -#define HZ 100 -#endif - -#define EXEC_PAGESIZE 4096 - -#ifndef NOGROUP -#define NOGROUP (-1) -#endif - -#define MAXHOSTNAMELEN 64/* max length of hostname */ - -#endif /* _ASM_MICROBLAZE_PARAM_H */ +#include <asm-generic/param.h>
arch/microblaze/include/asm/posix_types.h +14 -66
87 lines not on this page · raw message
arch/microblaze/include/asm/sembuf.h +1 -34
@@ -1,34 +1 @@ -/* -* Copyright (C) 2006 Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_SEMBUF_H -#define _ASM_MICROBLAZE_SEMBUF_H - -/* -* The semid64_ds structure for microblaze architecture. -* Note extra padding because this structure is passed back and forth -* between kernel and user space. -* -* Pad space is left for: -* - 64-bit time_t to solve y2038 problem -* - 2 miscellaneous 32-bit values -*/ - -struct semid64_ds { -struct ipc64_perm sem_perm;/* permissions .. see ipc.h */ -__kernel_time_t sem_otime;/* last semop time */ -unsigned long __unused1; -__kernel_time_t sem_ctime;/* last change time */ -unsigned long __unused2; -unsigned long sem_nsems;/* no. of semaphores in array */ -unsigned long __unused3; -unsigned long __unused4; -}; - - -#endif /* _ASM_MICROBLAZE_SEMBUF_H */ +#include <asm-generic/sembuf.h>
arch/microblaze/include/asm/shmbuf.h +1 -42
43 lines not on this page · raw message
arch/microblaze/include/asm/siginfo.h +0 -14
@@ -1,15 +1 @@ -/* -* Copyright (C) 2006 Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_SIGINFO_H -#define _ASM_MICROBLAZE_SIGINFO_H - -#include <linux/types.h> #include <asm-generic/siginfo.h> - -#endif /* _ASM_MICROBLAZE_SIGINFO_H */
arch/microblaze/include/asm/socket.h +1 -69
70 lines not on this page · raw message
arch/microblaze/include/asm/sockios.h +1 -23
@@ -1,23 +1 @@ -/* -* Copyright (C) 2006 Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_SOCKIOS_H -#define _ASM_MICROBLAZE_SOCKIOS_H - -#include <linux/ioctl.h> - -/* Socket-level I/O control calls. */ -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906/* Get stamp (timeval) */ -#define SIOCGSTAMPNS 0x8907/* Get stamp (timespec) */ - -#endif /* _ASM_MICROBLAZE_SOCKIOS_H */ +#include <asm-generic/sockios.h>
arch/microblaze/include/asm/stat.h +1 -73
74 lines not on this page · raw message
arch/microblaze/include/asm/termbits.h +1 -203
204 lines not on this page · raw message
arch/microblaze/include/asm/termios.h +1 -88
89 lines not on this page · raw message
arch/microblaze/include/asm/types.h +1 -38
@@ -1,38 +1 @@ -/* -* Copyright (C) Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_TYPES_H -#define _ASM_MICROBLAZE_TYPES_H - -/* -* This file is never included by application software unless -* explicitly requested (e.g., via linux/types.h) in which case the -* application is Linux specific so (user-) name space pollution is -* not a major issue. However, for interoperability, libraries still -* need to be careful to avoid a name clashes. -*/ - -#include <asm-generic/int-ll64.h> - -# ifndef __ASSEMBLY__ - -typedef unsigned short umode_t ; - -/* -* These aren't exported outside the kernel to avoid name space clashes -*/ -# ifdef __KERNEL__ -# define BITS_PER_LONG 32 - -/* Dma addresses are 32-bits wide. */ - -typedef u32 dma_addr_t ; - -# endif /* __KERNEL__ */ -# endif /* __ASSEMBLY__ */ -#endif /* _ASM_MICROBLAZE_TYPES_H */ +#include <asm-generic/types.h>
arch/microblaze/include/asm/ucontext.h +1 -22
@@ -1,22 +1 @@ -/* -* Copyright (C) 2006 Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_UCONTEXT_H -#define _ASM_MICROBLAZE_UCONTEXT_H - -#include <asm/sigcontext.h> - -struct ucontext { -unsigned long uc_flags; -struct ucontext *uc_link; -stack_t uc_stack; -struct sigcontext uc_mcontext; -sigset_t uc_sigmask;/* mask last for extensibility */ -}; - -#endif /* _ASM_MICROBLAZE_UCONTEXT_H */ +#include <asm-generic/ucontext.h>
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 16/17 microblaze: clean up signal handling
In reply to [email protected]When legacy signal handling is disabled, the arch/microblaze/kernel/signal.c implementation can be much simpler, as most of it is handled generically from kernel/signal.c.
This is also a prerequisite for using the generic asm/unistd.h, which does not provide __NR_sigreturn, because this macro is referenced by the current signal.c implementation.
---
arch/microblaze/include/asm/signal.h | 166 1 + 165 - 0 ! arch/microblaze/include/asm/syscalls.h | 13 4 + 9 - 0 ! arch/microblaze/include/asm/thread_info.h | 11 11 + 0 - 0 ! arch/microblaze/include/asm/unistd.h | 2 1 + 1 - 0 ! arch/microblaze/kernel/signal.c | 250 38 + 212 - 0 ! 5 files changed, 55 insertions(+), 387 deletions(-)
arch/microblaze/include/asm/signal.h +1 -165
@@ -1,165 +1 @@ -/* -* Copyright (C) 2006 Atmark Techno, Inc. -* Yasushi SHOJI <yashi-9u97MdVgWv6RbxiC3EKwHAC/[email protected]> -* Tetsuya OHKAWA <tetsuya-9u97MdVgWv6RbxiC3EKwHAC/[email protected]> -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ - -#ifndef _ASM_MICROBLAZE_SIGNAL_H -#define _ASM_MICROBLAZE_SIGNAL_H - -#define SIGHUP 1 -#define SIGINT 2 -#define SIGQUIT 3 -#define SIGILL 4 -#define SIGTRAP 5 -#define SIGABRT 6 -#define SIGIOT 6 -#define SIGBUS 7 -#define SIGFPE 8 -#define SIGKILL 9 -#define SIGUSR1 10 -#define SIGSEGV 11 -#define SIGUSR2 12 -#define SIGPIPE 13 -#define SIGALRM 14 -#define SIGTERM 15 -#define SIGSTKFLT 16 -#define SIGCHLD 17 -#define SIGCONT 18 -#define SIGSTOP 19 -#define SIGTSTP 20 -#define SIGTTIN 21 -#define SIGTTOU 22 -#define SIGURG 23 -#define SIGXCPU 24 -#define SIGXFSZ 25 -#define SIGVTALRM 26 -#define SIGPROF 27 -#define SIGWINCH 28 -#define SIGIO 29 -#define SIGPOLL SIGIO -/* -#define SIGLOST 29 -*/ -#define SIGPWR 30 -#define SIGSYS 31 -#define SIGUNUSED 31 - -/* These should not be considered constants from userland. */ -#define SIGRTMIN 32 -#define SIGRTMAX _NSIG - -/* -* SA_FLAGS values: -* -* SA_ONSTACK indicates that a registered stack_t will be used. -* SA_RESTART flag to get restarting signals (which were the default long ago) -* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. -* SA_RESETHAND clears the handler when the signal is delivered. -* SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. -* SA_NODEFER prevents the current signal from being masked in the handler. -* -* SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single -* Unix names RESETHAND and NODEFER respectively. -*/ -#define SA_NOCLDSTOP 0x00000001 -#define SA_NOCLDWAIT 0x00000002 -#define SA_SIGINFO 0x00000004 -#define SA_ONSTACK 0x08000000 -#define SA_RESTART 0x10000000 -#define SA_NODEFER 0x40000000 -#define SA_RESETHAND 0x80000000 - -#define SA_NOMASK SA_NODEFER -#define SA_ONESHOT SA_RESETHAND - -#define SA_RESTORER 0x04000000 - -/* -* sigaltstack controls -*/ -#define SS_ONSTACK 1 -#define SS_DISABLE 2 - -#define MINSIGSTKSZ 2048 -#define SIGSTKSZ 8192 - -# ifndef __ASSEMBLY__ -# include <linux/types.h> -# include <asm-generic/signal-defs.h> - -/* Avoid too many header ordering problems. */ -struct siginfo ; - -# ifdef __KERNEL__ -/* -* Most things should be clean enough to redefine this at will, if care -* is taken to make libc match. -*/ -# define _NSIG 64 -# define _NSIG_BPW 32 -# define _NSIG_WORDS (_NSIG / _NSIG_BPW) - -typedef unsigned long old_sigset_t ;/* at least 32 bits */ - -typedef struct { -unsigned long sig[_NSIG_WORDS]; -}sigset_t ; - -struct old_sigaction { -__sighandler_t sa_handler; -old_sigset_t sa_mask; -unsigned long sa_flags; -void (*sa_restorer)(void ); -}; - -struct sigaction { -__sighandler_t sa_handler; -unsigned long sa_flags; -void (*sa_restorer)(void ); -sigset_t sa_mask;/* mask last for extensibility */ -}; - -struct k_sigaction { -struct sigaction sa; -}; - -# include <asm/sigcontext.h> -# undef __HAVE_ARCH_SIG_BITOPS - -# define ptrace_signal_deliver (regs, cookie) do { } while (0) - -# else /* !__KERNEL__ */ - -/* Here we must cater to libcs that poke about in kernel headers. */ - -# define NSIG 32 -typedef unsigned long sigset_t ; - -struct sigaction { -union { -__sighandler_t _sa_handler; -void (*_sa_sigaction)(int ,struct siginfo *,void *); - } _u; -sigset_t sa_mask; -unsigned long sa_flags; -void (*sa_restorer)(void ); -}; - -# define sa_handler _u._sa_handler -# define sa_sigaction _u._sa_sigaction - -# endif /* __KERNEL__ */ - -typedef struct sigaltstack { -void *ss_sp; -int ss_flags; -size_t ss_size; -}stack_t ; - -# endif /* __ASSEMBLY__ */ -#endif /* _ASM_MICROBLAZE_SIGNAL_H */ +#include <asm-generic/signal.h>
arch/microblaze/include/asm/syscalls.h +4 -9
@@ -26,20 +26,15 @@ asmlinkage unsigned long sys_mmap(unsign unsigned long fd, off_t offset);/* from signal.c */ -asmlinkage int sys_sigsuspend(old_sigset_t mask, struct pt_regs *regs); - -asmlinkage int sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, +asmlinkage long sys_rt_sigsuspend (sigset_t __user *unewset,size_t sigsetsize,struct pt_regs *regs); -asmlinkage int sys_sigaction(int sig, const struct old_sigaction *act, -struct old_sigaction *oact); - -asmlinkage int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, +asmlinkage long sys_sigaltstack (const stack_t __user *uss,stack_t __user *uoss,struct pt_regs *regs); -asmlinkage int sys_sigreturn(struct pt_regs *regs); +asmlinkage long sys_rt_sigaction (int sig,const struct sigaction __user * act,struct sigaction __user * oact,size_t sigsetsize); -asmlinkage int sys_rt_sigreturn(struct pt_regs *regs); +asmlinkage long sys_rt_sigreturn (struct pt_regs *regs);#endif /* __KERNEL__ */ #endif /* __ASM_MICROBLAZE_SYSCALLS_H */
arch/microblaze/include/asm/thread_info.h +11 -0
@@ -154,6 +154,17 @@ static inline struct thread_info *curren*/ /* FPU was used by this task this quantum (SMP) */ #define TS_USEDFPU 0x0001 +#define TS_RESTORE_SIGMASK 0x0002 + +#ifndef __ASSEMBLY__ +#define HAVE_SET_RESTORE_SIGMASK 1 +static inline void set_restore_sigmask (void ) +{ +struct thread_info *ti =current_thread_info (); + ti->status |=TS_RESTORE_SIGMASK ; +set_bit (TIF_SIGPENDING , (unsigned long *)&ti->flags); +} +#endif #endif /* __KERNEL__ */ #endif /* _ASM_MICROBLAZE_THREAD_INFO_H */
arch/microblaze/kernel/signal.c +38 -212
323 lines not on this page · raw message
arch/microblaze/include/asm/unistd.h +1 -1
@@ -408,7 +408,7 @@#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK#define __ARCH_WANT_SYS_RT_SIGACTION -/* #define __ARCH_WANT_SYS_RT_SIGSUSPEND */ +#define __ARCH_WANT_SYS_RT_SIGSUSPEND/* * "Conditional" syscalls
Signature · 4 lines
-- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
[email protected]
maintainerRFC 17/17 microblaze: use generic unistd.h syscall list
In reply to [email protected]This makes use of the generic system call list from asm-generic/unistd.h, and uses the same table to generate syscall_table.o.
The code is kept in microblaze for now, but could easily be moved to kernel/syscall_table.c at a later time when more architectures want to share it.
---
arch/microblaze/include/asm/unistd.h | 426 9 + 417 - 0 ! arch/microblaze/kernel/Makefile | 2 1 + 1 - 0 ! arch/microblaze/kernel/entry-nommu.S | 13 0 + 13 - 0 ! arch/microblaze/kernel/syscall_table.S | 367 0 + 367 - 0 ! arch/microblaze/kernel/syscall_table.c | 12 12 + 0 - 0 ! 5 files changed, 22 insertions(+), 798 deletions(-)
arch/microblaze/include/asm/unistd.h +9 -417
@@ -1,423 +1,15 @@ -/* -* Copyright (C) 2007-2008 Michal Simek <[email protected]> -* Copyright (C) 2006 Atmark Techno, Inc. -* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -*/ +#ifndef __MICROBLAZE_UNISTD_H +#define __MICROBLAZE_UNISTD_H -#ifndef _ASM_MICROBLAZE_UNISTD_H -#define _ASM_MICROBLAZE_UNISTD_H +#define __ARCH_HAVE_MMU +#define __ARCH_WANT_SYSCALL_NO_AT +#define __ARCH_WANT_SYSCALL_NOFLAGS +#define __ARCH_WANT_SYSCALL_OFF_T +#define __ARCH_WANT_SYSCALL_DEPRECATED -#define __NR_restart_syscall 0/* ok */ -#define __NR_exit 1/* ok */ -#define __NR_fork 2/* not for no MMU - weird */ -#define __NR_read 3/* ok */ -#define __NR_write 4/* ok */ -#define __NR_open 5/* openat */ -#define __NR_close 6/* ok */ -#define __NR_waitpid 7/* waitid */ -#define __NR_creat 8/* openat */ -#define __NR_link 9/* linkat */ -#define __NR_unlink 10/* unlinkat */ -#define __NR_execve 11/* ok */ -#define __NR_chdir 12/* ok */ -#define __NR_time 13/* obsolete -> sys_gettimeofday */ -#define __NR_mknod 14/* mknodat */ -#define __NR_chmod 15/* fchmodat */ -#define __NR_lchown 16/* ok */ -#define __NR_break 17/* don't know */ -#define __NR_oldstat 18/* remove */ -#define __NR_lseek 19/* ok */ -#define __NR_getpid 20/* ok */ -#define __NR_mount 21/* ok */ -#define __NR_umount 22/* ok */ /* use only umount2 */ -#define __NR_setuid 23/* ok */ -#define __NR_getuid 24/* ok */ -#define __NR_stime 25/* obsolete -> sys_settimeofday */ -#define __NR_ptrace 26/* ok */ -#define __NR_alarm 27/* obsolete -> sys_setitimer */ -#define __NR_oldfstat 28/* remove */ -#define __NR_pause 29/* obsolete -> sys_rt_sigtimedwait */ -#define __NR_utime 30/* obsolete -> sys_utimesat */ -#define __NR_stty 31/* remove */ -#define __NR_gtty 32/* remove */ -#define __NR_access 33/* faccessat */ -/* can be implemented by sys_setpriority */ -#define __NR_nice 34 -#define __NR_ftime 35/* remove */ -#define __NR_sync 36/* ok */ -#define __NR_kill 37/* ok */ -#define __NR_rename 38/* renameat */ -#define __NR_mkdir 39/* mkdirat */ -#define __NR_rmdir 40/* unlinkat */ -#define __NR_dup 41/* ok */ -#define __NR_pipe 42/* ok */ -#define __NR_times 43/* ok */ -#define __NR_prof 44/* remove */ -#define __NR_brk 45/* ok -mmu, nommu specific */ -#define __NR_setgid 46/* ok */ -#define __NR_getgid 47/* ok */ -#define __NR_signal 48/* obsolete -> sys_rt_sigaction */ -#define __NR_geteuid 49/* ok */ -#define __NR_getegid 50/* ok */ -#define __NR_acct 51/* add it and then I can disable it */ -#define __NR_umount2 52/* remove */ -#define __NR_lock 53/* remove */ -#define __NR_ioctl 54/* ok */ -#define __NR_fcntl 55/* ok -> 64bit version*/ -#define __NR_mpx 56/* remove */ -#define __NR_setpgid 57/* ok */ -#define __NR_ulimit 58/* remove */ -#define __NR_oldolduname 59/* remove */ -#define __NR_umask 60/* ok */ -#define __NR_chroot 61/* ok */ -#define __NR_ustat 62/* obsolete -> statfs64 */ -#define __NR_dup2 63/* ok */ -#define __NR_getppid 64/* ok */ -#define __NR_getpgrp 65/* obsolete -> sys_getpgid */ -#define __NR_setsid 66/* ok */ -#define __NR_sigaction 67/* obsolete -> rt_sigaction */ -#define __NR_sgetmask 68/* obsolete -> sys_rt_sigprocmask */ -#define __NR_ssetmask 69/* obsolete ->sys_rt_sigprocmask */ -#define __NR_setreuid 70/* ok */ -#define __NR_setregid 71/* ok */ -#define __NR_sigsuspend 72/* obsolete -> rt_sigsuspend */ -#define __NR_sigpending 73/* obsolete -> sys_rt_sigpending */ -#define __NR_sethostname 74/* ok */ -#define __NR_setrlimit 75/* ok */ -#define __NR_getrlimit 76/* ok Back compatible 2G limited rlimit */ -#define __NR_getrusage 77/* ok */ -#define __NR_gettimeofday 78/* ok */ -#define __NR_settimeofday 79/* ok */ -#define __NR_getgroups 80/* ok */ -#define __NR_setgroups 81/* ok */ -#define __NR_select 82/* obsolete -> sys_pselect7 */ -#define __NR_symlink 83/* symlinkat */ -#define __NR_oldlstat 84/* remove */ -#define __NR_readlink 85/* obsolete -> sys_readlinkat */ -#define __NR_uselib 86/* remove */ -#define __NR_swapon 87/* ok */ -#define __NR_reboot 88/* ok */ -#define __NR_readdir 89/* remove ? */ -#define __NR_mmap 90/* obsolete -> sys_mmap2 */ -#define __NR_munmap 91/* ok - mmu and nommu */ -#define __NR_truncate 92/* ok or truncate64 */ -#define __NR_ftruncate 93/* ok or ftruncate64 */ -#define __NR_fchmod 94/* ok */ -#define __NR_fchown 95/* ok */ -#define __NR_getpriority 96/* ok */ -#define __NR_setpriority 97/* ok */ -#define __NR_profil 98/* remove */ -#define __NR_statfs 99/* ok or statfs64 */ -#define __NR_fstatfs 100/* ok or fstatfs64 */ -#define __NR_ioperm 101/* remove */ -#define __NR_socketcall 102/* remove */ -#define __NR_syslog 103/* ok */ -#define __NR_setitimer 104/* ok */ -#define __NR_getitimer 105/* ok */ -#define __NR_stat 106/* remove */ -#define __NR_lstat 107/* remove */ -#define __NR_fstat 108/* remove */ -#define __NR_olduname 109/* remove */ -#define __NR_iopl 110/* remove */ -#define __NR_vhangup 111/* ok */ -#define __NR_idle 112/* remove */ -#define __NR_vm86old 113/* remove */ -#define __NR_wait4 114/* obsolete -> waitid */ -#define __NR_swapoff 115/* ok */ -#define __NR_sysinfo 116/* ok */ -#define __NR_ipc 117/* remove - direct call */ -#define __NR_fsync 118/* ok */ -#define __NR_sigreturn 119/* obsolete -> sys_rt_sigreturn */ -#define __NR_clone 120/* ok */ -#define __NR_setdomainname 121/* ok */ -#define __NR_uname 122/* remove */ -#define __NR_modify_ldt 123/* remove */ -#define __NR_adjtimex 124/* ok */ -#define __NR_mprotect 125/* remove */ -#define __NR_sigprocmask 126/* obsolete -> sys_rt_sigprocmask */ -#define __NR_create_module 127/* remove */ -#define __NR_init_module 128/* ok */ -#define __NR_delete_module 129/* ok */ -#define __NR_get_kernel_syms 130/* remove */ -#define __NR_quotactl 131/* ok */ -#define __NR_getpgid 132/* ok */ -#define __NR_fchdir 133/* ok */ -#define __NR_bdflush 134/* remove */ -#define __NR_sysfs 135/* needed for busybox */ -#define __NR_personality 136/* ok */ -#define __NR_afs_syscall 137/* Syscall for Andrew File System */ -#define __NR_setfsuid 138/* ok */ -#define __NR_setfsgid 139/* ok */ -#define __NR__llseek 140/* remove only lseek */ -#define __NR_getdents 141/* ok or getdents64 */ -#define __NR__newselect 142/* remove */ -#define __NR_flock 143/* ok */ -#define __NR_msync 144/* remove */ -#define __NR_readv 145/* ok */ -#define __NR_writev 146/* ok */ -#define __NR_getsid 147/* ok */ -#define __NR_fdatasync 148/* ok */ -#define __NR__sysctl 149/* remove */ -#define __NR_mlock 150/* ok - nommu or mmu */ -#define __NR_munlock 151/* ok - nommu or mmu */ -#define __NR_mlockall 152/* ok - nommu or mmu */ -#define __NR_munlockall 153/* ok - nommu or mmu */ -#define __NR_sched_setparam 154/* ok */ -#define __NR_sched_getparam 155/* ok */ -#define __NR_sched_setscheduler 156/* ok */ -#define __NR_sched_getscheduler 157/* ok */ -#define __NR_sched_yield 158/* ok */ -#define __NR_sched_get_priority_max 159/* ok */ -#define __NR_sched_get_priority_min 160/* ok */ -#define __NR_sched_rr_get_interval 161/* ok */ -#define __NR_nanosleep 162/* ok */ -#define __NR_mremap 163/* ok - nommu or mmu */ -#define __NR_setresuid 164/* ok */ -#define __NR_getresuid 165/* ok */ -#define __NR_vm86 166/* remove */ -#define __NR_query_module 167/* ok */ -#define __NR_poll 168/* obsolete -> sys_ppoll */ -#define __NR_nfsservctl 169/* ok */ -#define __NR_setresgid 170/* ok */ -#define __NR_getresgid 171/* ok */ -#define __NR_prctl 172/* ok */ -#define __NR_rt_sigreturn 173/* ok */ -#define __NR_rt_sigaction 174/* ok */ -#define __NR_rt_sigprocmask 175/* ok */ -#define __NR_rt_sigpending 176/* ok */ -#define __NR_rt_sigtimedwait 177/* ok */ -#define __NR_rt_sigqueueinfo 178/* ok */ -#define __NR_rt_sigsuspend 179/* ok */ -#define __NR_pread64 180/* ok */ -#define __NR_pwrite64 181/* ok */ -#define __NR_chown 182/* obsolete -> fchownat */ -#define __NR_getcwd 183/* ok */ -#define __NR_capget 184/* ok */ -#define __NR_capset 185/* ok */ -#define __NR_sigaltstack 186/* remove */ -#define __NR_sendfile 187/* ok -> exist 64bit version*/ -#define __NR_getpmsg 188/* remove */ -/* remove - some people actually want streams */ -#define __NR_putpmsg 189 -/* for noMMU - group with clone -> maybe remove */ -#define __NR_vfork 190 -#define __NR_ugetrlimit 191/* remove - SuS compliant getrlimit */ -#define __NR_mmap2 192/* ok */ -#define __NR_truncate64 193/* ok */ -#define __NR_ftruncate64 194/* ok */ -#define __NR_stat64 195/* remove _ARCH_WANT_STAT64 */ -#define __NR_lstat64 196/* remove _ARCH_WANT_STAT64 */ -#define __NR_fstat64 197/* remove _ARCH_WANT_STAT64 */ -#define __NR_lchown32 198/* ok - without 32 */ -#define __NR_getuid32 199/* ok - without 32 */ -#define __NR_getgid32 200/* ok - without 32 */ -#define __NR_geteuid32 201/* ok - without 32 */ -#define __NR_getegid32 202/* ok - without 32 */ -#define __NR_setreuid32 203/* ok - without 32 */ -#define __NR_setregid32 204/* ok - without 32 */ -#define __NR_getgroups32 205/* ok - without 32 */ -#define __NR_setgroups32 206/* ok - without 32 */ -#define __NR_fchown32 207/* ok - without 32 */ -#define __NR_setresuid32 208/* ok - without 32 */ -#define __NR_getresuid32 209/* ok - without 32 */ -#define __NR_setresgid32 210/* ok - without 32 */ -#define __NR_getresgid32 211/* ok - without 32 */ -#define __NR_chown32 212/* ok - without 32 -obsolete -> fchownat */ -#define __NR_setuid32 213/* ok - without 32 */ -#define __NR_setgid32 214/* ok - without 32 */ -#define __NR_setfsuid32 215/* ok - without 32 */ -#define __NR_setfsgid32 216/* ok - without 32 */ -#define __NR_pivot_root 217/* ok */ -#define __NR_mincore 218/* ok */ -#define __NR_madvise 219/* ok */ -#define __NR_getdents64 220/* ok */ -#define __NR_fcntl64 221/* ok */ -/* 223 is unused */ -#define __NR_gettid 224/* ok */ -#define __NR_readahead 225/* ok */ -#define __NR_setxattr 226/* ok */ -#define __NR_lsetxattr 227/* ok */ -#define __NR_fsetxattr 228/* ok */ -#define __NR_getxattr 229/* ok */ -#define __NR_lgetxattr 230/* ok */ -#define __NR_fgetxattr 231/* ok */ -#define __NR_listxattr 232/* ok */ -#define __NR_llistxattr 233/* ok */ -#define __NR_flistxattr 234/* ok */ -#define __NR_removexattr 235/* ok */ -#define __NR_lremovexattr 236/* ok */ -#define __NR_fremovexattr 237/* ok */ -#define __NR_tkill 238/* ok */ -#define __NR_sendfile64 239/* ok */ -#define __NR_futex 240/* ok */ -#define __NR_sched_setaffinity 241/* ok */ -#define __NR_sched_getaffinity 242/* ok */ -#define __NR_set_thread_area 243/* remove */ -#define __NR_get_thread_area 244/* remove */ -#define __NR_io_setup 245/* ok */ -#define __NR_io_destroy 246/* ok */ -#define __NR_io_getevents 247/* ok */ -#define __NR_io_submit 248/* ok */ -#define __NR_io_cancel 249/* ok */ -#define __NR_fadvise64 250/* remove -> sys_fadvise64_64 */ -/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */ -#define __NR_exit_group 252/* ok */ -#define __NR_lookup_dcookie 253/* ok */ -#define __NR_epoll_create 254/* ok */ -#define __NR_epoll_ctl 255/* ok */ -#define __NR_epoll_wait 256/* obsolete -> sys_epoll_pwait */ -#define __NR_remap_file_pages 257/* only for mmu */ -#define __NR_set_tid_address 258/* ok */ -#define __NR_timer_create 259/* ok */ -#define __NR_timer_settime (__NR_timer_create+1)/* 260 */ /* ok */ -#define __NR_timer_gettime (__NR_timer_create+2)/* 261 */ /* ok */ -#define __NR_timer_getoverrun (__NR_timer_create+3)/* 262 */ /* ok */ -#define __NR_timer_delete (__NR_timer_create+4)/* 263 */ /* ok */ -#define __NR_clock_settime (__NR_timer_create+5)/* 264 */ /* ok */ -#define __NR_clock_gettime (__NR_timer_create+6)/* 265 */ /* ok */ -#define __NR_clock_getres (__NR_timer_create+7)/* 266 */ /* ok */ -#define __NR_clock_nanosleep (__NR_timer_create+8)/* 267 */ /* ok */ -#define __NR_statfs64 268/* ok */ -#define __NR_fstatfs64 269/* ok */ -#define __NR_tgkill 270/* ok */ -#define __NR_utimes 271/* obsolete -> sys_futimesat */ -#define __NR_fadvise64_64 272/* ok */ -#define __NR_vserver 273/* ok */ -#define __NR_mbind 274/* only for mmu */ -#define __NR_get_mempolicy 275/* only for mmu */ -#define __NR_set_mempolicy 276/* only for mmu */ -#define __NR_mq_open 277/* ok */ -#define __NR_mq_unlink (__NR_mq_open+1)/* 278 */ /* ok */ -#define __NR_mq_timedsend (__NR_mq_open+2)/* 279 */ /* ok */ -#define __NR_mq_timedreceive (__NR_mq_open+3)/* 280 */ /* ok */ -#define __NR_mq_notify (__NR_mq_open+4)/* 281 */ /* ok */ -#define __NR_mq_getsetattr (__NR_mq_open+5)/* 282 */ /* ok */ -#define __NR_kexec_load 283/* ok */ -#define __NR_waitid 284/* ok */ -/* #define __NR_sys_setaltroot 285 */ -#define __NR_add_key 286/* ok */ -#define __NR_request_key 287/* ok */ -#define __NR_keyctl 288/* ok */ -#define __NR_ioprio_set 289/* ok */ -#define __NR_ioprio_get 290/* ok */ -#define __NR_inotify_init 291/* ok */ -#define __NR_inotify_add_watch 292/* ok */ -#define __NR_inotify_rm_watch 293/* ok */ -#define __NR_migrate_pages 294/* mmu */ -#define __NR_openat 295/* ok */ -#define __NR_mkdirat 296/* ok */ -#define __NR_mknodat 297/* ok */ -#define __NR_fchownat 298/* ok */ -#define __NR_futimesat 299/* obsolete -> sys_utimesat */ -#define __NR_fstatat64 300/* stat64 */ -#define __NR_unlinkat 301/* ok */ -#define __NR_renameat 302/* ok */ -#define __NR_linkat 303/* ok */ -#define __NR_symlinkat 304/* ok */ -#define __NR_readlinkat 305/* ok */ -#define __NR_fchmodat 306/* ok */ -#define __NR_faccessat 307/* ok */ -#define __NR_pselect6 308/* obsolete -> sys_pselect7 */ -#define __NR_ppoll 309/* ok */ -#define __NR_unshare 310/* ok */ -#define __NR_set_robust_list 311/* ok */ -#define __NR_get_robust_list 312/* ok */ -#define __NR_splice 313/* ok */ -#define __NR_sync_file_range 314/* ok */ -#define __NR_tee 315/* ok */ -#define __NR_vmsplice 316/* ok */ -#define __NR_move_pages 317/* mmu */ -#define __NR_getcpu 318/* ok */ -#define __NR_epoll_pwait 319/* ok */ -#define __NR_utimensat 320/* ok */ -#define __NR_signalfd 321/* ok */ -#define __NR_timerfd_create 322/* ok */ -#define __NR_eventfd 323/* ok */ -#define __NR_fallocate 324/* ok */ -#define __NR_semtimedop 325/* ok - semaphore group */ -#define __NR_timerfd_settime 326/* ok */ -#define __NR_timerfd_gettime 327/* ok */ -/* sysv ipc syscalls */ -#define __NR_semctl 328/* ok */ -#define __NR_semget 329/* ok */ -#define __NR_semop 330/* ok */ -#define __NR_msgctl 331/* ok */ -#define __NR_msgget 332/* ok */ -#define __NR_msgrcv 333/* ok */ -#define __NR_msgsnd 334/* ok */ -#define __NR_shmat 335/* ok */ -#define __NR_shmctl 336/* ok */ -#define __NR_shmdt 337/* ok */ -#define __NR_shmget 338/* ok */ - - -#define __NR_signalfd4 339/* new */ -#define __NR_eventfd2 340/* new */ -#define __NR_epoll_create1 341/* new */ -#define __NR_dup3 342/* new */ -#define __NR_pipe2 343/* new */ -#define __NR_inotify_init1 344/* new */ -#define __NR_socket 345/* new */ -#define __NR_socketpair 346/* new */ -#define __NR_bind 347/* new */ -#define __NR_listen 348/* new */ -#define __NR_accept 349/* new */ -#define __NR_connect 350/* new */ -#define __NR_getsockname 351/* new */ -#define __NR_getpeername 352/* new */ -#define __NR_sendto 353/* new */ -#define __NR_send 354/* new */ -#define __NR_recvfrom 355/* new */ -#define __NR_recv 356/* new */ -#define __NR_setsockopt 357/* new */ -#define __NR_getsockopt 358/* new */ -#define __NR_shutdown 359/* new */ -#define __NR_sendmsg 360/* new */ -#define __NR_recvmsg 361/* new */ -#define __NR_accept04 362/* new */ -#define __NR_preadv 363/* new */ -#define __NR_pwritev 364/* new */ - -#define __NR_syscalls 365 - -#ifdef __KERNEL__ -#ifndef __ASSEMBLY__ - -#define __ARCH_WANT_IPC_PARSE_VERSION -/* #define __ARCH_WANT_OLD_READDIR */ -/* #define __ARCH_WANT_OLD_STAT */ -#define __ARCH_WANT_STAT64 -#define __ARCH_WANT_SYS_ALARM -#define __ARCH_WANT_SYS_GETHOSTNAME -#define __ARCH_WANT_SYS_PAUSE -#define __ARCH_WANT_SYS_SGETMASK -#define __ARCH_WANT_SYS_SIGNAL -#define __ARCH_WANT_SYS_TIME -#define __ARCH_WANT_SYS_UTIME -#define __ARCH_WANT_SYS_WAITPID -#define __ARCH_WANT_SYS_SOCKETCALL -#define __ARCH_WANT_SYS_FADVISE64 -#define __ARCH_WANT_SYS_GETPGRP -#define __ARCH_WANT_SYS_LLSEEK -#define __ARCH_WANT_SYS_NICE -/* #define __ARCH_WANT_SYS_OLD_GETRLIMIT */ -#define __ARCH_WANT_SYS_OLDUMOUNT -#define __ARCH_WANT_SYS_SIGPENDING -#define __ARCH_WANT_SYS_SIGPROCMASK#define __ARCH_WANT_SYS_RT_SIGACTION#define __ARCH_WANT_SYS_RT_SIGSUSPEND -/* -* "Conditional" syscalls -* -* What we want is __attribute__((weak,alias("sys_ni_syscall"))), -* but it doesn't work on all toolchains, so we just do it by hand -*/ -#define cond_syscall (x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall"); +#endif /* __MICROBLAZE_UNISTD_H */ -#endif /* __ASSEMBLY__ */ -#endif /* __KERNEL__ */ -#endif /* _ASM_MICROBLAZE_UNISTD_H */ +#include <asm-generic/unistd.h>
arch/microblaze/kernel/syscall_table.S deleted +0 -367
367 lines not on this page · raw message
arch/microblaze/kernel/Makefile +1 -1
@@ -7,7 +7,7 @@ extra-y := head.o vmlinux.lds obj-y += exceptions.o \ hw_exception_handler.o init_task.o intc.o irq.o of_device.o \ of_platform.o process.o prom.o prom_parse.o ptrace.o \ - setup.o signal.o sys_microblaze.o timer.o traps.o + setup.o signal.o sys_microblaze.o timer.o traps.o syscall_table.o obj-y += cpu/
arch/microblaze/kernel/entry-nommu.S +0 -13
@@ -563,18 +563,10 @@ sys_execve_wrapper: brid sys_execve addk r8, r1, r0 -sys_sigreturn_wrapper: - brid sys_sigreturn - addk r5, r1, r0 - sys_rt_sigreturn_wrapper: brid sys_rt_sigreturn addk r5, r1, r0 -sys_sigsuspend_wrapper: - brid sys_rt_sigsuspend - addk r6, r1, r0 - sys_rt_sigsuspend_wrapper: brid sys_rt_sigsuspend addk r7, r1, r0
@@ -589,8 +581,3 @@ sys_rt_sigsuspend_wrapper: brai _hw_exception_handler .org 0x60 brai _debug_exception - -.section .rodata,"a" -#include "syscall_table.S" - -syscall_table_size=(.-sys_call_table)
arch/microblaze/kernel/syscall_table.c new file +12 -0
@@ -0,0 +1,12 @@ +#include <linux/syscalls.h> +#include <linux/signal.h> +#include <linux/unistd.h> + +#include <asm/syscalls.h> + +#undef __SYSCALL +#define __SYSCALL (nr, call) [nr] (call), + +void *sys_call_table[__NR_syscalls] = { +#include <asm/unistd.h> +};
Arnd Bergmann
maintainerdiff between asm-generic and x86 headers
In reply to [email protected]Since I haven't received any feedback on the contents of my proposed generic header files, here is a diff relative to the existing x86 headers, to make it easier to review.
I tried to use either the most sensible or the most common implementation for each part of the ABI, in some cases (e.g. unistd.h) rewriting the file from scratch.
Arnd <><
asm-generic/auxvec.h renamed from x86/include/asm/auxvec.h +5 -9
@@ -1,12 +1,8 @@ -#ifndef _ASM_X86_AUXVEC_H -#define _ASM_X86_AUXVEC_H +#ifndef __ASM_GENERIC_AUXVEC_H +#define __ASM_GENERIC_AUXVEC_H/* -* Architecture-neutral AT_ values in 0-17, leave some room -* for more of them, start the x86-specific ones at 32. +* Not all architectures need their own auxvec.h, the most +* common definitions are already in linux/auxvec.h. */ -#ifdef __i386__ -#define AT_SYSINFO 32 -#endif -#define AT_SYSINFO_EHDR 33 -#endif /* _ASM_X86_AUXVEC_H */ +#endif /* __ASM_GENERIC_AUXVEC_H */
asm-generic/bitsperlong.h renamed from x86/include/asm/bitsperlong.h +27 -8
@@ -1,13 +1,32 @@ -#ifndef __ASM_X86_BITSPERLONG_H -#define __ASM_X86_BITSPERLONG_H +#ifndef __ASM_GENERIC_BITS_PER_LONG +#define __ASM_GENERIC_BITS_PER_LONG -#ifdef __x86_64__ -# define __BITS_PER_LONG 64 -#else -# define __BITS_PER_LONG 32 +/* +* There seems to be no way of detecting this automatically from user +* space, so 64 bit architectures should override this in their +* bitsperlong.h. In particular, an architecture that supports +* both 32 and 64 bit user space must not rely on CONFIG_64BIT +* to decide it, but rather check a compiler provided macro. +*/ +#ifndef __BITS_PER_LONG +#define __BITS_PER_LONG 32#endif -#include <asm-generic/bitsperlong.h> +#ifdef __KERNEL__ + +#ifdef CONFIG_64BIT +#define BITS_PER_LONG 64 +#else +#define BITS_PER_LONG 32 +#endif /* CONFIG_64BIT */ -#endif /* __ASM_X86_BITSPERLONG_H */ +/* +* FIXME: The check currently breaks x86-64 build, so it's +* temporarily disabled. Please fix x86-64 and reenable +*/ +#if 0 &&BITS_PER_LONG != __BITS_PER_LONG +#error Inconsistent word size. Check asm/bitsperlong.h +#endif +#endif /* __KERNEL__ */ +#endif /* __ASM_GENERIC_BITS_PER_LONG */
asm-generic/ioctls.h renamed from x86/include/asm/ioctls.h +27 -11
@@ -1,12 +1,23 @@ -#ifndef _ASM_X86_IOCTLS_H -#define _ASM_X86_IOCTLS_H +#ifndef __ASM_GENERIC_IOCTLS_H +#define __ASM_GENERIC_IOCTLS_H -#include <asm/ioctl.h> +#include <linux/ioctl.h> + +/* +* These are the most common definitions for tty ioctl numbers. +* Most of them do not use the recommended _IOC(), but there is +* probably some source code out there hardcoding the number, +* so we might as well use them for all new platforms. +* +* The architectures that use different values here typically +* try to be compatible with some Unix variants for the same +* architecture. +*/ /* 0x54 is just a magic number to make these relatively unique ('T') */ #define TCGETS 0x5401 -#define TCSETS 0x5402/* Clashes with SNDCTL_TMR_START sound ioctl */ +#define TCSETS 0x5402#define TCSETSW 0x5403#define TCSETSF 0x5404#define TCGETA 0x5405
@@ -43,7 +54,6 @@#define TIOCSETD 0x5423#define TIOCGETD 0x5424#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */ #define TIOCSBRK 0x5427/* BSD compatibility */ #define TIOCCBRK 0x5428/* BSD compatibility */ #define TIOCGSID 0x5429/* Return the session ID of FD */
@@ -53,8 +63,7 @@#define TCSETSF2 _IOW('T', 0x2D, struct termios2)#define TIOCGRS485 0x542E#define TIOCSRS485 0x542F -#define TIOCGPTN _IOR('T', 0x30, unsigned int) -/* Get Pty Number (of pty-mux device) */ +#define TIOCGPTN _IOR('T', 0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T', 0x31, int)/* Lock/unlock Pty */ #define TCGETX 0x5432/* SYS5 TCGETX compatibility */ #define TCSETX 0x5433
@@ -76,9 +85,16 @@#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ -#define TIOCGHAYESESP 0x545E/* Get Hayes ESP configuration */ -#define TIOCSHAYESESP 0x545F/* Set Hayes ESP configuration */ -#define FIOQSIZE 0x5460 + +/* +* some architectures define FIOQSIZE as 0x545E, which is used for +* TIOCGHAYESESP on others +*/ +#ifndef FIOQSIZE +# define TIOCGHAYESESP 0x545E/* Get Hayes ESP configuration */ +# define TIOCSHAYESESP 0x545F/* Set Hayes ESP configuration */ +# define FIOQSIZE 0x5460 +#endif /* Used for packet mode */ #define TIOCPKT_DATA 0
@@ -91,4 +107,4 @@#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ -#endif /* _ASM_X86_IOCTLS_H */ +#endif /* __ASM_GENERIC_IOCTLS_H */
asm-generic/ipcbuf.h renamed from x86/include/asm/ipcbuf.h +10 -5
@@ -1,13 +1,18 @@ -#ifndef _ASM_X86_IPCBUF_H -#define _ASM_X86_IPCBUF_H +#ifndef __ASM_GENERIC_IPCBUF_H +#define __ASM_GENERIC_IPCBUF_H/* -* The ipc64_perm structure for x86 architecture. +* The generic ipc64_perm structure: * Note extra padding because this structure is passed back and forth * between kernel and user space. * +* ipc64_perm was originally meant to be architecture specific, but +* everyone just ended up making identical copies without specific +* optimizations, so we may just as well all use the same one. +* * Pad space is left for: -* - 32-bit mode_t and seq +* - 32-bit mode_t on architectures that only had 16 bit +* - 32-bit seq * - 2 miscellaneous 32-bit values */
@@ -25,4 +30,4 @@ unsigned long __unused2; }; -#endif /* _ASM_X86_IPCBUF_H */ +#endif /* __ASM_GENERIC_IPCBUF_H */
asm-generic/mman.h renamed from x86/include/asm/mman.h +3 -5
@@ -1,10 +1,8 @@ -#ifndef _ASM_X86_MMAN_H -#define _ASM_X86_MMAN_H +#ifndef __ASM_GENERIC_MMAN_H +#define __ASM_GENERIC_MMAN_H#include <asm-generic/mman-common.h> -#define MAP_32BIT 0x40/* only give out 32bit addresses */ -#define MAP_GROWSDOWN 0x0100/* stack-like segment */ #define MAP_DENYWRITE 0x0800/* ETXTBSY */ #define MAP_EXECUTABLE 0x1000/* mark it as an executable */
@@ -17,4 +15,4 @@#define MCL_CURRENT 1/* lock all current mappings */ #define MCL_FUTURE 2/* lock all future mappings */ -#endif /* _ASM_X86_MMAN_H */ +#endif /* __ASM_GENERIC_MMAN_H */
asm-generic/msgbuf.h renamed from x86/include/asm/msgbuf.h +19 -11
@@ -1,30 +1,38 @@ -#ifndef _ASM_X86_MSGBUF_H -#define _ASM_X86_MSGBUF_H +#ifndef __ASM_GENERIC_MSGBUF_H +#define __ASM_GENERIC_MSGBUF_H +#include <asm/bitsperlong.h> /* - * The msqid64_ds structure for i386 architecture. + * generic msqid64_ds structure. + * * Note extra padding because this structure is passed back and forth * between kernel and user space. * - * Pad space on i386 is left for: + * msqid64_ds was originally meant to be architecture specific, but + * everyone just ended up making identical copies without specific + * optimizations, so we may just as well all use the same one. + * + * 64 bit architectures typically define a 64 bit __kernel_time_t, + * so they do not need the first three padding words. + * On big-endian systems, the padding is in the wrong place. + * + * Pad space is left for: * - 64-bit time_t to solve y2038 problem * - 2 miscellaneous 32-bit values - * - * Pad space on x8664 is left for: - * - 2 miscellaneous 64-bit values */ + struct msqid64_ds { struct ipc64_perm msg_perm; __kernel_time_t msg_stime; /* last msgsnd time */ -#ifdef __i386__ +#if __BITS_PER_LONG != 64 unsigned long __unused1; #endif __kernel_time_t msg_rtime; /* last msgrcv time */ -#ifdef __i386__ +#if __BITS_PER_LONG != 64 unsigned long __unused2; #endif __kernel_time_t msg_ctime; /* last change time */ -#ifdef __i386__ +#if __BITS_PER_LONG != 64 unsigned long __unused3; #endif unsigned long msg_cbytes; /* current number of bytes on queue */
@@ -36,4 +44,4 @@ unsigned long __unused5; }; -#endif /* _ASM_X86_MSGBUF_H */ +#endif /* __ASM_GENERIC_MSGBUF_H */
asm-generic/param.h renamed from x86/include/asm/param.h +5 -3
@@ -1,5 +1,5 @@ -#ifndef _ASM_X86_PARAM_H -#define _ASM_X86_PARAM_H +#ifndef __ASM_GENERIC_PARAM_H +#define __ASM_GENERIC_PARAM_H#ifdef __KERNEL__# define HZ CONFIG_HZ/* Internal kernel timer frequency */
@@ -11,7 +11,9 @@#define HZ 100#endif +#ifndef EXEC_PAGESIZE #define EXEC_PAGESIZE 4096 +#endif #ifndef NOGROUP #define NOGROUP (-1)
@@ -19,4 +21,4 @@#define MAXHOSTNAMELEN 64/* max length of hostname */ -#endif /* _ASM_X86_PARAM_H */ +#endif /* __ASM_GENERIC_PARAM_H */
asm-generic/posix_types.h renamed from x86/include/asm/posix_types_64.h +106 -59
225 lines not on this page · raw message
asm-generic/sembuf.h renamed from x86/include/asm/sembuf.h +17 -3
@@ -1,11 +1,21 @@ -#ifndef _ASM_X86_SEMBUF_H -#define _ASM_X86_SEMBUF_H +#ifndef __ASM_GENERIC_SEMBUF_H +#define __ASM_GENERIC_SEMBUF_H + +#include <asm/bitsperlong.h> /* * The semid64_ds structure for x86 architecture. * Note extra padding because this structure is passed back and forth * between kernel and user space. * +* semid64_ds was originally meant to be architecture specific, but +* everyone just ended up making identical copies without specific +* optimizations, so we may just as well all use the same one. +* +* 64 bit architectures typically define a 64 bit __kernel_time_t, +* so they do not need the first two padding words. +* On big-endian systems, the padding is in the wrong place. +* * Pad space is left for: * - 64-bit time_t to solve y2038 problem * - 2 miscellaneous 32-bit values
@@ -13,12 +23,16 @@struct semid64_ds {struct ipc64_perm sem_perm;/* permissions .. see ipc.h */ __kernel_time_t sem_otime;/* last semop time */ +#if __BITS_PER_LONG !=64 unsigned long __unused1; +#endif __kernel_time_t sem_ctime;/* last change time */ +#if __BITS_PER_LONG !=64 unsigned long __unused2; +#endif unsigned long sem_nsems;/* no. of semaphores in array */ unsigned long __unused3;unsigned long __unused4; }; -#endif /* _ASM_X86_SEMBUF_H */ +#endif /* __ASM_GENERIC_SEMBUF_H */
asm-generic/setup.h renamed from x86/include/asm/setup.h +4 -149
155 lines not on this page · raw message
asm-generic/shmbuf.h renamed from x86/include/asm/shmbuf.h +18 -10
@@ -1,32 +1,40 @@ -#ifndef _ASM_X86_SHMBUF_H -#define _ASM_X86_SHMBUF_H +#ifndef __ASM_GENERIC_SHMBUF_H +#define __ASM_GENERIC_SHMBUF_H + +#include <asm/bitsperlong.h> /* * The shmid64_ds structure for x86 architecture. * Note extra padding because this structure is passed back and forth * between kernel and user space. * - * Pad space on 32 bit is left for: + * shmid64_ds was originally meant to be architecture specific, but + * everyone just ended up making identical copies without specific + * optimizations, so we may just as well all use the same one. + * + * 64 bit architectures typically define a 64 bit __kernel_time_t, + * so they do not need the first two padding words. + * On big-endian systems, the padding is in the wrong place. + * + * + * Pad space is left for: * - 64-bit time_t to solve y2038 problem * - 2 miscellaneous 32-bit values - * - * Pad space on 64 bit is left for: - * - 2 miscellaneous 64-bit values */ struct shmid64_ds { struct ipc64_perm shm_perm; /* operation perms */ size_t shm_segsz; /* size of segment (bytes) */ __kernel_time_t shm_atime; /* last attach time */ -#ifdef __i386__ +#if __BITS_PER_LONG != 64 unsigned long __unused1; #endif __kernel_time_t shm_dtime; /* last detach time */ -#ifdef __i386__ +#if __BITS_PER_LONG != 64 unsigned long __unused2; #endif __kernel_time_t shm_ctime; /* last change time */ -#ifdef __i386__ +#if __BITS_PER_LONG != 64 unsigned long __unused3; #endif __kernel_pid_t shm_cpid; /* pid of creator */
@@ -48,4 +56,4 @@ unsigned long __unused4; }; -#endif /* _ASM_X86_SHMBUF_H */ +#endif /* __ASM_GENERIC_SHMBUF_H */
asm-generic/shmparam.h renamed from x86/include/asm/shmparam.h +3 -3
@@ -1,6 +1,6 @@ -#ifndef _ASM_X86_SHMPARAM_H -#define _ASM_X86_SHMPARAM_H +#ifndef __ASM_GENERIC_SHMPARAM_H +#define __ASM_GENERIC_SHMPARAM_H#define SHMLBA PAGE_SIZE/* attach addr a multiple of this */ -#endif /* _ASM_X86_SHMPARAM_H */ +#endif /* _ASM_GENERIC_SHMPARAM_H */
asm-generic/signal.h renamed from x86/include/asm/signal.h +26 -159
242 lines not on this page · raw message
asm-generic/socket.h renamed from x86/include/asm/socket.h +3 -3
@@ -1,5 +1,5 @@ -#ifndef _ASM_X86_SOCKET_H -#define _ASM_X86_SOCKET_H +#ifndef __ASM_GENERIC_SOCKET_H +#define __ASM_GENERIC_SOCKET_H#include <asm/sockios.h>
@@ -57,4 +57,4 @@#define SO_TIMESTAMPING 37#define SCM_TIMESTAMPING SO_TIMESTAMPING -#endif /* _ASM_X86_SOCKET_H */ +#endif /* __ASM_GENERIC_SOCKET_H */
asm-generic/sockios.h renamed from x86/include/asm/sockios.h +3 -3
@@ -1,5 +1,5 @@ -#ifndef _ASM_X86_SOCKIOS_H -#define _ASM_X86_SOCKIOS_H +#ifndef __ASM_GENERIC_SOCKIOS_H +#define __ASM_GENERIC_SOCKIOS_H/* Socket-level I/O control calls. */ #define FIOSETOWN 0x8901
@@ -10,4 +10,4 @@#define SIOCGSTAMP 0x8906/* Get stamp (timeval) */ #define SIOCGSTAMPNS 0x8907/* Get stamp (timespec) */ -#endif /* _ASM_X86_SOCKIOS_H */ +#endif /* __ASM_GENERIC_SOCKIOS_H */
asm-generic/stat.h renamed from x86/include/asm/stat.h +61 -103
175 lines not on this page · raw message
asm-generic/swab.h renamed from x86/include/asm/swab.h +12 -55
73 lines not on this page · raw message
asm-generic/termbits.h renamed from x86/include/asm/termbits.h +4 -4
@@ -1,5 +1,5 @@ -#ifndef _ASM_X86_TERMBITS_H -#define _ASM_X86_TERMBITS_H +#ifndef __ASM_GENERIC_TERMBITS_H +#define __ASM_GENERIC_TERMBITS_H#include <linux/posix_types.h>
@@ -140,7 +140,7 @@#define HUPCL 0002000#define CLOCAL 0004000#define CBAUDEX 0010000 -#define BOTHER 0010000/* non standard rate */ +#define BOTHER 0010000#define B57600 0010001#define B115200 0010002#define B230400 0010003
@@ -195,4 +195,4 @@#define TCSADRAIN 1#define TCSAFLUSH 2 -#endif /* _ASM_X86_TERMBITS_H */ +#endif /* __ASM_GENERIC_TERMBITS_H */
asm-generic/termios.h renamed from x86/include/asm/termios.h +61 -20
107 lines not on this page · raw message
asm-generic/types.h renamed from x86/include/asm/types.h +22 -10
@@ -1,6 +1,9 @@ -#ifndef _ASM_X86_TYPES_H -#define _ASM_X86_TYPES_H - +#ifndef _ASM_GENERIC_TYPES_H +#define _ASM_GENERIC_TYPES_H +/* +* int-ll64 is used practically everywhere now, +* so use it as a reasonable default. +*/ #include <asm-generic/int-ll64.h> #ifndef __ASSEMBLY__
@@ -13,18 +16,27 @@* These aren't exported outside the kernel to avoid name space clashes */ #ifdef __KERNEL__ -#ifndef __ASSEMBLY__ - -typedef u64 dma64_addr_t ; -#if defined(CONFIG_X86_64 ) || defined(CONFIG_HIGHMEM64G ) -/* DMA addresses come in 32-bit and 64-bit flavours. */ +/* +* DMA addresses may be very different from physical addresses +* and pointers. i386 and powerpc may have 64 bit DMA on 32 bit +* systems, while sparc64 uses 32 bit DMA addresses for 64 bit +* physical addresses. +* This default defines dma_addr_t to have the same size as +* phys_addr_t, which is the most common way. +* Do not define the dma64_addr_t type, which never really +* worked. +*/ +#ifndef dma_addr_t +#ifdef CONFIG_PHYS_ADDR_T_64BIT typedef u64 dma_addr_t ;#else typedef u32 dma_addr_t ; -#endif +#endif /* CONFIG_PHYS_ADDR_T_64BIT */ +#endif /* dma_addr_t */ #endif /* __ASSEMBLY__ */ +#endif /* __KERNEL__ */ -#endif /* _ASM_X86_TYPES_H */ +#endif /* _ASM_GENERIC_TYPES_H */
asm-generic/ucontext.h renamed from x86/include/asm/ucontext.h +3 -9
@@ -1,11 +1,5 @@ -#ifndef _ASM_X86_UCONTEXT_H -#define _ASM_X86_UCONTEXT_H - -#define UC_FP_XSTATE 0x1 /* indicates the presence of extended state - * information in the memory layout pointed - * by the fpstate pointer in the ucontext's - * sigcontext struct (uc_mcontext). - */ +#ifndef __ASM_GENERIC_UCONTEXT_H +#define __ASM_GENERIC_UCONTEXT_H struct ucontext { unsigned long uc_flags;
@@ -15,4 +9,4 @@ sigset_t uc_sigmask; /* mask last for extensibility */ }; -#endif /* _ASM_X86_UCONTEXT_H */ +#endif /* __ASM_GENERIC_UCONTEXT_H */
asm-generic/unaligned.h renamed from x86/include/asm/unaligned.h +25 -9
@@ -1,14 +1,30 @@ -#ifndef _ASM_X86_UNALIGNED_H -#define _ASM_X86_UNALIGNED_H +#ifndef __ASM_GENERIC_UNALIGNED_H +#define __ASM_GENERIC_UNALIGNED_H/* -* The x86 can do unaligned accesses itself. +* This is the most generic implementation of unaligned accesses +* and should work almost anywhere. +* +* If an architecture can handle unaligned accesses in hardware, +* it may want to use the linux/unaligned/access_ok.h implementation +* instead. */ +#include <asm/byteorder.h> -#include <linux/unaligned/access_ok.h> -#include <linux/unaligned/generic.h> +#if defined(__LITTLE_ENDIAN) +# include <linux/unaligned/le_struct.h> +# include <linux/unaligned/be_byteshift.h> +# include <linux/unaligned/generic.h> +# define get_unaligned __get_unaligned_le +# define put_unaligned __put_unaligned_le +#elif defined(__BIG_ENDIAN) +# include <linux/unaligned/be_struct.h> +# include <linux/unaligned/le_byteshift.h> +# include <linux/unaligned/generic.h> +# define get_unaligned __get_unaligned_be +# define put_unaligned __put_unaligned_be +#else +# error need to define endianess +#endif -#define get_unaligned __get_unaligned_le -#define put_unaligned __put_unaligned_le - -#endif /* _ASM_X86_UNALIGNED_H */ +#endif /* __ASM_GENERIC_UNALIGNED_H */
asm-generic/unistd.h renamed from x86/include/asm/unistd_64.h +756 -612
1,453 lines not on this page · raw message