diff options
| author | Sherry Moore <Sherry.Moore@Sun.COM> | 2008-09-22 16:30:26 -0700 |
|---|---|---|
| committer | Sherry Moore <Sherry.Moore@Sun.COM> | 2008-09-22 16:30:26 -0700 |
| commit | 193974072f41a843678abf5f61979c748687e66b (patch) | |
| tree | e3ecefacab3ff99bf48c8bf91fbb4306a6dbcbf5 /usr/src/uts/common/krtld | |
| parent | 0679f7940009223c7b2cee3abbea957e8dbccd26 (diff) | |
| download | illumos-joyent-193974072f41a843678abf5f61979c748687e66b.tar.gz | |
PSARC 2008/382 Fast Reboot
6714038 Fast Reboot support for x86 platforms
Diffstat (limited to 'usr/src/uts/common/krtld')
| -rw-r--r-- | usr/src/uts/common/krtld/bootrd.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/krtld/kobj_bootflags.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/krtld/bootrd.c b/usr/src/uts/common/krtld/bootrd.c index 4d48f71673..08e5d98c09 100644 --- a/usr/src/uts/common/krtld/bootrd.c +++ b/usr/src/uts/common/krtld/bootrd.c @@ -19,11 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" #include <sys/param.h> #include <sys/sunddi.h> @@ -44,7 +43,7 @@ static uint64_t rd_start, rd_end; struct boot_fs_ops *bfs_ops; struct boot_fs_ops *bfs_tab[] = {&bufs_ops, &bhsfs_ops, NULL}; -static uintptr_t scratch_max; +static uintptr_t scratch_max = 0; #define _kmem_ready get_weakish_int(&kmem_ready) diff --git a/usr/src/uts/common/krtld/kobj_bootflags.c b/usr/src/uts/common/krtld/kobj_bootflags.c index 92ee199475..e0a8c4deb0 100644 --- a/usr/src/uts/common/krtld/kobj_bootflags.c +++ b/usr/src/uts/common/krtld/kobj_bootflags.c @@ -23,7 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" #include <sys/types.h> #include <sys/reboot.h> @@ -56,6 +55,8 @@ bootflags(struct bootops *ops) return; } + (void) BOP_GETPROP(ops, "boot-file", kern_bootfile); + cp = kern_bootargs; #if defined(_OBP) |