diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2012-01-11 19:33:29 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2012-01-11 19:33:29 +0000 |
| commit | 48eb54fbc2fa11d51b755d899dad6da34fb96af0 (patch) | |
| tree | 6ba2106c3f0883b4427c0c4a62cd388bcf88a79b /sys/arch | |
| parent | cbedcd03c7820f02f2e460ec7ebaf7f870a55db8 (diff) | |
Backout premature use of 'bootduid', as 'rootduid' has not yet been
renamed.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/bios.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 22a1081e57f..25ee631080d 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.150 2012/01/11 15:58:27 jsing Exp $ */ +/* $OpenBSD: machdep.c,v 1.151 2012/01/11 19:33:28 krw Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1837,7 +1837,7 @@ getbootinfo(char *bootinfo, int bootinfo_size) case BOOTARG_BOOTDUID: bios_bootduid = (bios_bootduid_t *)q->ba_arg; - bcopy(bios_bootduid, bootduid, sizeof(bootduid)); + bcopy(bios_bootduid, rootduid, sizeof(rootduid)); break; default: diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index b03d59ee888..4fc4606c89d 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.91 2012/01/11 15:58:27 jsing Exp $ */ +/* $OpenBSD: bios.c,v 1.92 2012/01/11 19:33:28 krw Exp $ */ /* * Copyright (c) 1997-2001 Michael Shalayeff @@ -543,7 +543,7 @@ bios_getopt() case BOOTARG_BOOTDUID: bios_bootduid = (bios_bootduid_t *)q->ba_arg; - bcopy(bios_bootduid, bootduid, sizeof(bootduid)); + bcopy(bios_bootduid, rootduid, sizeof(rootduid)); break; default: |