Date: Wed, 17 Oct 2018 02:45:16 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r339405 - stable/11/stand/pc98/loader Message-ID: <201810170245.w9H2jGIP016697@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Oct 17 02:45:15 2018 New Revision: 339405 URL: https://svnweb.freebsd.org/changeset/base/339405 Log: Direct commit to stable, file not present in current Catch up to r332154: Fix d_dev removal of d_type. Modified: stable/11/stand/pc98/loader/main.c Modified: stable/11/stand/pc98/loader/main.c ============================================================================== --- stable/11/stand/pc98/loader/main.c Wed Oct 17 02:25:15 2018 (r339404) +++ stable/11/stand/pc98/loader/main.c Wed Oct 17 02:45:15 2018 (r339405) @@ -253,13 +253,12 @@ extract_currdev(void) biosdev = (major << 3) + 0x80 + B_UNIT(initial_bootdev); } } - new_currdev.dd.d_type = new_currdev.dd.d_dev->dv_type; /* * If we are booting off of a BIOS disk and we didn't succeed in determining * which one we booted off of, just use disk0: as a reasonable default. */ - if ((new_currdev.dd.d_type == biosdisk.dv_type) && + if ((new_currdev.dd.d_dev->dv_type == biosdisk.dv_type) && ((new_currdev.dd.d_unit = bd_bios2unit(biosdev)) == -1)) { printf("Can't work out which disk we are booting from.\n" "Guessed BIOS device 0x%x not found by probes, defaulting to disk0:\n", biosdev);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810170245.w9H2jGIP016697>