adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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: Remis Lima Baima <remis.developer@googlemail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2009-05-13 22:56:24 +00:00 committed by Arnd Bergmann
parent 07a2039b8e
commit 63b852a6b6
40 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/alpha/include/asm/signal.h
View file

@ -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 {

2
arch/arm/include/asm/mman.h
View file

@ -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 */

2
arch/arm/include/asm/signal.h
View file

@ -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 {

2
arch/avr32/include/asm/mman.h
View file

@ -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 */

2
arch/avr32/include/asm/signal.h
View file

@ -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 {

2
arch/avr32/include/asm/termios.h
View file

@ -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__ */

2
arch/blackfin/include/asm/signal.h
View file

@ -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 {

2
arch/cris/include/asm/mman.h
View file

@ -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 */

2
arch/cris/include/asm/signal.h
View file

@ -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 {

2
arch/frv/include/asm/mman.h
View file

@ -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 */

2
arch/frv/include/asm/termios.h
View file

@ -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 */

2
arch/h8300/include/asm/mman.h
View file

@ -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 */

2
arch/h8300/include/asm/signal.h
View file

@ -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 {

2
arch/ia64/include/asm/mman.h
View file

@ -8,7 +8,7 @@
* 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_GROWSUP 0x00200 /* register stack-like segment */

2
arch/ia64/include/asm/signal.h
View file

@ -114,7 +114,7 @@
#endif /* __KERNEL__ */
#include <asm-generic/signal.h>
#include <asm-generic/signal-defs.h>
# ifndef __ASSEMBLY__

2
arch/m32r/include/asm/mman.h
View file

@ -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 */

2
arch/m32r/include/asm/signal.h
View file

@ -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 {

2
arch/m68k/include/asm/mman.h
View file

@ -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 */

2
arch/m68k/include/asm/signal.h
View file

@ -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 {

2
arch/microblaze/include/asm/signal.h
View file

@ -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;

2
arch/microblaze/include/asm/termios.h
View file

@ -81,7 +81,7 @@ struct termio {
#ifdef __KERNEL__
#include <asm-generic/termios.h>
#include <asm-generic/termios-base.h>
#endif /* __KERNEL__ */

2
arch/mips/include/asm/signal.h
View file

@ -109,7 +109,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */
#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;

2
arch/mn10300/include/asm/mman.h
View file

@ -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 */

2
arch/mn10300/include/asm/signal.h
View file

@ -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 {

2
arch/powerpc/include/asm/mman.h
View file

@ -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

2
arch/powerpc/include/asm/signal.h
View file

@ -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;

2
arch/powerpc/include/asm/termios.h
View file

@ -78,7 +78,7 @@ struct termio {
#ifdef __KERNEL__
#include <asm-generic/termios.h>
#include <asm-generic/termios-base.h>
#endif /* __KERNEL__ */

2
arch/s390/include/asm/mman.h
View file

@ -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 */

2
arch/s390/include/asm/signal.h
View file

@ -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 {

2
arch/s390/include/asm/termios.h
View file

@ -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__ */

2
arch/sh/include/asm/mman.h
View file

@ -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 */

2
arch/sh/include/asm/signal.h
View file

@ -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 {

2
arch/sparc/include/asm/mman.h
View file

@ -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... */

2
arch/sparc/include/asm/signal.h
View file

@ -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;

2
arch/x86/include/asm/mman.h
View file

@ -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 */

2
arch/x86/include/asm/signal.h
View file

@ -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__

4
include/asm-generic/Kbuild
View file

@ -2,9 +2,9 @@ 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.h
header-y += signal-defs.h
header-y += statfs.h
unifdef-y += int-l64.h

6
include/asm-generic/mman.h → include/asm-generic/mman-common.h
View file

@ -1,5 +1,5 @@
#ifndef _ASM_GENERIC_MMAN_H
#define _ASM_GENERIC_MMAN_H
#ifndef __ASM_GENERIC_MMAN_COMMON_H
#define __ASM_GENERIC_MMAN_COMMON_H
/*
Author: Michael S. Tsirkin <mst@mellanox.co.il>, Mellanox Technologies Ltd.
@ -38,4 +38,4 @@
/* compatibility flags */
#define MAP_FILE 0
#endif
#endif /* __ASM_GENERIC_MMAN_COMMON_H */

6
include/asm-generic/signal.h → include/asm-generic/signal-defs.h
View file

@ -1,5 +1,5 @@
#ifndef __ASM_GENERIC_SIGNAL_H
#define __ASM_GENERIC_SIGNAL_H
#ifndef __ASM_GENERIC_SIGNAL_DEFS_H
#define __ASM_GENERIC_SIGNAL_DEFS_H
#include <linux/compiler.h>
@ -25,4 +25,4 @@ typedef __restorefn_t __user *__sigrestore_t;
#define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */
#endif
#endif /* __ASM_GENERIC_SIGNAL_H */
#endif /* __ASM_GENERIC_SIGNAL_DEFS_H */

6
include/asm-generic/termios.h → include/asm-generic/termios-base.h
View file

@ -1,8 +1,8 @@
/* termios.h: generic termios/termio user copying/translation
*/
#ifndef _ASM_GENERIC_TERMIOS_H
#define _ASM_GENERIC_TERMIOS_H
#ifndef _ASM_GENERIC_TERMIOS_BASE_H
#define _ASM_GENERIC_TERMIOS_BASE_H
#include <asm/uaccess.h>
@ -74,4 +74,4 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio,
#endif /* __ARCH_TERMIO_GETPUT */
#endif /* _ASM_GENERIC_TERMIOS_H */
#endif /* _ASM_GENERIC_TERMIOS_BASE_H */