about summary refs log tree commit diff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/alpha/ioperm.c4
-rw-r--r--sysdeps/unix/sysv/linux/net/route.h2
-rw-r--r--sysdeps/unix/sysv/linux/socketbits.h6
-rw-r--r--sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/socket.S2
-rw-r--r--sysdeps/unix/sysv/linux/usleep.c6
6 files changed, 14 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/ioperm.c b/sysdeps/unix/sysv/linux/alpha/ioperm.c
index 488265a069..b39f39a0d7 100644
--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
+++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
@@ -67,8 +67,8 @@
 #define CIA_DENSE_MEM		(0xfffffc8600000000UL)
 
 #define T2_IO_BASE		(0xfffffc03a0000000UL)
-#define T2_SPARSE_BASE		(0xfffffc0200000000UL)
-#define T2_DENSE_BASE		(0xfffffc03c0000000UL)
+#define T2_SPARSE_MEM		(0xfffffc0200000000UL)
+#define T2_DENSE_MEM		(0xfffffc03c0000000UL)
 
 typedef enum {
   IOSYS_UNKNOWN, IOSYS_JENSEN, IOSYS_APECS, IOSYS_CIA, IOSYS_T2
diff --git a/sysdeps/unix/sysv/linux/net/route.h b/sysdeps/unix/sysv/linux/net/route.h
index 531b069d12..d60a3cabb5 100644
--- a/sysdeps/unix/sysv/linux/net/route.h
+++ b/sysdeps/unix/sysv/linux/net/route.h
@@ -77,7 +77,7 @@ struct rtentry
 #define RTF_NEXTHOP	0x8000		/* Non gateway route with nexthop.  */
 
 
-#define RTF_MAGIC	0x10000		/* Route added/deleted authomatically,
+#define RTF_MAGIC	0x10000		/* Route added/deleted automatically,
 					   when interface changes its state. */
 
 #define RTCF_VALVE	0x00200000
diff --git a/sysdeps/unix/sysv/linux/socketbits.h b/sysdeps/unix/sysv/linux/socketbits.h
index 3bb92ab733..e9c88758e5 100644
--- a/sysdeps/unix/sysv/linux/socketbits.h
+++ b/sysdeps/unix/sysv/linux/socketbits.h
@@ -33,15 +33,21 @@ enum __socket_type
 {
   SOCK_STREAM = 1,		/* Sequenced, reliable, connection-based
 				   byte streams.  */
+#define SOCK_STREAM SOCK_STREAM
   SOCK_DGRAM = 2,		/* Connectionless, unreliable datagrams
 				   of fixed maximum length.  */
+#define SOCK_DGRAM SOCK_DGRAM
   SOCK_RAW = 3,			/* Raw protocol interface.  */
+#define SOCK_RAW SOCK_RAW
   SOCK_RDM = 4,			/* Reliably-delivered messages.  */
+#define SOCK_RDM SOCK_RDM
   SOCK_SEQPACKET = 5,		/* Sequenced, reliable, connection-based,
 				   datagrams of fixed maximum length.  */
+#define SOCK_SEQPACKET SOCK_SEQPACKET
   SOCK_PACKET = 10		/* Linux specific way of getting packets
 				   at the dev level.  For writing rarp and
 				   other similar things on the user level. */
+#define SOCK_PACKET SOCK_PACKET
 };
 
 /* Protocol families.  */
diff --git a/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S b/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S
index d0fe760270..4fea850ee3 100644
--- a/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S
+++ b/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S
@@ -99,7 +99,7 @@ ___syy:
 	ld	[%fp + REGWIN_SZ + 4],%o1         /* Load subcode */
 	ld      [%fp + REGWIN_SZ + 8],%o2         /* pointer to sigcontext */
 	call	%o4
-	ld      [%fp + REGWIN_SZ + 12],%o3        /* Address where signal ocurred */
+	ld      [%fp + REGWIN_SZ + 12],%o3        /* Address where signal occurred */
 
 	/* handler returned, restore state */
 	tst	%l0
diff --git a/sysdeps/unix/sysv/linux/sparc/socket.S b/sysdeps/unix/sysv/linux/sparc/socket.S
index f8075201db..24aba3fc74 100644
--- a/sysdeps/unix/sysv/linux/sparc/socket.S
+++ b/sysdeps/unix/sysv/linux/sparc/socket.S
@@ -24,7 +24,7 @@
 #define P2(a, b) a##b
 
 	.text
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
diff --git a/sysdeps/unix/sysv/linux/usleep.c b/sysdeps/unix/sysv/linux/usleep.c
index 9d36a90008..9265897053 100644
--- a/sysdeps/unix/sysv/linux/usleep.c
+++ b/sysdeps/unix/sysv/linux/usleep.c
@@ -1,5 +1,5 @@
 /* Implementation of the BSD usleep function using nanosleep.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,8 +24,8 @@
 void
 usleep (unsigned int useconds)
 {
-  struct timespec ts = { tv_sec: 0,
-			 tv_nsec: (long int) useconds * 1000ul };
+  struct timespec ts = { tv_sec: (long int) (useconds / 1000000),
+			 tv_nsec: (long int) (useconds % 1000000) * 1000ul };
 
   __nanosleep (&ts, NULL);
 }