From 7ec87b04c79f67c4116f38e123cee1ed377c8d61 Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 27 Feb 2002 22:12:29 +0000 Subject: [PATCH] Back out part of KSE/M2 that snuck in under the radar: changing the prototype of bzero() on the i386 to have a volatile first argument. Requested by: bde, jake --- sys/amd64/include/md_var.h | 4 ++-- sys/i386/include/md_var.h | 4 ++-- sys/sys/systm.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index 091dfd1b5b02..ab47a94bd11a 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -80,9 +80,9 @@ void doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault)); void doreti_popl_fs __P((void)) __asm(__STRING(doreti_popl_fs)); void doreti_popl_fs_fault __P((void)) __asm(__STRING(doreti_popl_fs_fault)); void fillw __P((int /*u_short*/ pat, void *base, size_t cnt)); -void i486_bzero __P((volatile void *buf, size_t len)); +void i486_bzero __P((void *buf, size_t len)); void i586_bcopy __P((const void *from, void *to, size_t len)); -void i586_bzero __P((volatile void *buf, size_t len)); +void i586_bzero __P((void *buf, size_t len)); int i586_copyin __P((const void *udaddr, void *kaddr, size_t len)); int i586_copyout __P((const void *kaddr, void *udaddr, size_t len)); void i686_pagezero __P((void *addr)); diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h index 091dfd1b5b02..ab47a94bd11a 100644 --- a/sys/i386/include/md_var.h +++ b/sys/i386/include/md_var.h @@ -80,9 +80,9 @@ void doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault)); void doreti_popl_fs __P((void)) __asm(__STRING(doreti_popl_fs)); void doreti_popl_fs_fault __P((void)) __asm(__STRING(doreti_popl_fs_fault)); void fillw __P((int /*u_short*/ pat, void *base, size_t cnt)); -void i486_bzero __P((volatile void *buf, size_t len)); +void i486_bzero __P((void *buf, size_t len)); void i586_bcopy __P((const void *from, void *to, size_t len)); -void i586_bzero __P((volatile void *buf, size_t len)); +void i586_bzero __P((void *buf, size_t len)); int i586_copyin __P((const void *udaddr, void *kaddr, size_t len)); int i586_copyout __P((const void *kaddr, void *udaddr, size_t len)); void i686_pagezero __P((void *addr)); diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 459d642848ce..c2178f1bc5a0 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -155,7 +155,7 @@ void bcopy __P((const void *from, void *to, size_t len)); void ovbcopy __P((const void *from, void *to, size_t len)); #ifdef __i386__ -extern void (*bzero) __P((volatile void *buf, size_t len)); +extern void (*bzero) __P((void *buf, size_t len)); #else void bzero __P((void *buf, size_t len)); #endif