Module Name: src Committed By: kamil Date: Sun Jul 8 14:46:23 UTC 2018
Modified Files: src/sys/arch/x86/x86: mpbios.c Log Message: Revert previous Misalignment access handling patches are now discussed on tech-kern. Requested by <martin> and <christos>. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/x86/x86/mpbios.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/x86/x86/mpbios.c diff -u src/sys/arch/x86/x86/mpbios.c:1.67 src/sys/arch/x86/x86/mpbios.c:1.68 --- src/sys/arch/x86/x86/mpbios.c:1.67 Sat Jul 7 23:05:50 2018 +++ src/sys/arch/x86/x86/mpbios.c Sun Jul 8 14:46:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: mpbios.c,v 1.67 2018/07/07 23:05:50 kamil Exp $ */ +/* $NetBSD: mpbios.c,v 1.68 2018/07/08 14:46:23 kamil Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.67 2018/07/07 23:05:50 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.68 2018/07/08 14:46:23 kamil Exp $"); #include "acpica.h" #include "lapic.h" @@ -305,8 +305,7 @@ mpbios_probe(device_t self) ebda = *(const uint16_t *)(&mpbios_page[0x40e]); ebda <<= 4; - memtop = mpbios_page[0x413]; - memtop |= (uint16_t)mpbios_page[0x414] << 8; + memtop = *(const uint16_t *)(&mpbios_page[0x413]); memtop <<= 10; mpbios_page = NULL;