diff options
| author | Marco S Hyman <marc@cvs.openbsd.org> | 2004-06-08 18:11:29 +0000 |
|---|---|---|
| committer | Marco S Hyman <marc@cvs.openbsd.org> | 2004-06-08 18:11:29 +0000 |
| commit | 37209ee1e3178d04b70df76de21578dee4204a67 (patch) | |
| tree | 258272d9cdc66fc31d98e613e2231fd9403b19e2 | |
| parent | db2cc4bf42ecb8d09ee4141a77fd802c7a8c63b4 (diff) | |
pull up cpuid_t define from smp branch. Kill alpha specific defininition
of cpuid_t. OK art@ deraadt@
| -rw-r--r-- | sys/arch/alpha/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/sys/types.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h index d2d6e209c27..b26e5fa6c8a 100644 --- a/sys/arch/alpha/include/cpu.h +++ b/sys/arch/alpha/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.22 2004/01/22 17:47:29 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.23 2004/06/08 18:11:28 marc Exp $ */ /* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */ /*- @@ -176,8 +176,6 @@ struct mchkinfo { __volatile int mc_received; /* machine check was received */ }; -typedef long cpuid_t; - struct cpu_info { /* * Public members. diff --git a/sys/sys/types.h b/sys/sys/types.h index bc675728f21..32d962d53ca 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.23 2003/12/11 23:02:30 millert Exp $ */ +/* $OpenBSD: types.h,v 1.24 2004/06/08 18:11:28 marc Exp $ */ /* $NetBSD: types.h,v 1.29 1996/11/15 22:48:25 jtc Exp $ */ /*- @@ -56,6 +56,9 @@ typedef unsigned char unchar; /* Sys V compatibility */ typedef unsigned short ushort; /* Sys V compatibility */ typedef unsigned int uint; /* Sys V compatibility */ typedef unsigned long ulong; /* Sys V compatibility */ +typedef unsigned long ulong; /* Sys V compatibility */ + +typedef unsigned long cpuid_t; #endif typedef u_int64_t u_quad_t; /* quads */ |