diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-09-02 04:25:40 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-09-02 04:25:40 +0000 |
| commit | 7be54aa04984e4ee68c7ec4672aef608ab12c9f6 (patch) | |
| tree | c43add8106da25e752beea33e26b26a9c6c73e60 /sys/arch/i386/stand/libsa | |
| parent | c21a6995acfbd41fe35f958ae5dff6d5796f7079 (diff) | |
Fix the bios boot to pass the bootargs properly.
ok deraddt
Diffstat (limited to 'sys/arch/i386/stand/libsa')
| -rw-r--r-- | sys/arch/i386/stand/libsa/exec_i386.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/i386/stand/libsa/exec_i386.c b/sys/arch/i386/stand/libsa/exec_i386.c index 9165f1ce055..4672b9761af 100644 --- a/sys/arch/i386/stand/libsa/exec_i386.c +++ b/sys/arch/i386/stand/libsa/exec_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_i386.c,v 1.40 2015/09/02 04:09:24 yasuoka Exp $ */ +/* $OpenBSD: exec_i386.c,v 1.41 2015/09/02 04:25:39 yasuoka Exp $ */ /* * Copyright (c) 1997-1998 Michael Shalayeff @@ -117,11 +117,15 @@ run_loadfile(u_long *marks, int howto) /* Pass memory map to the kernel */ mem_pass(); +#ifdef __amd64__ /* * This code may be used both for 64bit and 32bit. Make sure the * bootarg is 32bit always on even on amd64. */ makebootargs32(av, &ac); +#else + makebootargs(av, &ac); +#endif entry = marks[MARK_ENTRY] & 0x0fffffff; |