From fa88cd5aa170a1a7ee7092c780deb31535372277 Mon Sep 17 00:00:00 2001
From: Venkatesh Srinivas <me@endeavour.zapto.org>
Date: Fri, 9 Dec 2011 22:50:15 -0800
Subject: [PATCH] kernel -- Remove references to obsolete i586 optimized bcopy.

The code had been disabled for some time; GC it.
---
 sys/platform/pc32/i386/identcpu.c  |  1 -
 sys/platform/pc32/include/md_var.h |  7 -------
 sys/platform/pc32/isa/npx.c        | 16 ----------------
 3 files changed, 24 deletions(-)

diff --git a/sys/platform/pc32/i386/identcpu.c b/sys/platform/pc32/i386/identcpu.c
index a09cc6d67a..37813f7707 100644
--- a/sys/platform/pc32/i386/identcpu.c
+++ b/sys/platform/pc32/i386/identcpu.c
@@ -638,7 +638,6 @@ printcpuinfo(void)
 #if defined(I486_CPU)
 	case CPUCLASS_486:
 		kprintf("486");
-		/* bzero_vector = i486_bzero; */
 		break;
 #endif
 #if defined(I586_CPU)
diff --git a/sys/platform/pc32/include/md_var.h b/sys/platform/pc32/include/md_var.h
index 1f6addae86..0e78241237 100644
--- a/sys/platform/pc32/include/md_var.h
+++ b/sys/platform/pc32/include/md_var.h
@@ -110,13 +110,6 @@ void    dump_add_page(vm_paddr_t);
 void    dump_drop_page(vm_paddr_t);
 void	enable_sse (void);
 void	fillw (int /*u_short*/ pat, void *base, size_t cnt);
-#if 0
-void	i486_bzero (volatile void *buf, size_t len);
-void	i586_bzero (volatile void *buf, size_t len);
-void	i586_bcopy (const void *from, void *to, size_t len);
-int	i586_copyin (const void *udaddr, void *kaddr, size_t len);
-int	i586_copyout (const void *kaddr, void *udaddr, size_t len);
-#endif
 void	asm_generic_memcpy(void);
 void	asm_mmx_memcpy(void);
 void	asm_xmm_memcpy(void);
diff --git a/sys/platform/pc32/isa/npx.c b/sys/platform/pc32/isa/npx.c
index 333015eeb9..b62674caaa 100644
--- a/sys/platform/pc32/isa/npx.c
+++ b/sys/platform/pc32/isa/npx.c
@@ -481,22 +481,6 @@ npx_attach(device_t dev)
 		}
 	}
 
-#endif
-#if 0
-	if (cpu_class == CPUCLASS_586 && npx_ex16 && npx_exists &&
-	    timezero("i586_bzero()", i586_bzero) <
-	    timezero("bzero()", bzero) * 4 / 5) {
-		if (!(flags & NPX_DISABLE_I586_OPTIMIZED_BCOPY)) {
-			bcopy_vector = i586_bcopy;
-			ovbcopy_vector = i586_bcopy;
-		}
-		if (!(flags & NPX_DISABLE_I586_OPTIMIZED_BZERO))
-			bzero_vector = i586_bzero;
-		if (!(flags & NPX_DISABLE_I586_OPTIMIZED_COPYIO)) {
-			copyin_vector = i586_copyin;
-			copyout_vector = i586_copyout;
-		}
-	}
 #endif
 	return (0);		/* XXX unused */
 }
-- 
2.41.0