From 476c12b58c2ffce36ae7e99df0e55a0feb69ed35 Mon Sep 17 00:00:00 2001 From: hpa Date: Mon, 14 Apr 2003 22:28:04 +0000 Subject: [PATCH] Use s --- memdisk/Makefile | 2 +- memdisk/e820func.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/memdisk/Makefile b/memdisk/Makefile index 43d51d8..9866db2 100644 --- a/memdisk/Makefile +++ b/memdisk/Makefile @@ -28,7 +28,7 @@ PERL = perl # Important: init.o16 must be first!! OBJS16 = init.o16 init32.o -OBJS32 = start32.o setup.o msetup.o e820func.o conio.o memcpy.o \ +OBJS32 = start32.o setup.o msetup.o e820func.o conio.o memcpy.o memset.o \ unzip.o memdisk.o CSRC = setup.c msetup.c e820func.c conio.c unzip.c diff --git a/memdisk/e820func.c b/memdisk/e820func.c index 57ab0fc..01fd6cd 100644 --- a/memdisk/e820func.c +++ b/memdisk/e820func.c @@ -18,6 +18,7 @@ */ #include +#include "memdisk.h" /* For memset() */ #include "e820.h" #define MAXRANGES 64 @@ -28,14 +29,8 @@ int nranges; void e820map_init(void) { - struct e820range *rp = ranges; - unsigned int rdw = sizeof(ranges) >> 2; + memset(ranges, 0, sizeof(ranges)); nranges = 1; - - asm volatile("cld ; rep ; stosl %2,%%es:(%0)" - : "+D" (rp), "+c" (rdw) - : "a" (0) - : "memory"); ranges[1].type = -1; } -- 2.7.4