Skip to content

Commit

Permalink
sh: Switch to asm-generic versions for identical headers.
Browse files Browse the repository at this point in the history
This switches over mman/param/parport/serial/socket/ucontext.h.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Jun 14, 2009
1 parent bdc90d4 commit 7fb8156
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 146 deletions.
18 changes: 1 addition & 17 deletions arch/sh/include/asm/mman.h
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
#ifndef __ASM_SH_MMAN_H
#define __ASM_SH_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) page tables */
#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_SH_MMAN_H */
#include <asm-generic/mman.h>
23 changes: 1 addition & 22 deletions arch/sh/include/asm/param.h
Original file line number Diff line number Diff line change
@@ -1,22 +1 @@
#ifndef __ASM_SH_PARAM_H
#define __ASM_SH_PARAM_H

#ifdef __KERNEL__
# 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

#define EXEC_PAGESIZE 4096

#ifndef NOGROUP
#define NOGROUP (-1)
#endif

#define MAXHOSTNAMELEN 64 /* max length of hostname */

#endif /* __ASM_SH_PARAM_H */
#include <asm-generic/param.h>
17 changes: 1 addition & 16 deletions arch/sh/include/asm/parport.h
Original file line number Diff line number Diff line change
@@ -1,16 +1 @@
/*
* Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
*
* This file should only be included by drivers/parport/parport_pc.c.
*/
#ifndef __ASM_SH_PARPORT_H
#define __ASM_SH_PARPORT_H

static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma);

static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma)
{
return parport_pc_find_isa_ports(autoirq, autodma);
}

#endif /* __ASM_SH_PARPORT_H */
#include <asm-generic/parport.h>
20 changes: 1 addition & 19 deletions arch/sh/include/asm/serial.h
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
/*
* include/asm-sh/serial.h
*
* Configuration details for 8250, 16450, 16550, etc. serial ports
*/

#ifndef _ASM_SERIAL_H
#define _ASM_SERIAL_H

/*
* This assumes you have a 1.8432 MHz clock for your UART.
*
* It'd be nice if someone built a serial card with a 24.576 MHz
* clock, since the 16550A is capable of handling a top speed of 1.5
* megabits/second; but this requires the faster clock.
*/
#define BASE_BAUD ( 1843200 / 16 )

#endif /* _ASM_SERIAL_H */
#include <asm-generic/serial.h>
61 changes: 1 addition & 60 deletions arch/sh/include/asm/socket.h
Original file line number Diff line number Diff line change
@@ -1,60 +1 @@
#ifndef __ASM_SH_SOCKET_H
#define __ASM_SH_SOCKET_H

#include <asm/sockios.h>

/* For setsockopt(2) */
#define SOL_SOCKET 1

#define SO_DEBUG 1
#define SO_REUSEADDR 2
#define SO_TYPE 3
#define SO_ERROR 4
#define SO_DONTROUTE 5
#define SO_BROADCAST 6
#define SO_SNDBUF 7
#define SO_RCVBUF 8
#define SO_RCVBUFFORCE 32
#define SO_SNDBUFFORCE 33
#define SO_KEEPALIVE 9
#define SO_OOBINLINE 10
#define SO_NO_CHECK 11
#define SO_PRIORITY 12
#define SO_LINGER 13
#define SO_BSDCOMPAT 14
/* To add :#define SO_REUSEPORT 15 */
#define SO_PASSCRED 16
#define SO_PEERCRED 17
#define SO_RCVLOWAT 18
#define SO_SNDLOWAT 19
#define SO_RCVTIMEO 20
#define SO_SNDTIMEO 21

/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 22
#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
#define SO_SECURITY_ENCRYPTION_NETWORK 24

#define SO_BINDTODEVICE 25

/* Socket filtering */
#define SO_ATTACH_FILTER 26
#define SO_DETACH_FILTER 27

#define SO_PEERNAME 28
#define SO_TIMESTAMP 29
#define SCM_TIMESTAMP SO_TIMESTAMP

#define SO_ACCEPTCONN 30

#define SO_PEERSEC 31
#define SO_PASSSEC 34
#define SO_TIMESTAMPNS 35
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS

#define SO_MARK 36

#define SO_TIMESTAMPING 37
#define SCM_TIMESTAMPING SO_TIMESTAMPING

#endif /* __ASM_SH_SOCKET_H */
#include <asm-generic/socket.h>
13 changes: 1 addition & 12 deletions arch/sh/include/asm/ucontext.h
Original file line number Diff line number Diff line change
@@ -1,12 +1 @@
#ifndef __ASM_SH_UCONTEXT_H
#define __ASM_SH_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_SH_UCONTEXT_H */
#include <asm-generic/ucontext.h>

0 comments on commit 7fb8156

Please sign in to comment.