diff options
Diffstat (limited to 'sys/amd64/include')
| -rw-r--r-- | sys/amd64/include/cpufunc.h | 4 | ||||
| -rw-r--r-- | sys/amd64/include/db_machdep.h | 14 | ||||
| -rw-r--r-- | sys/amd64/include/md_var.h | 4 | ||||
| -rw-r--r-- | sys/amd64/include/pmap.h | 8 | ||||
| -rw-r--r-- | sys/amd64/include/segments.h | 8 | ||||
| -rw-r--r-- | sys/amd64/include/specialreg.h | 4 | ||||
| -rw-r--r-- | sys/amd64/include/tss.h | 14 |
7 files changed, 28 insertions, 28 deletions
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index a57dc9d40caf..576ba23e26c8 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpufunc.h,v 1.35 1995/05/11 07:24:35 bde Exp $ + * $Id: cpufunc.h,v 1.36 1995/05/14 22:25:11 davidg Exp $ */ /* @@ -279,7 +279,7 @@ read_eflags(void) { u_long ef; - __asm __volatile("pushfl; popl %0" : "=r" (ef)); + __asm __volatile("pushfl; popl %0" : "=r" (ef)); return (ef); } diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h index a59b632d8267..cae2a45e191b 100644 --- a/sys/amd64/include/db_machdep.h +++ b/sys/amd64/include/db_machdep.h @@ -1,29 +1,29 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $Id: db_machdep.h,v 1.6 1994/10/19 21:13:51 bde Exp $ + * $Id: db_machdep.h,v 1.7 1995/01/14 10:34:52 bde Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index 6bc580809d11..34854b05c1b2 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: md_var.h,v 1.1 1995/03/16 18:11:43 bde Exp $ + * $Id: md_var.h,v 1.2 1995/03/28 07:55:08 bde Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -41,7 +41,7 @@ extern u_long cpu_feature; extern u_long cpu_high; extern u_long cpu_id; extern char cpu_vendor[]; -extern char etext[]; +extern char etext[]; extern vm_offset_t isaphysmem; extern char kstack[]; extern void (*netisrs[32]) __P((void)); diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 3ebe003981b0..6a35c0536f6a 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 1991 Regents of the University of California. * All rights reserved. * @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $Id: pmap.h,v 1.24 1995/03/16 18:11:44 bde Exp $ + * $Id: pmap.h,v 1.25 1995/03/26 23:42:55 davidg Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -108,12 +108,12 @@ extern int IdlePTD; /* physical address of "Idle" state directory */ */ #define vtopte(va) (PTmap + i386_btop(va)) #define kvtopte(va) vtopte(va) -#define ptetov(pt) (i386_ptob(pt - PTmap)) +#define ptetov(pt) (i386_ptob(pt - PTmap)) #define vtophys(va) (((int) (*vtopte(va))&PG_FRAME) | ((int)(va) & PGOFSET)) #define ispt(va) ((va) >= UPT_MIN_ADDRESS && (va) <= KPT_MAX_ADDRESS) #define avtopte(va) (APTmap + i386_btop(va)) -#define ptetoav(pt) (i386_ptob(pt - APTmap)) +#define ptetoav(pt) (i386_ptob(pt - APTmap)) #define avtophys(va) (((int) (*avtopte(va))&PG_FRAME) | ((int)(va) & PGOFSET)) #ifdef KERNEL diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h index 0c236f5f3b72..dcac309481a7 100644 --- a/sys/amd64/include/segments.h +++ b/sys/amd64/include/segments.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $Id: segments.h,v 1.7 1994/11/15 14:12:40 bde Exp $ + * $Id: segments.h,v 1.8 1995/02/14 19:21:15 sos Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -51,10 +51,10 @@ */ #define ISPL(s) ((s)&3) /* what is the priority level of a selector */ -#define SEL_KPL 0 /* kernel priority level */ -#define SEL_UPL 3 /* user priority level */ +#define SEL_KPL 0 /* kernel priority level */ +#define SEL_UPL 3 /* user priority level */ #define ISLDT(s) ((s)&SEL_LDT) /* is it local or global */ -#define SEL_LDT 4 /* local descriptor table */ +#define SEL_LDT 4 /* local descriptor table */ #define IDXSEL(s) (((s)>>3) & 0x1fff) /* index of selector */ #define LSEL(s,r) (((s)<<3) | SEL_LDT | r) /* a local selector */ #define GSEL(s,r) (((s)<<3) | r) /* a global selector */ diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h index aa87bec9c1aa..75cc79dae89b 100644 --- a/sys/amd64/include/specialreg.h +++ b/sys/amd64/include/specialreg.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $Id: specialreg.h,v 1.5 1994/09/04 23:10:27 davidg Exp $ + * $Id: specialreg.h,v 1.6 1995/01/14 10:44:55 bde Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -84,7 +84,7 @@ * NCRx+0: A31-A24 of starting address * NCRx+1: A23-A16 of starting address * NCRx+2: A15-A12 of starting address | NCR_SIZE_xx. - * + * * The non-cacheable region's starting address must be aligned to the * size indicated by the NCR_SIZE_xx field. */ diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h index 1fada6e7145b..fd07e357ffd8 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.3 1993/11/07 17:43:16 wollman Exp $ + * $Id: tss.h,v 1.4 1993/11/17 23:25:04 wollman Exp $ */ #ifndef _MACHINE_TSS_H_ @@ -59,16 +59,16 @@ struct i386tss { #define tss_pc tss_eip int tss_eflags; /* program status longword */ #define tss_psl tss_eflags - int tss_eax; - int tss_ecx; - int tss_edx; - int tss_ebx; + int tss_eax; + int tss_ecx; + int tss_edx; + int tss_ebx; int tss_esp; /* user stack pointer */ #define tss_usp tss_esp int tss_ebp; /* user frame pointer */ #define tss_fp tss_ebp - int tss_esi; - int tss_edi; + int tss_esi; + int tss_edi; int tss_es; /* actually 16 bits: top 16 bits must be zero */ int tss_cs; /* actually 16 bits: top 16 bits must be zero */ int tss_ss; /* actually 16 bits: top 16 bits must be zero */ |