summaryrefslogtreecommitdiff
path: root/sys/arch/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r--sys/arch/sparc/include/_types.h8
-rw-r--r--sys/arch/sparc/include/asm.h8
-rw-r--r--sys/arch/sparc/include/atomic.h8
-rw-r--r--sys/arch/sparc/include/bus.h8
-rw-r--r--sys/arch/sparc/include/cpu.h8
-rw-r--r--sys/arch/sparc/include/db_machdep.h8
-rw-r--r--sys/arch/sparc/include/exec.h8
-rw-r--r--sys/arch/sparc/include/float.h8
-rw-r--r--sys/arch/sparc/include/ieeefp.h8
-rw-r--r--sys/arch/sparc/include/intr.h8
-rw-r--r--sys/arch/sparc/include/ioctl_fd.h8
-rw-r--r--sys/arch/sparc/include/lock.h8
-rw-r--r--sys/arch/sparc/include/param.h8
-rw-r--r--sys/arch/sparc/include/pcb.h6
-rw-r--r--sys/arch/sparc/include/pmap.h8
-rw-r--r--sys/arch/sparc/include/reloc.h8
-rw-r--r--sys/arch/sparc/include/signal.h8
-rw-r--r--sys/arch/sparc/include/stdarg.h8
-rw-r--r--sys/arch/sparc/include/svr4_machdep.h8
-rw-r--r--sys/arch/sparc/include/varargs.h8
-rw-r--r--sys/arch/sparc/include/vmparam.h8
21 files changed, 83 insertions, 83 deletions
diff --git a/sys/arch/sparc/include/_types.h b/sys/arch/sparc/include/_types.h
index fa41d48590d..a3d481dab38 100644
--- a/sys/arch/sparc/include/_types.h
+++ b/sys/arch/sparc/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.11 2009/11/04 19:14:10 kettenis Exp $ */
+/* $OpenBSD: _types.h,v 1.12 2011/03/23 16:54:37 pirofti Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -32,8 +32,8 @@
* @(#)ansi.h 8.2 (Berkeley) 1/4/94
*/
-#ifndef _SPARC__TYPES_H_
-#define _SPARC__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
#if defined(_KERNEL)
typedef struct label_t {
@@ -116,4 +116,4 @@ typedef int __rune_t;
typedef void * __wctrans_t;
typedef void * __wctype_t;
-#endif /* _SPARC__TYPES_H_ */
+#endif /* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/sparc/include/asm.h b/sys/arch/sparc/include/asm.h
index c942f03e297..ad4dde78929 100644
--- a/sys/arch/sparc/include/asm.h
+++ b/sys/arch/sparc/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.4 2003/06/04 22:08:17 deraadt Exp $ */
+/* $OpenBSD: asm.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: asm.h,v 1.5 1997/07/16 15:16:43 christos Exp $ */
/*
@@ -38,8 +38,8 @@
* SUCH DAMAGE.
*/
-#ifndef _ASM_H_
-#define _ASM_H_
+#ifndef _MACHINE_ASM_H_
+#define _MACHINE_ASM_H_
#ifdef __ELF__
#define _C_LABEL(name) name
@@ -121,4 +121,4 @@
#define RCSID(name) .asciz name
-#endif /* _ASM_H_ */
+#endif /* _MACHINE_ASM_H_ */
diff --git a/sys/arch/sparc/include/atomic.h b/sys/arch/sparc/include/atomic.h
index 0f057e147b4..1eb4e49631b 100644
--- a/sys/arch/sparc/include/atomic.h
+++ b/sys/arch/sparc/include/atomic.h
@@ -1,9 +1,9 @@
-/* $OpenBSD: atomic.h,v 1.4 2010/04/21 03:03:24 deraadt Exp $ */
+/* $OpenBSD: atomic.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $ */
/* Public Domain */
-#ifndef __SPARC_ATOMIC_H__
-#define __SPARC_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
#if defined(_KERNEL)
@@ -32,4 +32,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
}
#endif /* defined(_KERNEL) */
-#endif /* __SPARC_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/sparc/include/bus.h b/sys/arch/sparc/include/bus.h
index 3c4f723123f..cbf3f0f63f0 100644
--- a/sys/arch/sparc/include/bus.h
+++ b/sys/arch/sparc/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.10 2009/12/25 20:51:43 miod Exp $ */
+/* $OpenBSD: bus.h,v 1.11 2011/03/23 16:54:37 pirofti Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
*
@@ -36,8 +36,8 @@
* own wrappers on a need-to-do basis.
*/
-#ifndef _SPARC_BUS_H_
-#define _SPARC_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
#include <machine/autoconf.h>
@@ -681,4 +681,4 @@ int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
vaddr_t _bus_dma_valloc_skewed(size_t, u_long, u_long, u_long);
-#endif /* _SPARC_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index acc93fbe407..1ed4a47830a 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.33 2010/11/27 19:41:45 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.34 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
/*
@@ -41,8 +41,8 @@
* @(#)cpu.h 8.4 (Berkeley) 1/5/94
*/
-#ifndef _SPARC_CPU_H_
-#define _SPARC_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
/*
* CTL_MACHDEP definitions.
@@ -202,4 +202,4 @@ struct trapvec {
extern struct trapvec *trapbase; /* the 256 vectors */
#endif /* _KERNEL */
-#endif /* _SPARC_CPU_H_ */
+#endif /* _MACHINE_CPU_H_ */
diff --git a/sys/arch/sparc/include/db_machdep.h b/sys/arch/sparc/include/db_machdep.h
index 99f948c8aac..88e1148862d 100644
--- a/sys/arch/sparc/include/db_machdep.h
+++ b/sys/arch/sparc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.h,v 1.14 2010/11/27 19:57:23 miod Exp $ */
+/* $OpenBSD: db_machdep.h,v 1.15 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: db_machdep.h,v 1.10 1997/08/31 21:23:40 pk Exp $ */
/*
@@ -27,8 +27,8 @@
* the rights to redistribute these changes.
*/
-#ifndef _SPARC_DB_MACHDEP_H_
-#define _SPARC_DB_MACHDEP_H_
+#ifndef _MACHINE_DB_MACHDEP_H_
+#define _MACHINE_DB_MACHDEP_H_
/*
* Machine-dependent defines for new kernel debugger.
@@ -98,4 +98,4 @@ typedef u_long kgdb_reg_t;
#define KGDB_PREPARE fb_unblank()
#define KGDB_ENTER __asm("ta %0" :: "n" (T_KGDB_EXEC))
-#endif /* _SPARC_DB_MACHDEP_H_ */
+#endif /* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/sparc/include/exec.h b/sys/arch/sparc/include/exec.h
index a533892c5c7..24d512ca290 100644
--- a/sys/arch/sparc/include/exec.h
+++ b/sys/arch/sparc/include/exec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.h,v 1.13 2010/07/02 19:57:15 tedu Exp $ */
+/* $OpenBSD: exec.h,v 1.14 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: exec.h,v 1.7 1994/11/20 20:53:02 deraadt Exp $ */
/*
@@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _SPARC_EXEC_H_
-#define _SPARC_EXEC_H_
+#ifndef _MACHINE_EXEC_H_
+#define _MACHINE_EXEC_H_
#define __LDPGSZ 8192 /* linker page size */
@@ -131,4 +131,4 @@ struct relocation_info_sparc {
#define _KERN_DO_ELF
-#endif /* _SPARC_EXEC_H_ */
+#endif /* _MACHINE_EXEC_H_ */
diff --git a/sys/arch/sparc/include/float.h b/sys/arch/sparc/include/float.h
index 5bf1736cf8d..d0c56ccb2ed 100644
--- a/sys/arch/sparc/include/float.h
+++ b/sys/arch/sparc/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.6 2008/07/21 20:50:55 martynas Exp $ */
+/* $OpenBSD: float.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: float.h,v 1.6 1997/07/18 05:11:52 thorpej Exp $ */
/*
@@ -41,8 +41,8 @@
* @(#)float.h 8.1 (Berkeley) 6/11/93
*/
-#ifndef _SPARC_FLOAT_H_
-#define _SPARC_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
#include <sys/cdefs.h>
@@ -84,4 +84,4 @@ __END_DECLS
#define LDBL_MAX DBL_MAX
#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
-#endif /* _SPARC_FLOAT_H_ */
+#endif /* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/sparc/include/ieeefp.h b/sys/arch/sparc/include/ieeefp.h
index c3fd819eb2f..6ebc2b9ad46 100644
--- a/sys/arch/sparc/include/ieeefp.h
+++ b/sys/arch/sparc/include/ieeefp.h
@@ -1,12 +1,12 @@
-/* $OpenBSD: ieeefp.h,v 1.4 2001/09/28 15:18:15 jason Exp $ */
+/* $OpenBSD: ieeefp.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $ */
/*
* Written by J.T. Conklin, Apr 6, 1995
* Public domain.
*/
-#ifndef _SPARC_IEEEFP_H_
-#define _SPARC_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
typedef int fp_except;
#define FP_X_IMP 0x01 /* imprecise (loss of precision) */
@@ -22,4 +22,4 @@ typedef enum {
FP_RM=3 /* round toward negative infinity */
} fp_rnd;
-#endif /* _SPARC_IEEEFP_H_ */
+#endif /* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/sparc/include/intr.h b/sys/arch/sparc/include/intr.h
index 79078575957..f3f5cd83eed 100644
--- a/sys/arch/sparc/include/intr.h
+++ b/sys/arch/sparc/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.2 2010/12/21 14:56:24 claudio Exp $ */
+/* $OpenBSD: intr.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
/*
@@ -41,8 +41,8 @@
* @(#)cpu.h 8.4 (Berkeley) 1/5/94
*/
-#ifndef _SPARC_INTR_H_
-#define _SPARC_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
#ifdef _KERNEL
#include <sys/evcount.h>
@@ -95,4 +95,4 @@ void *softintr_establish(int, void (*)(void *), void *);
void softintr_schedule(void *);
#endif /* _KERNEL */
-#endif /* _SPARC_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/sparc/include/ioctl_fd.h b/sys/arch/sparc/include/ioctl_fd.h
index 20ed00830f2..8d4cd459c6d 100644
--- a/sys/arch/sparc/include/ioctl_fd.h
+++ b/sys/arch/sparc/include/ioctl_fd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioctl_fd.h,v 1.1 1997/06/24 09:50:58 downsj Exp $ */
+/* $OpenBSD: ioctl_fd.h,v 1.2 2011/03/23 16:54:37 pirofti Exp $ */
/* from: ioctl_fd.h,v 1.4 1995/06/29 03:49:32 jtk Exp */
/*
@@ -30,8 +30,8 @@
* From: Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp
*/
-#ifndef _SPARC_IOCTL_FD_H_
-#define _SPARC_IOCTL_FD_H_
+#ifndef _MACHINE_IOCTL_FD_H_
+#define _MACHINE_IOCTL_FD_H_
#define FD_FORMAT_VERSION 110 /* used to validate before formatting */
#define FD_MAX_NSEC 36 /* highest known number of spt - allow for */
@@ -127,4 +127,4 @@ struct fd_type {
#endif /* FDC_500KBPS */
-#endif /* !_SPARC_IOCTL_FD_H__ */
+#endif /* !_MACHINE_IOCTL_FD_H__ */
diff --git a/sys/arch/sparc/include/lock.h b/sys/arch/sparc/include/lock.h
index b19904e93e4..2d32b88e8e7 100644
--- a/sys/arch/sparc/include/lock.h
+++ b/sys/arch/sparc/include/lock.h
@@ -1,9 +1,9 @@
-/* $OpenBSD: lock.h,v 1.3 2010/09/05 18:07:12 kettenis Exp $ */
+/* $OpenBSD: lock.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $ */
/* public domain */
-#ifndef _SPARC_LOCK_H_
-#define _SPARC_LOCK_H_
+#ifndef _MACHINE_LOCK_H_
+#define _MACHINE_LOCK_H_
#include <machine/atomic.h>
@@ -47,4 +47,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t *l)
*l = __SIMPLELOCK_UNLOCKED;
}
-#endif /* _SPARC_LOCK_H_ */
+#endif /* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h
index fdb004be1eb..36921c85089 100644
--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.43 2010/07/11 14:09:10 miod Exp $ */
+/* $OpenBSD: param.h,v 1.44 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: param.h,v 1.29 1997/03/10 22:50:37 pk Exp $ */
/*
@@ -41,8 +41,8 @@
* @(#)param.h 8.1 (Berkeley) 6/11/93
*/
-#ifndef _SPARC_PARAM_H_
-#define _SPARC_PARAM_H_
+#ifndef _MACHINE_PARAM_H_
+#define _MACHINE_PARAM_H_
/*
* Sun4M support by Aaron Brown, Harvard University.
@@ -257,4 +257,4 @@ extern int mmumod;
/* (CPU_ISSUN4D || CPU_ISSUN4M) */
#endif
-#endif /* _SPARC_PARAM_H_ */
+#endif /* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/sparc/include/pcb.h b/sys/arch/sparc/include/pcb.h
index dadf7f626bb..6942c653e93 100644
--- a/sys/arch/sparc/include/pcb.h
+++ b/sys/arch/sparc/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.5 2003/06/02 23:27:54 millert Exp $ */
+/* $OpenBSD: pcb.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: pcb.h,v 1.4 1995/03/28 18:19:56 jtc Exp $ */
/*
@@ -41,8 +41,8 @@
* @(#)pcb.h 8.1 (Berkeley) 6/11/93
*/
-#ifndef _SPARC_PCB_H_
-#define _SPARC_PCB_H_
+#ifndef _MACHINE_PCB_H_
+#define _MACHINE_PCB_H_
#include <machine/reg.h>
diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index b14264f11f8..1441f9e8296 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.50 2010/12/26 15:41:00 miod Exp $ */
+/* $OpenBSD: pmap.h,v 1.51 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
/*
@@ -44,8 +44,8 @@
* @(#)pmap.h 8.1 (Berkeley) 6/11/93
*/
-#ifndef _SPARC_PMAP_H_
-#define _SPARC_PMAP_H_
+#ifndef _MACHINE_PMAP_H_
+#define _MACHINE_PMAP_H_
#include <machine/pte.h>
@@ -400,4 +400,4 @@ extern void (*pmap_changeprot_p)(pmap_t, vaddr_t,
#endif /* _KERNEL */
-#endif /* _SPARC_PMAP_H_ */
+#endif /* _MACHINE_PMAP_H_ */
diff --git a/sys/arch/sparc/include/reloc.h b/sys/arch/sparc/include/reloc.h
index 9d79ca0a8ef..597c42512c9 100644
--- a/sys/arch/sparc/include/reloc.h
+++ b/sys/arch/sparc/include/reloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reloc.h,v 1.4 2006/05/07 15:38:05 miod Exp $ */
+/* $OpenBSD: reloc.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $ */
/*
* Copyright (c) 2001 Artur Grabowski <art@openbsd.org>
*
@@ -15,8 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef _MACH_RELOC_H_
-#define _MACH_RELOC_H_
+#ifndef _MACHINE_RELOC_H_
+#define _MACHINE_RELOC_H_
#define RELOC_NONE 0
@@ -25,4 +25,4 @@
#define RELOC_JMP_SLOT 21
#define RELOC_RELATIVE 22
-#endif /* _MACH_RELOC_H_ */
+#endif /* _MACHINE_RELOC_H_ */
diff --git a/sys/arch/sparc/include/signal.h b/sys/arch/sparc/include/signal.h
index cf278a7a9f0..2193b1cd601 100644
--- a/sys/arch/sparc/include/signal.h
+++ b/sys/arch/sparc/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.8 2006/01/08 14:20:17 millert Exp $ */
+/* $OpenBSD: signal.h,v 1.9 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: signal.h,v 1.4 1996/02/01 22:32:35 mycroft Exp $ */
/*
@@ -41,8 +41,8 @@
* @(#)signal.h 8.1 (Berkeley) 6/11/93
*/
-#ifndef _SPARC_SIGNAL_H_
-#define _SPARC_SIGNAL_H_
+#ifndef _MACHINE_SIGNAL_H_
+#define _MACHINE_SIGNAL_H_
#ifndef _LOCORE
#include <sys/cdefs.h>
@@ -94,4 +94,4 @@ struct sigcontext {
#define FPE_FLTOPERR_TRAP 0xd0 /* operand error */
#define FPE_FLTOVF_TRAP 0xd4 /* overflow */
#endif /* _LOCORE || __BSD_VISIBLE */
-#endif /* !_SPARC_SIGNAL_H_ */
+#endif /* !_MACHINE_SIGNAL_H_ */
diff --git a/sys/arch/sparc/include/stdarg.h b/sys/arch/sparc/include/stdarg.h
index 45366503699..86aed57f62b 100644
--- a/sys/arch/sparc/include/stdarg.h
+++ b/sys/arch/sparc/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.14 2008/10/23 21:25:08 kettenis Exp $ */
+/* $OpenBSD: stdarg.h,v 1.15 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: stdarg.h,v 1.10 1996/12/27 20:55:28 pk Exp $ */
/*
@@ -41,8 +41,8 @@
* from: @(#)stdarg.h 8.2 (Berkeley) 9/27/93
*/
-#ifndef _SPARC_STDARG_H_
-#define _SPARC_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define _MACHINE_STDARG_H_
#include <sys/cdefs.h>
#include <machine/_types.h>
@@ -105,4 +105,4 @@ typedef __va_list va_list;
#define va_end(ap)
-#endif /* !_SPARC_STDARG_H_ */
+#endif /* !_MACHINE_STDARG_H_ */
diff --git a/sys/arch/sparc/include/svr4_machdep.h b/sys/arch/sparc/include/svr4_machdep.h
index 77b8e9b8251..b2f730cd6d5 100644
--- a/sys/arch/sparc/include/svr4_machdep.h
+++ b/sys/arch/sparc/include/svr4_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_machdep.h,v 1.7 2002/03/14 01:26:44 millert Exp $ */
+/* $OpenBSD: svr4_machdep.h,v 1.8 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: svr4_machdep.h,v 1.4 1996/03/31 22:21:45 pk Exp $ */
/*
@@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _SPARC_SVR4_MACHDEP_H_
-#define _SPARC_SVR4_MACHDEP_H_
+#ifndef _MACHINE_SVR4_MACHDEP_H_
+#define _MACHINE_SVR4_MACHDEP_H_
#include <compat/svr4/svr4_types.h>
@@ -125,4 +125,4 @@ int svr4_trap(int, struct proc *);
#define SVR4_T_PAGEFLT 14
#define SVR4_T_ALIGNFLT 17
-#endif /* !_SPARC_SVR4_MACHDEP_H_ */
+#endif /* !_MACHINE_SVR4_MACHDEP_H_ */
diff --git a/sys/arch/sparc/include/varargs.h b/sys/arch/sparc/include/varargs.h
index af33ab0d83e..fc22cbae59b 100644
--- a/sys/arch/sparc/include/varargs.h
+++ b/sys/arch/sparc/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.6 2003/06/02 23:27:54 millert Exp $ */
+/* $OpenBSD: varargs.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: varargs.h,v 1.10 1995/12/29 18:53:02 mycroft Exp $ */
/*
@@ -46,8 +46,8 @@
* from: @(#)varargs.h 8.3 (Berkeley) 3/22/94
*/
-#ifndef _SPARC_VARARGS_H_
-#define _SPARC_VARARGS_H_
+#ifndef _MACHINE_VARARGS_H_
+#define _MACHINE_VARARGS_H_
#include <machine/stdarg.h>
@@ -64,4 +64,4 @@
#define va_start(ap) \
((ap) = (va_list)__builtin_saveregs())
-#endif /* !_SPARC_VARARGS_H_ */
+#endif /* !_MACHINE_VARARGS_H_ */
diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h
index 2b230acac3f..bc0fb4b9798 100644
--- a/sys/arch/sparc/include/vmparam.h
+++ b/sys/arch/sparc/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.36 2010/12/15 05:30:19 tedu Exp $ */
+/* $OpenBSD: vmparam.h,v 1.37 2011/03/23 16:54:37 pirofti Exp $ */
/* $NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $ */
/*
@@ -41,8 +41,8 @@
* @(#)vmparam.h 8.1 (Berkeley) 6/11/93
*/
-#ifndef _SPARC_VMPARAM_H_
-#define _SPARC_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
/*
* Machine dependent constants for Sun-4c SPARC
@@ -140,4 +140,4 @@ vaddr_t dvma_mapin_space(struct vm_map *, vaddr_t, int, int, int);
void dvma_mapout(vaddr_t, vaddr_t, int);
#endif
-#endif /* _SPARC_VMPARAM_H_ */
+#endif /* _MACHINE_VMPARAM_H_ */