Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: Switch to asm-generic versions for identical headers.

This switches over mman/param/parport/serial/socket/ucontext.h.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+6 -146
+1 -17
arch/sh/include/asm/mman.h
··· 1 - #ifndef __ASM_SH_MMAN_H 2 - #define __ASM_SH_MMAN_H 3 - 4 - #include <asm-generic/mman-common.h> 5 - 6 - #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ 7 - #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ 8 - #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ 9 - #define MAP_LOCKED 0x2000 /* pages are locked */ 10 - #define MAP_NORESERVE 0x4000 /* don't check for reservations */ 11 - #define MAP_POPULATE 0x8000 /* populate (prefault) page tables */ 12 - #define MAP_NONBLOCK 0x10000 /* do not block on IO */ 13 - 14 - #define MCL_CURRENT 1 /* lock all current mappings */ 15 - #define MCL_FUTURE 2 /* lock all future mappings */ 16 - 17 - #endif /* __ASM_SH_MMAN_H */ 1 + #include <asm-generic/mman.h>
+1 -22
arch/sh/include/asm/param.h
··· 1 - #ifndef __ASM_SH_PARAM_H 2 - #define __ASM_SH_PARAM_H 3 - 4 - #ifdef __KERNEL__ 5 - # define HZ CONFIG_HZ 6 - # define USER_HZ 100 /* User interfaces are in "ticks" */ 7 - # define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ 8 - #endif 9 - 10 - #ifndef HZ 11 - #define HZ 100 12 - #endif 13 - 14 - #define EXEC_PAGESIZE 4096 15 - 16 - #ifndef NOGROUP 17 - #define NOGROUP (-1) 18 - #endif 19 - 20 - #define MAXHOSTNAMELEN 64 /* max length of hostname */ 21 - 22 - #endif /* __ASM_SH_PARAM_H */ 1 + #include <asm-generic/param.h>
+1 -16
arch/sh/include/asm/parport.h
··· 1 - /* 2 - * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk> 3 - * 4 - * This file should only be included by drivers/parport/parport_pc.c. 5 - */ 6 - #ifndef __ASM_SH_PARPORT_H 7 - #define __ASM_SH_PARPORT_H 8 - 9 - static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma); 10 - 11 - static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma) 12 - { 13 - return parport_pc_find_isa_ports(autoirq, autodma); 14 - } 15 - 16 - #endif /* __ASM_SH_PARPORT_H */ 1 + #include <asm-generic/parport.h>
+1 -19
arch/sh/include/asm/serial.h
··· 1 - /* 2 - * include/asm-sh/serial.h 3 - * 4 - * Configuration details for 8250, 16450, 16550, etc. serial ports 5 - */ 6 - 7 - #ifndef _ASM_SERIAL_H 8 - #define _ASM_SERIAL_H 9 - 10 - /* 11 - * This assumes you have a 1.8432 MHz clock for your UART. 12 - * 13 - * It'd be nice if someone built a serial card with a 24.576 MHz 14 - * clock, since the 16550A is capable of handling a top speed of 1.5 15 - * megabits/second; but this requires the faster clock. 16 - */ 17 - #define BASE_BAUD ( 1843200 / 16 ) 18 - 19 - #endif /* _ASM_SERIAL_H */ 1 + #include <asm-generic/serial.h>
+1 -60
arch/sh/include/asm/socket.h
··· 1 - #ifndef __ASM_SH_SOCKET_H 2 - #define __ASM_SH_SOCKET_H 3 - 4 - #include <asm/sockios.h> 5 - 6 - /* For setsockopt(2) */ 7 - #define SOL_SOCKET 1 8 - 9 - #define SO_DEBUG 1 10 - #define SO_REUSEADDR 2 11 - #define SO_TYPE 3 12 - #define SO_ERROR 4 13 - #define SO_DONTROUTE 5 14 - #define SO_BROADCAST 6 15 - #define SO_SNDBUF 7 16 - #define SO_RCVBUF 8 17 - #define SO_RCVBUFFORCE 32 18 - #define SO_SNDBUFFORCE 33 19 - #define SO_KEEPALIVE 9 20 - #define SO_OOBINLINE 10 21 - #define SO_NO_CHECK 11 22 - #define SO_PRIORITY 12 23 - #define SO_LINGER 13 24 - #define SO_BSDCOMPAT 14 25 - /* To add :#define SO_REUSEPORT 15 */ 26 - #define SO_PASSCRED 16 27 - #define SO_PEERCRED 17 28 - #define SO_RCVLOWAT 18 29 - #define SO_SNDLOWAT 19 30 - #define SO_RCVTIMEO 20 31 - #define SO_SNDTIMEO 21 32 - 33 - /* Security levels - as per NRL IPv6 - don't actually do anything */ 34 - #define SO_SECURITY_AUTHENTICATION 22 35 - #define SO_SECURITY_ENCRYPTION_TRANSPORT 23 36 - #define SO_SECURITY_ENCRYPTION_NETWORK 24 37 - 38 - #define SO_BINDTODEVICE 25 39 - 40 - /* Socket filtering */ 41 - #define SO_ATTACH_FILTER 26 42 - #define SO_DETACH_FILTER 27 43 - 44 - #define SO_PEERNAME 28 45 - #define SO_TIMESTAMP 29 46 - #define SCM_TIMESTAMP SO_TIMESTAMP 47 - 48 - #define SO_ACCEPTCONN 30 49 - 50 - #define SO_PEERSEC 31 51 - #define SO_PASSSEC 34 52 - #define SO_TIMESTAMPNS 35 53 - #define SCM_TIMESTAMPNS SO_TIMESTAMPNS 54 - 55 - #define SO_MARK 36 56 - 57 - #define SO_TIMESTAMPING 37 58 - #define SCM_TIMESTAMPING SO_TIMESTAMPING 59 - 60 - #endif /* __ASM_SH_SOCKET_H */ 1 + #include <asm-generic/socket.h>
+1 -12
arch/sh/include/asm/ucontext.h
··· 1 - #ifndef __ASM_SH_UCONTEXT_H 2 - #define __ASM_SH_UCONTEXT_H 3 - 4 - struct ucontext { 5 - unsigned long uc_flags; 6 - struct ucontext *uc_link; 7 - stack_t uc_stack; 8 - struct sigcontext uc_mcontext; 9 - sigset_t uc_sigmask; /* mask last for extensibility */ 10 - }; 11 - 12 - #endif /* __ASM_SH_UCONTEXT_H */ 1 + #include <asm-generic/ucontext.h>