diff options
| author |   guenther <guenther@openbsd.org> | 2014-11-08 03:31:58 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2014-11-08 03:31:58 +0000 |
| commit | 121ad8e216d7e828b097bf0bd4af31b05f062002 (patch) | |
| tree | 531c43b633e6de223327b80b4b9629d7ff769ed0 | |
| parent | Split bcd(6), morse(6), and ppt(6) into three separate manuals (diff) | |
| download | wireguard-openbsd-121ad8e216d7e828b097bf0bd4af31b05f062002.tar.xz wireguard-openbsd-121ad8e216d7e828b097bf0bd4af31b05f062002.zip | |
Kill #if 0'ed code for boot args that we don't care about on amd64.
ok deraadt@ mlarkin@ kettenis@
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index fde7f8d7c0b..5f5c32e02df 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.193 2014/10/09 04:18:09 tedu Exp $ */ +/* $OpenBSD: machdep.c,v 1.194 2014/11/08 03:31:58 guenther Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -246,12 +246,6 @@ int bootinfo_size = BOOTARGC_MAX; void getbootinfo(char *, int); /* Data passed to us by /boot, filled in by getbootinfo() */ -#if NAPM > 0 || defined(DEBUG) -bios_apminfo_t *apm; -#endif -#if NPCI > 0 -bios_pciinfo_t *bios_pciinfo; -#endif bios_diskinfo_t *bios_diskinfo; bios_memmap_t *bios_memmap; u_int32_t bios_cksumlen; @@ -1800,32 +1794,18 @@ getbootinfo(char *bootinfo, int bootinfo_size) printf(" diskinfo %p", bios_diskinfo); #endif break; -#if 0 -#if NAPM > 0 || defined(DEBUG) case BOOTARG_APMINFO: -#ifdef BOOTINFO_DEBUG - printf(" apminfo %p", q->ba_arg); -#endif - apm = (bios_apminfo_t *)q->ba_arg; + /* generated by i386 boot loader */ break; -#endif -#endif case BOOTARG_CKSUMLEN: bios_cksumlen = *(u_int32_t *)q->ba_arg; #ifdef BOOTINFO_DEBUG printf(" cksumlen %d", bios_cksumlen); #endif break; -#if 0 -#if NPCI > 0 case BOOTARG_PCIINFO: - bios_pciinfo = (bios_pciinfo_t *)q->ba_arg; -#ifdef BOOTINFO_DEBUG - printf(" pciinfo %p", bios_pciinfo); -#endif + /* generated by i386 boot loader */ break; -#endif -#endif case BOOTARG_CONSDEV: if (q->ba_size >= sizeof(bios_consdev_t) + offsetof(struct _boot_args32, ba_arg)) { |