diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index e4186eeaace..abc6d0ef9ed 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.201 1996/09/03 18:50:36 nate Exp $ + * $Id: machdep.c,v 1.202 1996/09/06 23:07:03 phk Exp $ */ #include "npx.h" @@ -1144,17 +1144,6 @@ init386(first) bootinfo.bi_extmem, biosextmem); } - /* - * Some 386 machines might give us a bogus number for extended - * mem. If this happens, stop now. - */ -#ifndef LARGEMEM - if (biosextmem > 65536) { - panic("extended memory beyond limit of 64MB"); - /* NOTREACHED */ - } -#endif - pagesinbase = biosbasemem * 1024 / PAGE_SIZE; pagesinext = biosextmem * 1024 / PAGE_SIZE; diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 7a839e6e2ee..11837174799 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.15 1996/09/06 23:33:45 pst Exp $ +# $Id: options.i386,v 1.16 1996/09/10 21:38:47 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -9,7 +9,6 @@ COMPAT_LINUX opt_dontuse.h SHOW_BUSYBUFS opt_machdep.h PANIC_REBOOT_WAIT_TIME opt_machdep.h -LARGEMEM opt_machdep.h MAXMEM opt_machdep.h PERFMON opt_perfmon.h AUTO_EOI_1 opt_auto_eoi.h diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 7a839e6e2ee..11837174799 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.15 1996/09/06 23:33:45 pst Exp $ +# $Id: options.i386,v 1.16 1996/09/10 21:38:47 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -9,7 +9,6 @@ COMPAT_LINUX opt_dontuse.h SHOW_BUSYBUFS opt_machdep.h PANIC_REBOOT_WAIT_TIME opt_machdep.h -LARGEMEM opt_machdep.h MAXMEM opt_machdep.h PERFMON opt_perfmon.h AUTO_EOI_1 opt_auto_eoi.h diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index e4186eeaace..abc6d0ef9ed 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.201 1996/09/03 18:50:36 nate Exp $ + * $Id: machdep.c,v 1.202 1996/09/06 23:07:03 phk Exp $ */ #include "npx.h" @@ -1144,17 +1144,6 @@ init386(first) bootinfo.bi_extmem, biosextmem); } - /* - * Some 386 machines might give us a bogus number for extended - * mem. If this happens, stop now. - */ -#ifndef LARGEMEM - if (biosextmem > 65536) { - panic("extended memory beyond limit of 64MB"); - /* NOTREACHED */ - } -#endif - pagesinbase = biosbasemem * 1024 / PAGE_SIZE; pagesinext = biosextmem * 1024 / PAGE_SIZE;