summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/machdep.c4
-rw-r--r--sys/amd64/include/frame.h4
-rw-r--r--sys/amd64/include/tss.h3
-rw-r--r--sys/i386/i386/machdep.c4
-rw-r--r--sys/i386/include/frame.h4
-rw-r--r--sys/i386/include/tss.h3
-rw-r--r--sys/i386/isa/aha1542.c3
-rw-r--r--sys/i386/isa/bt742a.c4
-rw-r--r--sys/i386/isa/sound/os.h2
-rw-r--r--sys/i386/isa/ultra14f.c4
-rw-r--r--sys/i386/isa/wd.c4
11 files changed, 18 insertions, 21 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index ae1271f..193a9c9 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.16 1993/11/13 02:25:02 davidg Exp $
+ * $Id: machdep.c,v 1.17 1993/11/16 09:54:47 davidg Exp $
*/
#include "npx.h"
@@ -813,7 +813,7 @@ unsigned char ldt[5][DESCRIPTOR_SIZE];
#define LUCODE_SEL 3
#define LUDATA_SEL 4
/* seperate stack, es,fs,gs sels ? */
-/* #define LPOSIXCALLS_SEL 5 /* notyet */
+/* #define LPOSIXCALLS_SEL 5*/ /* notyet */
struct i386tss tss, panic_tss;
diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h
index 71701d6..a591f53 100644
--- a/sys/amd64/include/frame.h
+++ b/sys/amd64/include/frame.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)frame.h 5.2 (Berkeley) 1/18/91
- * $Id: frame.h,v 1.2 1993/10/08 20:50:59 rgrimes Exp $
+ * $Id: frame.h,v 1.3 1993/11/07 17:42:56 wollman Exp $
*/
#ifndef _MACHINE_FRAME_H_
@@ -127,7 +127,7 @@ struct syscframe {
int sf_eax;
int sf_eflags;
/* below portion defined in 386 hardware */
-/* int sf_args[N]; /* if call gate copy args enabled!*/
+/* int sf_args[N];*/ /* if call gate copy args enabled!*/
int sf_eip;
int sf_cs;
/* below only when transitting rings (e.g. user to kernel) */
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index b0430de..1fada6e 100644
--- a/sys/amd64/include/tss.h
+++ b/sys/amd64/include/tss.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)tss.h 5.4 (Berkeley) 1/18/91
- * $Id: tss.h,v 1.2 1993/10/16 14:39:38 rgrimes Exp $
+ * $Id: tss.h,v 1.3 1993/11/07 17:43:16 wollman Exp $
*/
#ifndef _MACHINE_TSS_H_
@@ -53,7 +53,6 @@ struct i386tss {
int tss_ss1; /* actually 16 bits: top 16 bits must be zero */
int tss_esp2; /* kernel stack pointer priviledge level 2 */
int tss_ss2; /* actually 16 bits: top 16 bits must be zero */
- /* struct ptd *tss_cr3; /* page table directory */
int tss_cr3; /* page table directory */
#define tss_ptd tss_cr3
int tss_eip; /* program counter */
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index ae1271f..193a9c9 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.16 1993/11/13 02:25:02 davidg Exp $
+ * $Id: machdep.c,v 1.17 1993/11/16 09:54:47 davidg Exp $
*/
#include "npx.h"
@@ -813,7 +813,7 @@ unsigned char ldt[5][DESCRIPTOR_SIZE];
#define LUCODE_SEL 3
#define LUDATA_SEL 4
/* seperate stack, es,fs,gs sels ? */
-/* #define LPOSIXCALLS_SEL 5 /* notyet */
+/* #define LPOSIXCALLS_SEL 5*/ /* notyet */
struct i386tss tss, panic_tss;
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index 71701d6..a591f53 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)frame.h 5.2 (Berkeley) 1/18/91
- * $Id: frame.h,v 1.2 1993/10/08 20:50:59 rgrimes Exp $
+ * $Id: frame.h,v 1.3 1993/11/07 17:42:56 wollman Exp $
*/
#ifndef _MACHINE_FRAME_H_
@@ -127,7 +127,7 @@ struct syscframe {
int sf_eax;
int sf_eflags;
/* below portion defined in 386 hardware */
-/* int sf_args[N]; /* if call gate copy args enabled!*/
+/* int sf_args[N];*/ /* if call gate copy args enabled!*/
int sf_eip;
int sf_cs;
/* below only when transitting rings (e.g. user to kernel) */
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index b0430de..1fada6e 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)tss.h 5.4 (Berkeley) 1/18/91
- * $Id: tss.h,v 1.2 1993/10/16 14:39:38 rgrimes Exp $
+ * $Id: tss.h,v 1.3 1993/11/07 17:43:16 wollman Exp $
*/
#ifndef _MACHINE_TSS_H_
@@ -53,7 +53,6 @@ struct i386tss {
int tss_ss1; /* actually 16 bits: top 16 bits must be zero */
int tss_esp2; /* kernel stack pointer priviledge level 2 */
int tss_ss2; /* actually 16 bits: top 16 bits must be zero */
- /* struct ptd *tss_cr3; /* page table directory */
int tss_cr3; /* page table directory */
#define tss_ptd tss_cr3
int tss_eip; /* program counter */
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 5aedbc3..c242624 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: aha1542.c,v 1.12 1993/10/16 12:27:20 rgrimes Exp $
+ * $Id: aha1542.c,v 1.13 1993/10/28 02:38:36 rgrimes Exp $
*/
/*
@@ -562,7 +562,6 @@ struct isa_dev *dev;
register ihandler_t *chp = &aha_handler[unit];;
#endif /* defined(OSF) */
- /***********************************************\
/***********************************************\
* find unit and check we have that many defined *
\***********************************************/
diff --git a/sys/i386/isa/bt742a.c b/sys/i386/isa/bt742a.c
index 0e25091..ebf6504c 100644
--- a/sys/i386/isa/bt742a.c
+++ b/sys/i386/isa/bt742a.c
@@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: bt742a.c,v 1.7 1993/08/28 03:07:42 rgrimes Exp $
+ * $Id: bt742a.c,v 1.8 1993/10/12 07:15:35 rgrimes Exp $
*/
/*
@@ -205,7 +205,7 @@ struct bt_mbx
extern struct bt_mbx bt_mbx[];
#if defined(BIG_DMA)
-/* #define BT_NSEG 8192 /* Number of scatter gather segments - to much vm */
+/* #define BT_NSEG 8192*/ /* Number of scatter gather segments - to much vm */
#define BT_NSEG 512
#else
#define BT_NSEG 33
diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h
index 38e9f3c..3e3aced 100644
--- a/sys/i386/isa/sound/os.h
+++ b/sys/i386/isa/sound/os.h
@@ -234,7 +234,7 @@ extern int hz;
*
*/
#define GET_TIME() get_time()
-/*#define GET_TIME() (lbolt) /* Returns current time (1/HZ secs since boot) */
+/*#define GET_TIME() (lbolt)*/ /* Returns current time (1/HZ secs since boot) */
/*
* The following three macros are called before and after atomic
diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c
index 9566258..0d9b08c 100644
--- a/sys/i386/isa/ultra14f.c
+++ b/sys/i386/isa/ultra14f.c
@@ -18,7 +18,7 @@
* commenced: Sun Sep 27 18:14:01 PDT 1992
* slight mod to make work with 34F as well: Wed Jun 2 18:05:48 WST 1993
*
- * $Id: ultra14f.c,v 1.9 1993/10/12 07:15:38 rgrimes Exp $
+ * $Id: ultra14f.c,v 1.10 1993/10/14 00:07:04 rgrimes Exp $
*/
#include <sys/types.h>
@@ -147,7 +147,7 @@ extern int delaycount; /* from clock setup code */
#define UHA_SINTEN 0x80 /* system doorbell interupt Enabled */
#define UHA_ABORT_COMPLETE_EN 0x10 /* abort MSCP command complete int Enabled */
-#define UHA_ICM_ENABLED 0x01 /* ICM interrupt enabled
+#define UHA_ICM_ENABLED 0x01 /* ICM interrupt enabled */
/*
* UHA_SMASK bits (write)
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 02b53e4..beb4d7d 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
- * $Id$
+ * $Id: wd.c,v 1.11 1993/10/16 13:46:31 rgrimes Exp $
*/
/* TODO:peel out buffer at low ipl, speed improvement */
@@ -1235,7 +1235,7 @@ wddump(dev_t dev) /* dump core after a system crash */
if ((dumplo < 0) || ((dumplo + num) > nblocks))
return(EINVAL);
- /*wdtab.b_active = 1; /* mark controller active for if we
+ /*wdtab.b_active = 1;*/ /* mark controller active for if we
panic during the dump */
wddoingadump = 1 ; i = 100000 ;
while ((inb(wdc+wd_status) & WDCS_BUSY) && (i-- > 0)) ;
OpenPOWER on IntegriCloud