Module Name: src
Committed By: tsutsui
Date: Mon Mar 23 13:52:32 UTC 2009
Modified Files:
src/sys/arch/vax/boot/xxboot: bootxx.c
Log Message:
Revert kludge in previous.
The warning was triggered by __builtin_memcpy() on vax, and
it has been disabled in libkern.h for _STANDALONE programs.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/vax/boot/xxboot/bootxx.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/vax/boot/xxboot/bootxx.c
diff -u src/sys/arch/vax/boot/xxboot/bootxx.c:1.34 src/sys/arch/vax/boot/xxboot/bootxx.c:1.35
--- src/sys/arch/vax/boot/xxboot/bootxx.c:1.34 Thu Mar 19 14:11:20 2009
+++ src/sys/arch/vax/boot/xxboot/bootxx.c Mon Mar 23 13:52:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.34 2009/03/19 14:11:20 he Exp $ */
+/* $NetBSD: bootxx.c,v 1.35 2009/03/23 13:52:32 tsutsui Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -264,7 +264,6 @@
int block = dblk;
int nsize = size;
char *cbuf;
- char *nullptr = NULL;
cbuf = (char *)buf;
@@ -285,7 +284,7 @@
hpread(block);
else
read750(block, (int *)bootregs);
- memcpy(cbuf, nullptr, 512);
+ memcpy(cbuf, 0, 512);
size -= 512;
cbuf += 512;
block++;
