diff options
| author | gkoehler <gkoehler@cvs.openbsd.org> | 2020-10-03 06:22:21 +0000 |
|---|---|---|
| committer | gkoehler <gkoehler@cvs.openbsd.org> | 2020-10-03 06:22:21 +0000 |
| commit | c95580206ba33f6e364dc8905e8cfab9d2c9695d (patch) | |
| tree | 93a9a2f5c3b0bd80cfd2aad4c85ba278fa329c43 | |
| parent | 9ff7a95ba37f944d017cafc30ba07faecf7ea2e4 (diff) | |
Increase CLAIM_LIMIT from 11M to 14M to make room for retguard
The kernel text will grow larger when retguard adds code to many
functions to check their return addresses. The entire kernel
(including text, data, bss, symbol table, and ramdisk) must fit under
the CLAIM_LIMIT. A kernel that overflows this limit may fail very
quickly, by causing a "DEFAULT CATCH!" error in Open Firmware.
Crank version to "1.10", so I can see whether the running ofwboot uses
the higher CLAIM_LIMIT.
ok deraadt@
| -rw-r--r-- | sys/arch/macppc/stand/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/main.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/macppc/stand/conf.c b/sys/arch/macppc/stand/conf.c index f8dc44f8422..8a2983315c6 100644 --- a/sys/arch/macppc/stand/conf.c +++ b/sys/arch/macppc/stand/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.11 2020/05/26 14:00:42 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.12 2020/10/03 06:22:20 gkoehler Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> * @@ -21,7 +21,7 @@ #include <lib/libsa/stand.h> -const char version[] = "1.9"; +const char version[] = "1.10"; int debug = 0; void ofc_probe(struct consdev *); diff --git a/sys/arch/macppc/stand/main.c b/sys/arch/macppc/stand/main.c index 70b386dd227..2927c3c8a65 100644 --- a/sys/arch/macppc/stand/main.c +++ b/sys/arch/macppc/stand/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.11 2020/05/25 15:10:18 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.12 2020/10/03 06:22:20 gkoehler Exp $ */ /* $NetBSD: boot.c,v 1.1 1997/04/16 20:29:17 thorpej Exp $ */ /* @@ -118,9 +118,9 @@ chain(void (*entry)(), char *args, void *ssym, void *esym) /* * XXX This limits the maximum size of the (uncompressed) bsd.rd to a - * little under 11MB. + * little under 14MB. */ -#define CLAIM_LIMIT 0x00c00000 +#define CLAIM_LIMIT 0x00f00000 char bootline[512]; |