[src/trunk]: src/sys/arch/x86/x86 Revert previous

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/66a73d7516ef
branches:  trunk
changeset: 320439:66a73d7516ef
user:      kamil <kamil%NetBSD.org@localhost>
date:      Sun Jul 08 14:46:23 2018 +0000

description:
Revert previous

Misalignment access handling patches are now discussed on tech-kern.

Requested by <martin> and <christos>.

diffstat:

 sys/arch/x86/x86/mpbios.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 3f6b5b05378d -r 66a73d7516ef sys/arch/x86/x86/mpbios.c
--- a/sys/arch/x86/x86/mpbios.c Sun Jul 08 14:42:52 2018 +0000
+++ b/sys/arch/x86/x86/mpbios.c Sun Jul 08 14:46:23 2018 +0000
@@ -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 @@
        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;