Commit 63b852a6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Arnd Bergmann

asm-generic: rename termios.h, signal.h and mman.h

The existing asm-generic versions are incomplete and included
by some architectures. New architectures should be able
to use a generic version, so rename the existing files and
change all users, which lets us add the new files.
Signed-off-by: default avatarRemis Lima Baima <remis.developer@googlemail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 07a2039b
...@@ -111,7 +111,7 @@ typedef unsigned long sigset_t; ...@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;
#define SIG_UNBLOCK 2 /* for unblocking signals */ #define SIG_UNBLOCK 2 /* for unblocking signals */
#define SIG_SETMASK 3 /* for setting the signal mask */ #define SIG_SETMASK 3 /* for setting the signal mask */
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct osf_sigaction { struct osf_sigaction {
......
#ifndef __ARM_MMAN_H__ #ifndef __ARM_MMAN_H__
#define __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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -111,7 +111,7 @@ typedef unsigned long sigset_t; ...@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
#ifndef __ASM_AVR32_MMAN_H__ #ifndef __ASM_AVR32_MMAN_H__
#define __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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -112,7 +112,7 @@ typedef unsigned long sigset_t; ...@@ -112,7 +112,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -55,7 +55,7 @@ struct termio { ...@@ -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" #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__ */ #endif /* __KERNEL__ */
......
...@@ -104,7 +104,7 @@ typedef unsigned long sigset_t; ...@@ -104,7 +104,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* verbatim copy of asm-i386/ version */ /* 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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -106,7 +106,7 @@ typedef unsigned long sigset_t; ...@@ -106,7 +106,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
#ifndef __ASM_MMAN_H__ #ifndef __ASM_MMAN_H__
#define __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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -52,7 +52,7 @@ struct termio { ...@@ -52,7 +52,7 @@ struct termio {
/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/termios.h> #include <asm-generic/termios-base.h>
#endif #endif
#endif /* _ASM_TERMIOS_H */ #endif /* _ASM_TERMIOS_H */
#ifndef __H8300_MMAN_H__ #ifndef __H8300_MMAN_H__
#define __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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -105,7 +105,7 @@ typedef unsigned long sigset_t; ...@@ -105,7 +105,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
*/ */
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
#define MAP_GROWSDOWN 0x00100 /* stack-like segment */ #define MAP_GROWSDOWN 0x00100 /* stack-like segment */
#define MAP_GROWSUP 0x00200 /* register stack-like segment */ #define MAP_GROWSUP 0x00200 /* register stack-like segment */
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
# ifndef __ASSEMBLY__ # ifndef __ASSEMBLY__
......
#ifndef __M32R_MMAN_H__ #ifndef __M32R_MMAN_H__
#define __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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -107,7 +107,7 @@ typedef unsigned long sigset_t; ...@@ -107,7 +107,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
#ifndef __M68K_MMAN_H__ #ifndef __M68K_MMAN_H__
#define __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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -103,7 +103,7 @@ typedef unsigned long sigset_t; ...@@ -103,7 +103,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
# ifndef __ASSEMBLY__ # ifndef __ASSEMBLY__
# include <linux/types.h> # include <linux/types.h>
# include <asm-generic/signal.h> # include <asm-generic/signal-defs.h>
/* Avoid too many header ordering problems. */ /* Avoid too many header ordering problems. */
struct siginfo; struct siginfo;
......
...@@ -81,7 +81,7 @@ struct termio { ...@@ -81,7 +81,7 @@ struct termio {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/termios.h> #include <asm-generic/termios-base.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -109,7 +109,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ ...@@ -109,7 +109,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */
#define SIG_UNBLOCK 2 /* for unblocking signals */ #define SIG_UNBLOCK 2 /* for unblocking signals */
#define SIG_SETMASK 3 /* for setting the signal mask */ #define SIG_SETMASK 3 /* for setting the signal mask */
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
struct sigaction { struct sigaction {
unsigned int sa_flags; unsigned int sa_flags;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef _ASM_MMAN_H #ifndef _ASM_MMAN_H
#define _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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -115,7 +115,7 @@ typedef unsigned long sigset_t; ...@@ -115,7 +115,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
#ifndef _ASM_POWERPC_MMAN_H #ifndef _ASM_POWERPC_MMAN_H
#define _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 * This program is free software; you can redistribute it and/or
......
...@@ -94,7 +94,7 @@ typedef struct { ...@@ -94,7 +94,7 @@ typedef struct {
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
struct old_sigaction { struct old_sigaction {
__sighandler_t sa_handler; __sighandler_t sa_handler;
......
...@@ -78,7 +78,7 @@ struct termio { ...@@ -78,7 +78,7 @@ struct termio {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm-generic/termios.h> #include <asm-generic/termios-base.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef __S390_MMAN_H__ #ifndef __S390_MMAN_H__
#define __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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -115,7 +115,7 @@ typedef unsigned long sigset_t; ...@@ -115,7 +115,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
...@@ -60,7 +60,7 @@ struct termio { ...@@ -60,7 +60,7 @@ struct termio {
#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) #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)) #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__ */ #endif /* __KERNEL__ */
......
#ifndef __ASM_SH_MMAN_H #ifndef __ASM_SH_MMAN_H
#define __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_GROWSDOWN 0x0100 /* stack-like segment */
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
......
...@@ -106,7 +106,7 @@ typedef unsigned long sigset_t; ...@@ -106,7 +106,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
......
#ifndef __SPARC_MMAN_H__ #ifndef __SPARC_MMAN_H__
#define __SPARC_MMAN_H__ #define __SPARC_MMAN_H__
#include <asm-generic/mman.h> #include <asm-generic/mman-common.h>
/* SunOS'ified... */ /* SunOS'ified... */
......
...@@ -176,7 +176,7 @@ struct sigstack { ...@@ -176,7 +176,7 @@ struct sigstack {
#define SA_STATIC_ALLOC 0x8000 #define SA_STATIC_ALLOC 0x8000
#endif #endif
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
struct __new_sigaction { struct __new_sigaction {
__sighandler_t sa_handler; __sighandler_t sa_handler;
......
#ifndef _ASM_X86_MMAN_H #ifndef _ASM_X86_MMAN_H
#define _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 */ #define MAP_32BIT 0x40 /* only give out 32bit addresses */
......
...@@ -117,7 +117,7 @@ typedef unsigned long sigset_t; ...@@ -117,7 +117,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
#include <asm-generic/signal.h> #include <asm-generic/signal-defs.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
...@@ -2,9 +2,9 @@ header-y += errno-base.h ...@@ -2,9 +2,9 @@ header-y += errno-base.h
header-y += errno.h header-y += errno.h
header-y += fcntl.h header-y += fcntl.h
header-y += ioctl.h header-y += ioctl.h
header-y += mman.h header-y += mman-common.h
header-y += poll.h header-y += poll.h
header-y += signal.h header-y += signal-defs.h
header-y += statfs.h header-y += statfs.h
unifdef-y += int-l64.h unifdef-y += int-l64.h
......
#ifndef _ASM_GENERIC_MMAN_H #ifndef __ASM_GENERIC_MMAN_COMMON_H
#define _ASM_GENERIC_MMAN_H #define __ASM_GENERIC_MMAN_COMMON_H
/* /*
Author: Michael S. Tsirkin <mst@mellanox.co.il>, Mellanox Technologies Ltd. Author: Michael S. Tsirkin <mst@mellanox.co.il>, Mellanox Technologies Ltd.
...@@ -38,4 +38,4 @@ ...@@ -38,4 +38,4 @@
/* compatibility flags */ /* compatibility flags */
#define MAP_FILE 0 #define MAP_FILE 0
#endif #endif /* __ASM_GENERIC_MMAN_COMMON_H */
#ifndef __ASM_GENERIC_SIGNAL_H #ifndef __ASM_GENERIC_SIGNAL_DEFS_H
#define __ASM_GENERIC_SIGNAL_H #define __ASM_GENERIC_SIGNAL_DEFS_H
#include <linux/compiler.h> #include <linux/compiler.h>
...@@ -25,4 +25,4 @@ typedef __restorefn_t __user *__sigrestore_t; ...@@ -25,4 +25,4 @@ typedef __restorefn_t __user *__sigrestore_t;
#define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */ #define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */
#endif #endif
#endif /* __ASM_GENERIC_SIGNAL_H */ #endif /* __ASM_GENERIC_SIGNAL_DEFS_H */
/* termios.h: generic termios/termio user copying/translation /* termios.h: generic termios/termio user copying/translation
*/ */
#ifndef _ASM_GENERIC_TERMIOS_H #ifndef _ASM_GENERIC_TERMIOS_BASE_H
#define _ASM_GENERIC_TERMIOS_H #define _ASM_GENERIC_TERMIOS_BASE_H
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -74,4 +74,4 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio, ...@@ -74,4 +74,4 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio,
#endif /* __ARCH_TERMIO_GETPUT */ #endif /* __ARCH_TERMIO_GETPUT */
#endif /* _ASM_GENERIC_TERMIOS_H */ #endif /* _ASM_GENERIC_TERMIOS_BASE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment