diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2005-12-22 00:37:26 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2005-12-22 00:37:26 +0000 |
| commit | 41f76162ff30fc934d9b02feb125f05a1560b3f4 (patch) | |
| tree | b2487ad2dd66cfb4f206ca094f6a09cb02df4d14 | |
| parent | 83e733a3a0eb4a6d5fc3f5bc99ecd4519f1dd6db (diff) | |
Bad commit, breaks hppa64. Prompted by deraadt@
| -rw-r--r-- | lib/librthread/rthread.c | 5 | ||||
| -rw-r--r-- | sys/arch/hppa/include/param.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/librthread/rthread.c b/lib/librthread/rthread.c index ad51a7db1ea..dd2df20b82b 100644 --- a/lib/librthread/rthread.c +++ b/lib/librthread/rthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread.c,v 1.14 2005/12/21 23:44:56 marco Exp $ */ +/* $OpenBSD: rthread.c,v 1.15 2005/12/22 00:37:25 marco Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -133,8 +133,7 @@ alloc_stack(size_t len, void *base) } } #ifdef MACHINE_STACK_GROWS_UP - stack->sp = (void *)(((size_t)stack->base + MACHINE_STACK_ALIGN) & - ~(MACHINE_STACK_ALIGN - 1)); + stack->sp = (void *)(((size_t)stack->base + 64) & ~63); #else stack->sp = (void *)(((size_t)stack->base + len - 16) & ~15); #endif diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h index 9ad13c02a88..be70ee6c34b 100644 --- a/sys/arch/hppa/include/param.h +++ b/sys/arch/hppa/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.30 2005/12/21 23:26:05 marco Exp $ */ +/* $OpenBSD: param.h,v 1.31 2005/12/22 00:37:25 marco Exp $ */ /* * Copyright (c) 1988-1994, The University of Utah and @@ -61,7 +61,6 @@ #define MAXPHYS (64 * 1024) /* max raw I/O transfer size */ #define MACHINE_STACK_GROWS_UP 1 /* stack grows to higher addresses */ -#define MACHINE_STACK_ALIGN 64 /* per ABI stacks must be 64 aligned */ #define USPACE (4 * NBPG) /* pages for user struct and kstack */ #define USPACE_ALIGN (0) /* u-area alignment 0-none */ |