summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-11-10 22:48:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-11-10 22:48:14 +0000
commit1c6b283181fd163f321173568bd3d31a5d37186f (patch)
tree0126a2314f79ae3b374ef71ff290c26ab7494dc7 /sys/arch/hppa
parentc5e659b789e1a01f0119342bbab2605804c34b96 (diff)
mindless unification with hppa64; remove meaningless differences before
attacking the complicated stuff
Diffstat (limited to 'sys/arch/hppa')
-rw-r--r--sys/arch/hppa/include/bus.h98
-rw-r--r--sys/arch/hppa/include/pcb.h9
-rw-r--r--sys/arch/hppa/include/pte.h8
-rw-r--r--sys/arch/hppa/include/ptrace.h33
-rw-r--r--sys/arch/hppa/include/rbus_machdep.h33
-rw-r--r--sys/arch/hppa/include/reloc.h33
-rw-r--r--sys/arch/hppa/include/vmparam.h5
7 files changed, 95 insertions, 124 deletions
diff --git a/sys/arch/hppa/include/bus.h b/sys/arch/hppa/include/bus.h
index 89e67a3cc39..6b48cbae96e 100644
--- a/sys/arch/hppa/include/bus.h
+++ b/sys/arch/hppa/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.29 2010/06/19 14:06:56 miod Exp $ */
+/* $OpenBSD: bus.h,v 1.30 2011/11/10 22:48:13 deraadt Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -43,19 +43,17 @@ struct hppa_bus_space_tag {
void *hbt_cookie;
int (*hbt_map)(void *v, bus_addr_t addr, bus_size_t size,
- int flags, bus_space_handle_t *bshp);
- void (*hbt_unmap)(void *v, bus_space_handle_t bsh,
- bus_size_t size);
+ int flags, bus_space_handle_t *bshp);
+ void (*hbt_unmap)(void *v, bus_space_handle_t bsh, bus_size_t size);
int (*hbt_subregion)(void *v, bus_space_handle_t bsh,
- bus_size_t offset, bus_size_t size,
- bus_space_handle_t *nbshp);
+ bus_size_t offset, bus_size_t size,
+ bus_space_handle_t *nbshp);
int (*hbt_alloc)(void *v, bus_addr_t rstart, bus_addr_t rend,
- bus_size_t size, bus_size_t align,
- bus_size_t boundary, int flags,
- bus_addr_t *addrp, bus_space_handle_t *bshp);
+ bus_size_t size, bus_size_t align, bus_size_t boundary,
+ int flags, bus_addr_t *addrp, bus_space_handle_t *bshp);
void (*hbt_free)(void *, bus_space_handle_t, bus_size_t);
void (*hbt_barrier)(void *v, bus_space_handle_t h,
- bus_size_t o, bus_size_t l, int op);
+ bus_size_t o, bus_size_t l, int op);
void *(*hbt_vaddr)(void *v, bus_space_handle_t h);
u_int8_t (*hbt_r1)(void *, bus_space_handle_t, bus_size_t);
@@ -69,95 +67,95 @@ struct hppa_bus_space_tag {
void (*hbt_w8)(void *, bus_space_handle_t, bus_size_t, u_int64_t);
void (*hbt_rm_1)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, bus_size_t c);
+ bus_size_t o, u_int8_t *a, bus_size_t c);
void (*hbt_rm_2)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t *a, bus_size_t c);
+ bus_size_t o, u_int16_t *a, bus_size_t c);
void (*hbt_rm_4)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t *a, bus_size_t c);
+ bus_size_t o, u_int32_t *a, bus_size_t c);
void (*hbt_rm_8)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t *a, bus_size_t c);
+ bus_size_t o, u_int64_t *a, bus_size_t c);
void (*hbt_wm_1)(void *v, bus_space_handle_t h, bus_size_t o,
- const u_int8_t *a, bus_size_t c);
+ const u_int8_t *a, bus_size_t c);
void (*hbt_wm_2)(void *v, bus_space_handle_t h, bus_size_t o,
- const u_int16_t *a, bus_size_t c);
+ const u_int16_t *a, bus_size_t c);
void (*hbt_wm_4)(void *v, bus_space_handle_t h, bus_size_t o,
- const u_int32_t *a, bus_size_t c);
+ const u_int32_t *a, bus_size_t c);
void (*hbt_wm_8)(void *v, bus_space_handle_t h, bus_size_t o,
- const u_int64_t *a, bus_size_t c);
+ const u_int64_t *a, bus_size_t c);
void (*hbt_sm_1)(void *v, bus_space_handle_t h, bus_size_t o,
- u_int8_t vv, bus_size_t c);
+ u_int8_t vv, bus_size_t c);
void (*hbt_sm_2)(void *v, bus_space_handle_t h, bus_size_t o,
- u_int16_t vv, bus_size_t c);
+ u_int16_t vv, bus_size_t c);
void (*hbt_sm_4)(void *v, bus_space_handle_t h, bus_size_t o,
- u_int32_t vv, bus_size_t c);
+ u_int32_t vv, bus_size_t c);
void (*hbt_sm_8)(void *v, bus_space_handle_t h, bus_size_t o,
- u_int64_t vv, bus_size_t c);
+ u_int64_t vv, bus_size_t c);
void (*hbt_rrm_2)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, bus_size_t c);
+ bus_size_t o, u_int8_t *a, bus_size_t c);
void (*hbt_rrm_4)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, bus_size_t c);
+ bus_size_t o, u_int8_t *a, bus_size_t c);
void (*hbt_rrm_8)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, bus_size_t c);
+ bus_size_t o, u_int8_t *a, bus_size_t c);
void (*hbt_wrm_2)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int8_t *a, bus_size_t c);
+ bus_size_t o, const u_int8_t *a, bus_size_t c);
void (*hbt_wrm_4)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int8_t *a, bus_size_t c);
+ bus_size_t o, const u_int8_t *a, bus_size_t c);
void (*hbt_wrm_8)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int8_t *a, bus_size_t c);
+ bus_size_t o, const u_int8_t *a, bus_size_t c);
void (*hbt_rr_1)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, bus_size_t c);
+ bus_size_t o, u_int8_t *a, bus_size_t c);
void (*hbt_rr_2)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t *a, bus_size_t c);
+ bus_size_t o, u_int16_t *a, bus_size_t c);
void (*hbt_rr_4)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t *a, bus_size_t c);
+ bus_size_t o, u_int32_t *a, bus_size_t c);
void (*hbt_rr_8)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t *a, bus_size_t c);
+ bus_size_t o, u_int64_t *a, bus_size_t c);
void (*hbt_wr_1)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int8_t *a, bus_size_t c);
+ bus_size_t o, const u_int8_t *a, bus_size_t c);
void (*hbt_wr_2)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int16_t *a, bus_size_t c);
+ bus_size_t o, const u_int16_t *a, bus_size_t c);
void (*hbt_wr_4)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int32_t *a, bus_size_t c);
+ bus_size_t o, const u_int32_t *a, bus_size_t c);
void (*hbt_wr_8)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int64_t *a, bus_size_t c);
+ bus_size_t o, const u_int64_t *a, bus_size_t c);
void (*hbt_rrr_2)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, bus_size_t c);
+ bus_size_t o, u_int8_t *a, bus_size_t c);
void (*hbt_rrr_4)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, bus_size_t c);
+ bus_size_t o, u_int8_t *a, bus_size_t c);
void (*hbt_rrr_8)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t *a, bus_size_t c);
+ bus_size_t o, u_int8_t *a, bus_size_t c);
void (*hbt_wrr_2)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int8_t *a, bus_size_t c);
+ bus_size_t o, const u_int8_t *a, bus_size_t c);
void (*hbt_wrr_4)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int8_t *a, bus_size_t c);
+ bus_size_t o, const u_int8_t *a, bus_size_t c);
void (*hbt_wrr_8)(void *v, bus_space_handle_t h,
- bus_size_t o, const u_int8_t *a, bus_size_t c);
+ bus_size_t o, const u_int8_t *a, bus_size_t c);
void (*hbt_sr_1)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int8_t vv, bus_size_t c);
+ bus_size_t o, u_int8_t vv, bus_size_t c);
void (*hbt_sr_2)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int16_t vv, bus_size_t c);
+ bus_size_t o, u_int16_t vv, bus_size_t c);
void (*hbt_sr_4)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int32_t vv, bus_size_t c);
+ bus_size_t o, u_int32_t vv, bus_size_t c);
void (*hbt_sr_8)(void *v, bus_space_handle_t h,
- bus_size_t o, u_int64_t vv, bus_size_t c);
+ bus_size_t o, u_int64_t vv, bus_size_t c);
void (*hbt_cp_1)(void *v, bus_space_handle_t h1, bus_size_t o1,
- bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
+ bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
void (*hbt_cp_2)(void *v, bus_space_handle_t h1, bus_size_t o1,
- bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
+ bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
void (*hbt_cp_4)(void *v, bus_space_handle_t h1, bus_size_t o1,
- bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
+ bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
void (*hbt_cp_8)(void *v, bus_space_handle_t h1, bus_size_t o1,
- bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
+ bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
};
typedef const struct hppa_bus_space_tag *bus_space_tag_t;
extern const struct hppa_bus_space_tag hppa_bustag;
diff --git a/sys/arch/hppa/include/pcb.h b/sys/arch/hppa/include/pcb.h
index 456ea9dea59..b24f037eac8 100644
--- a/sys/arch/hppa/include/pcb.h
+++ b/sys/arch/hppa/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.14 2010/07/01 05:33:32 jsing Exp $ */
+/* $OpenBSD: pcb.h,v 1.15 2011/11/10 22:48:13 deraadt Exp $ */
/*
* Copyright (c) 1999-2004 Michael Shalayeff
@@ -26,7 +26,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#ifndef _MACHINE_PCB_H_
#define _MACHINE_PCB_H_
@@ -36,9 +35,9 @@
struct pcb {
struct hppa_fpstate *pcb_fpstate; /* not in the trapframe */
- u_int pcb_ksp; /* kernel sp for ctxsw */
- u_int pcb_onfault; /* SW copy fault handler */
- pa_space_t pcb_space; /* copy pmap_space, for asm's sake */
+ u_int32_t pcb_ksp; /* kernel sp for ctxsw */
+ u_int32_t pcb_onfault; /* SW copy fault handler */
+ pa_space_t pcb_space; /* copy pmap_space, for asm's sake */
};
struct md_coredump {
diff --git a/sys/arch/hppa/include/pte.h b/sys/arch/hppa/include/pte.h
index 271ddabb1c7..db6504f04ef 100644
--- a/sys/arch/hppa/include/pte.h
+++ b/sys/arch/hppa/include/pte.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pte.h,v 1.11 2002/09/05 18:41:19 mickey Exp $ */
+/* $OpenBSD: pte.h,v 1.12 2011/11/10 22:48:13 deraadt Exp $ */
/*
* Copyright (c) 1990,1993,1994 The University of Utah and
@@ -27,8 +27,6 @@
#ifndef _MACHINE_PTE_H_
#define _MACHINE_PTE_H_
-typedef u_int32_t pt_entry_t;
-
#define PTE_PROT_SHIFT 19
#define PTE_PROT(tlb) ((tlb) >> PTE_PROT_SHIFT)
#define TLB_PROT(pte) ((pte) << PTE_PROT_SHIFT)
@@ -64,4 +62,8 @@ typedef u_int32_t pt_entry_t;
/* protection for break page */
#define TLB_BREAK_PROT 0x02c00000
+#ifndef _LOCORE
+typedef u_int32_t pt_entry_t;
+#endif
+
#endif /* _MACHINE_PTE_H_ */
diff --git a/sys/arch/hppa/include/ptrace.h b/sys/arch/hppa/include/ptrace.h
index 5c56235d7c5..f8518bf4193 100644
--- a/sys/arch/hppa/include/ptrace.h
+++ b/sys/arch/hppa/include/ptrace.h
@@ -1,29 +1,20 @@
-/* $OpenBSD: ptrace.h,v 1.3 2004/04/07 18:24:19 mickey Exp $ */
+/* $OpenBSD: ptrace.h,v 1.4 2011/11/10 22:48:13 deraadt Exp $ */
/*
- * Copyright (c) 1998 Michael Shalayeff
+ * Copyright (c) 2005 Michael Shalayeff
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
diff --git a/sys/arch/hppa/include/rbus_machdep.h b/sys/arch/hppa/include/rbus_machdep.h
index 82a5c08278f..f3273a9c75a 100644
--- a/sys/arch/hppa/include/rbus_machdep.h
+++ b/sys/arch/hppa/include/rbus_machdep.h
@@ -1,29 +1,20 @@
-/* $OpenBSD: rbus_machdep.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
+/* $OpenBSD: rbus_machdep.h,v 1.6 2011/11/10 22:48:13 deraadt Exp $ */
/*
- * Copyright (c) 2004 Michael Shalayeff
+ * Copyright (c) 2005 Michael Shalayeff
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
diff --git a/sys/arch/hppa/include/reloc.h b/sys/arch/hppa/include/reloc.h
index 3675fe2260d..8447b9c469f 100644
--- a/sys/arch/hppa/include/reloc.h
+++ b/sys/arch/hppa/include/reloc.h
@@ -1,29 +1,20 @@
-/* $OpenBSD: reloc.h,v 1.3 2004/05/22 04:25:42 mickey Exp $ */
+/* $OpenBSD: reloc.h,v 1.4 2011/11/10 22:48:13 deraadt Exp $ */
/*
- * Copyright (c) 1999 Michael Shalayeff
+ * Copyright (c) 1999,2005 Michael Shalayeff
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef _MACHINE_RELOC_H_
diff --git a/sys/arch/hppa/include/vmparam.h b/sys/arch/hppa/include/vmparam.h
index 7e7cefd501e..c9afa3c0e29 100644
--- a/sys/arch/hppa/include/vmparam.h
+++ b/sys/arch/hppa/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.38 2011/05/30 22:25:21 oga Exp $ */
+/* $OpenBSD: vmparam.h,v 1.39 2011/11/10 22:48:13 deraadt Exp $ */
/*
* Copyright (c) 1988-1994, The University of Utah and
@@ -59,7 +59,7 @@
#define MAXSSIZ (128*1024*1024UL) /* max stack size */
#endif
-#define STACKGAP_RANDOM 256*1024
+#define STACKGAP_RANDOM 256*1024
#ifndef USRIOSIZE
#define USRIOSIZE ((2*HPPA_PGALIAS)/PAGE_SIZE) /* 8mb */
@@ -112,4 +112,3 @@ struct vm_page_md {
#endif
#endif /* _MACHINE_VMPARAM_H_ */
-