Deleted Added
full compact
main.c (344290) main.c (344377)
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: stable/11/stand/i386/loader/main.c 344290 2019-02-19 18:48:17Z kevans $");
28__FBSDID("$FreeBSD: stable/11/stand/i386/loader/main.c 344377 2019-02-20 19:13:09Z kevans $");
29
30/*
31 * MD bootstrap main() and assorted miscellaneous
32 * commands.
33 */
34
35#include <stand.h>
36#include <stddef.h>

--- 7 unchanged lines hidden (view full) ---

44
45#include "bootstrap.h"
46#include "common/bootargs.h"
47#include "libi386/libi386.h"
48#include "libi386/smbios.h"
49#include "btxv86.h"
50
51#ifdef LOADER_ZFS_SUPPORT
29
30/*
31 * MD bootstrap main() and assorted miscellaneous
32 * commands.
33 */
34
35#include <stand.h>
36#include <stddef.h>

--- 7 unchanged lines hidden (view full) ---

44
45#include "bootstrap.h"
46#include "common/bootargs.h"
47#include "libi386/libi386.h"
48#include "libi386/smbios.h"
49#include "btxv86.h"
50
51#ifdef LOADER_ZFS_SUPPORT
52#include "../zfs/libzfs.h"
52#include "libzfs.h"
53#endif
54
55CTASSERT(sizeof(struct bootargs) == BOOTARGS_SIZE);
56CTASSERT(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO);
57CTASSERT(offsetof(struct bootargs, bootflags) == BA_BOOTFLAGS);
58CTASSERT(offsetof(struct bootinfo, bi_size) == BI_SIZE);
59
60/* Arguments passed in from the boot1/boot2 loader */

--- 346 unchanged lines hidden ---
53#endif
54
55CTASSERT(sizeof(struct bootargs) == BOOTARGS_SIZE);
56CTASSERT(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO);
57CTASSERT(offsetof(struct bootargs, bootflags) == BA_BOOTFLAGS);
58CTASSERT(offsetof(struct bootinfo, bi_size) == BI_SIZE);
59
60/* Arguments passed in from the boot1/boot2 loader */

--- 346 unchanged lines hidden ---