Commit 02a650e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'disintegrate-misc-arches-20121010' of...

Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers

Pull UAPI disintegration for misc arches from David Howells:
 "UAPI disintegration for MN10300, FRV and AVR32 arches"

* tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate arch/mn10300/include/asm
  UAPI: (Scripted) Disintegrate arch/frv/include/asm
  UAPI: (Scripted) Disintegrate arch/avr32/include/asm
parents b6897130 7190632b
include include/asm-generic/Kbuild.asm
generic-y += clkdev.h
generic-y += exec.h
header-y += cachectl.h
#ifndef __ASM_AVR32_PARAM_H
#define __ASM_AVR32_PARAM_H
#ifdef __KERNEL__
#include <uapi/asm/param.h>
# define HZ CONFIG_HZ
# define USER_HZ 100 /* User interfaces are in "ticks" */
# define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */
#endif
#ifndef HZ
# define HZ 100
#endif
/* TODO: Should be configurable */
#define EXEC_PAGESIZE 4096
#ifndef NOGROUP
# define NOGROUP (-1)
#endif
#define MAXHOSTNAMELEN 64
#endif /* __ASM_AVR32_PARAM_H */
......@@ -8,119 +8,9 @@
#ifndef __ASM_AVR32_PTRACE_H
#define __ASM_AVR32_PTRACE_H
#define PTRACE_GETREGS 12
#define PTRACE_SETREGS 13
/*
* Status Register bits
*/
#define SR_H 0x20000000
#define SR_J 0x10000000
#define SR_DM 0x08000000
#define SR_D 0x04000000
#define MODE_NMI 0x01c00000
#define MODE_EXCEPTION 0x01800000
#define MODE_INT3 0x01400000
#define MODE_INT2 0x01000000
#define MODE_INT1 0x00c00000
#define MODE_INT0 0x00800000
#define MODE_SUPERVISOR 0x00400000
#define MODE_USER 0x00000000
#define MODE_MASK 0x01c00000
#define SR_EM 0x00200000
#define SR_I3M 0x00100000
#define SR_I2M 0x00080000
#define SR_I1M 0x00040000
#define SR_I0M 0x00020000
#define SR_GM 0x00010000
#define SR_H_BIT 29
#define SR_J_BIT 28
#define SR_DM_BIT 27
#define SR_D_BIT 26
#define MODE_SHIFT 22
#define SR_EM_BIT 21
#define SR_I3M_BIT 20
#define SR_I2M_BIT 19
#define SR_I1M_BIT 18
#define SR_I0M_BIT 17
#define SR_GM_BIT 16
/* The user-visible part */
#define SR_L 0x00000020
#define SR_Q 0x00000010
#define SR_V 0x00000008
#define SR_N 0x00000004
#define SR_Z 0x00000002
#define SR_C 0x00000001
#define SR_L_BIT 5
#define SR_Q_BIT 4
#define SR_V_BIT 3
#define SR_N_BIT 2
#define SR_Z_BIT 1
#define SR_C_BIT 0
/*
* The order is defined by the stmts instruction. r0 is stored first,
* so it gets the highest address.
*
* Registers 0-12 are general-purpose registers (r12 is normally used for
* the function return value).
* Register 13 is the stack pointer
* Register 14 is the link register
* Register 15 is the program counter (retrieved from the RAR sysreg)
*/
#define FRAME_SIZE_FULL 72
#define REG_R12_ORIG 68
#define REG_R0 64
#define REG_R1 60
#define REG_R2 56
#define REG_R3 52
#define REG_R4 48
#define REG_R5 44
#define REG_R6 40
#define REG_R7 36
#define REG_R8 32
#define REG_R9 28
#define REG_R10 24
#define REG_R11 20
#define REG_R12 16
#define REG_SP 12
#define REG_LR 8
#define FRAME_SIZE_MIN 8
#define REG_PC 4
#define REG_SR 0
#include <uapi/asm/ptrace.h>
#ifndef __ASSEMBLY__
struct pt_regs {
/* These are always saved */
unsigned long sr;
unsigned long pc;
/* These are sometimes saved */
unsigned long lr;
unsigned long sp;
unsigned long r12;
unsigned long r11;
unsigned long r10;
unsigned long r9;
unsigned long r8;
unsigned long r7;
unsigned long r6;
unsigned long r5;
unsigned long r4;
unsigned long r3;
unsigned long r2;
unsigned long r1;
unsigned long r0;
/* Only saved on system call */
unsigned long r12_orig;
};
#ifdef __KERNEL__
#include <asm/ocd.h>
......@@ -150,8 +40,5 @@ static __inline__ int valid_user_regs(struct pt_regs *regs)
}
#endif /* __KERNEL__ */
#endif /* ! __ASSEMBLY__ */
#endif /* __ASM_AVR32_PTRACE_H */
......@@ -11,9 +11,8 @@
#ifndef __ASM_AVR32_SETUP_H__
#define __ASM_AVR32_SETUP_H__
#define COMMAND_LINE_SIZE 256
#include <uapi/asm/setup.h>
#ifdef __KERNEL__
/* Magic number indicating that a tag table is present */
#define ATAG_MAGIC 0xa2a25441
......@@ -142,6 +141,4 @@ void setup_processor(void);
#endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* __ASM_AVR32_SETUP_H__ */
......@@ -8,12 +8,8 @@
#ifndef __ASM_AVR32_SIGNAL_H
#define __ASM_AVR32_SIGNAL_H
#include <linux/types.h>
#include <uapi/asm/signal.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. */
......@@ -27,94 +23,6 @@ typedef struct {
unsigned long sig[_NSIG_WORDS];
} sigset_t;
#else
/* Here we must cater to libcs that poke about in kernel headers. */
#define NSIG 32
typedef unsigned long sigset_t;
#endif /* __KERNEL__ */
#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-1)
/*
* SA_FLAGS values:
*
* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
* SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
* SA_SIGINFO deliver the signal with SIGINFO structs
* 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_NODEFER prevents the current signal from being masked in the handler.
* SA_RESETHAND clears the handler when the signal is delivered.
*
* 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_RESTORER 0x04000000
#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
/*
* sigaltstack controls
*/
#define SS_ONSTACK 1
#define SS_DISABLE 2
#define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192
#include <asm-generic/signal-defs.h>
#ifdef __KERNEL__
struct sigaction {
__sighandler_t sa_handler;
unsigned long sa_flags;
......@@ -125,37 +33,10 @@ struct sigaction {
struct k_sigaction {
struct sigaction sa;
};
#else
/* Here we must cater to libcs that poke about in kernel headers. */
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 __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
......@@ -8,45 +8,8 @@
#ifndef __ASM_AVR32_TERMIOS_H
#define __ASM_AVR32_TERMIOS_H
#include <asm/termbits.h>
#include <asm/ioctls.h>
#include <uapi/asm/termios.h>
struct winsize {
unsigned short ws_row;
unsigned short ws_col;
unsigned short ws_xpixel;
unsigned short ws_ypixel;
};
#define NCC 8
struct termio {
unsigned short c_iflag; /* input mode flags */
unsigned short c_oflag; /* output mode flags */
unsigned short c_cflag; /* control mode flags */
unsigned short c_lflag; /* local mode flags */
unsigned char c_line; /* line discipline */
unsigned char c_cc[NCC]; /* control characters */
};
/* modem lines */
#define TIOCM_LE 0x001
#define TIOCM_DTR 0x002
#define TIOCM_RTS 0x004
#define TIOCM_ST 0x008
#define TIOCM_SR 0x010
#define TIOCM_CTS 0x020
#define TIOCM_CAR 0x040
#define TIOCM_RNG 0x080
#define TIOCM_DSR 0x100
#define TIOCM_CD TIOCM_CAR
#define TIOCM_RI TIOCM_RNG
#define TIOCM_OUT1 0x2000
#define TIOCM_OUT2 0x4000
#define TIOCM_LOOP 0x8000
/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
#ifdef __KERNEL__
/* intr=^C quit=^\ erase=del kill=^U
eof=^D vtime=\0 vmin=\1 sxtc=\0
start=^Q stop=^S susp=^Z eol=\0
......@@ -57,6 +20,4 @@ struct termio {
#include <asm-generic/termios-base.h>
#endif /* __KERNEL__ */
#endif /* __ASM_AVR32_TERMIOS_H */
......@@ -8,16 +8,12 @@
#ifndef __ASM_AVR32_TYPES_H
#define __ASM_AVR32_TYPES_H
#include <asm-generic/int-ll64.h>
#include <uapi/asm/types.h>
/*
* These aren't exported outside the kernel to avoid name space clashes
*/
#ifdef __KERNEL__
#define BITS_PER_LONG 32
#endif /* __KERNEL__ */
#endif /* __ASM_AVR32_TYPES_H */
......@@ -8,300 +8,8 @@
#ifndef __ASM_AVR32_UNISTD_H
#define __ASM_AVR32_UNISTD_H
/*
* This file contains the system call numbers.
*/
#define __NR_restart_syscall 0
#define __NR_exit 1
#define __NR_fork 2
#define __NR_read 3
#define __NR_write 4
#define __NR_open 5
#define __NR_close 6
#define __NR_umask 7
#define __NR_creat 8
#define __NR_link 9
#define __NR_unlink 10
#define __NR_execve 11
#define __NR_chdir 12
#define __NR_time 13
#define __NR_mknod 14
#define __NR_chmod 15
#define __NR_chown 16
#define __NR_lchown 17
#define __NR_lseek 18
#define __NR__llseek 19
#define __NR_getpid 20
#define __NR_mount 21
#define __NR_umount2 22
#define __NR_setuid 23
#define __NR_getuid 24
#define __NR_stime 25
#define __NR_ptrace 26
#define __NR_alarm 27
#define __NR_pause 28
#define __NR_utime 29
#define __NR_stat 30
#define __NR_fstat 31
#define __NR_lstat 32
#define __NR_access 33
#define __NR_chroot 34
#define __NR_sync 35
#define __NR_fsync 36
#define __NR_kill 37
#define __NR_rename 38
#define __NR_mkdir 39
#define __NR_rmdir 40
#define __NR_dup 41
#define __NR_pipe 42
#define __NR_times 43
#define __NR_clone 44
#define __NR_brk 45
#define __NR_setgid 46
#define __NR_getgid 47
#define __NR_getcwd 48
#define __NR_geteuid 49
#define __NR_getegid 50
#define __NR_acct 51
#define __NR_setfsuid 52
#define __NR_setfsgid 53
#define __NR_ioctl 54
#define __NR_fcntl 55
#define __NR_setpgid 56
#define __NR_mremap 57
#define __NR_setresuid 58
#define __NR_getresuid 59
#define __NR_setreuid 60
#define __NR_setregid 61
#define __NR_ustat 62
#define __NR_dup2 63
#define __NR_getppid 64
#define __NR_getpgrp 65
#define __NR_setsid 66
#define __NR_rt_sigaction 67
#define __NR_rt_sigreturn 68
#define __NR_rt_sigprocmask 69
#define __NR_rt_sigpending 70
#define __NR_rt_sigtimedwait 71
#define __NR_rt_sigqueueinfo 72
#define __NR_rt_sigsuspend 73
#define __NR_sethostname 74
#define __NR_setrlimit 75
#define __NR_getrlimit 76 /* SuS compliant getrlimit */
#define __NR_getrusage 77
#define __NR_gettimeofday 78
#define __NR_settimeofday 79
#define __NR_getgroups 80
#define __NR_setgroups 81
#define __NR_select 82
#define __NR_symlink 83
#define __NR_fchdir 84
#define __NR_readlink 85
#define __NR_pread 86
#define __NR_pwrite 87
#define __NR_swapon 88
#define __NR_reboot 89
#define __NR_mmap2 90
#define __NR_munmap 91
#define __NR_truncate 92
#define __NR_ftruncate 93
#define __NR_fchmod 94
#define __NR_fchown 95
#define __NR_getpriority 96
#define __NR_setpriority 97
#define __NR_wait4 98
#define __NR_statfs 99
#define __NR_fstatfs 100
#define __NR_vhangup 101
#define __NR_sigaltstack 102
#define __NR_syslog 103
#define __NR_setitimer 104
#define __NR_getitimer 105
#define __NR_swapoff 106
#define __NR_sysinfo 107
/* 108 was __NR_ipc for a little while */
#define __NR_sendfile 109
#define __NR_setdomainname 110
#define __NR_uname 111
#define __NR_adjtimex 112
#define __NR_mprotect 113
#define __NR_vfork 114
#define __NR_init_module 115
#define __NR_delete_module 116
#define __NR_quotactl 117
#define __NR_getpgid 118
#define __NR_bdflush 119
#define __NR_sysfs 120
#define __NR_personality 121
#define __NR_afs_syscall 122 /* Syscall for Andrew File System */
#define __NR_getdents 123
#define __NR_flock 124
#define __NR_msync 125
#define __NR_readv 126
#define __NR_writev 127
#define __NR_getsid 128
#define __NR_fdatasync 129
#define __NR__sysctl 130
#define __NR_mlock 131
#define __NR_munlock 132
#define __NR_mlockall 133
#define __NR_munlockall 134
#define __NR_sched_setparam 135
#define __NR_sched_getparam 136
#define __NR_sched_setscheduler 137
#define __NR_sched_getscheduler 138
#define __NR_sched_yield 139
#define __NR_sched_get_priority_max 140
#define __NR_sched_get_priority_min 141
#define __NR_sched_rr_get_interval 142
#define __NR_nanosleep 143
#define __NR_poll 144
#define __NR_nfsservctl 145
#define __NR_setresgid 146
#define __NR_getresgid 147
#define __NR_prctl 148
#define __NR_socket 149
#define __NR_bind 150
#define __NR_connect 151
#define __NR_listen 152
#define __NR_accept 153
#define __NR_getsockname 154
#define __NR_getpeername 155
#define __NR_socketpair 156
#define __NR_send 157
#define __NR_recv 158
#define __NR_sendto 159
#define __NR_recvfrom 160
#define __NR_shutdown 161
#define __NR_setsockopt 162
#define __NR_getsockopt 163
#define __NR_sendmsg 164
#define __NR_recvmsg 165
#define __NR_truncate64 166
#define __NR_ftruncate64 167
#define __NR_stat64 168
#define __NR_lstat64 169
#define __NR_fstat64 170
#define __NR_pivot_root 171
#define __NR_mincore 172
#define __NR_madvise 173
#define __NR_getdents64 174
#define __NR_fcntl64 175
#define __NR_gettid 176
#define __NR_readahead 177
#define __NR_setxattr 178
#define __NR_lsetxattr 179
#define __NR_fsetxattr 180
#define __NR_getxattr 181
#define __NR_lgetxattr 182
#define __NR_fgetxattr 183
#define __NR_listxattr 184
#define __NR_llistxattr 185
#define __NR_flistxattr 186
#define __NR_removexattr 187
#define __NR_lremovexattr 188
#define __NR_fremovexattr 189
#define __NR_tkill 190
#define __NR_sendfile64 191
#define __NR_futex 192
#define __NR_sched_setaffinity 193
#define __NR_sched_getaffinity 194
#define __NR_capget 195
#define __NR_capset 196
#define __NR_io_setup 197
#define __NR_io_destroy 198
#define __NR_io_getevents 199
#define __NR_io_submit 200
#define __NR_io_cancel 201
#define __NR_fadvise64 202
#define __NR_exit_group 203
#define __NR_lookup_dcookie 204
#define __NR_epoll_create 205
#define __NR_epoll_ctl 206
#define __NR_epoll_wait 207
#define __NR_remap_file_pages 208
#define __NR_set_tid_address 209
#define __NR_timer_create 210
#define __NR_timer_settime 211
#define __NR_timer_gettime 212
#define __NR_timer_getoverrun 213
#define __NR_timer_delete 214
#define __NR_clock_settime 215
#define __NR_clock_gettime 216
#define __NR_clock_getres 217
#define __NR_clock_nanosleep 218
#define __NR_statfs64 219
#define __NR_fstatfs64 220
#define __NR_tgkill 221
/* 222 reserved for tux */
#define __NR_utimes 223
#define __NR_fadvise64_64 224
#define __NR_cacheflush 225
#include <uapi/asm/unistd.h>
#define __NR_vserver 226
#define __NR_mq_open 227
#define __NR_mq_unlink 228
#define __NR_mq_timedsend 229
#define __NR_mq_timedreceive 230