Date: Mon, 30 Oct 2006 23:33:03 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 108786 for review Message-ID: <200610302333.k9UNX3G1006700@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=108786 Change 108786 by marcel@marcel_cluster on 2006/10/30 23:32:51 Don't unconditionally compile bcache.c. Only the i386 and pc98 biosdisk code uses it. Add HAVE_BCACHE to the respective makefiles to control inclusion. Remove gratuitous calls to bcache_init(). Affected files ... .. //depot/projects/ia64/sys/boot/common/Makefile.inc#10 edit .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#19 edit .. //depot/projects/ia64/sys/boot/ofw/common/main.c#5 edit .. //depot/projects/ia64/sys/boot/pc98/loader/Makefile#15 edit .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#20 edit Differences ... ==== //depot/projects/ia64/sys/boot/common/Makefile.inc#10 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.22 2006/05/12 04:09:52 jhb Exp $ -SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c +SRCS+= boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= module.c panic.c @@ -19,6 +19,10 @@ SRCS+= dev_net.c .endif +.if defined(HAVE_BCACHE) +SRCS+= bcache.c +.endif + # Machine-independant ISA PnP .if defined(HAVE_ISABUS) SRCS+= isapnp.c ==== //depot/projects/ia64/sys/boot/i386/loader/Makefile#19 (text+ko) ==== @@ -16,6 +16,9 @@ CFLAGS+= -DLOADER_NFS_SUPPORT .endif +# Include bcache code. +HAVE_BCACHE= yes + # Enable PnP and ISA-PnP code. HAVE_PNP= yes HAVE_ISABUS= yes ==== //depot/projects/ia64/sys/boot/ofw/common/main.c#5 (text+ko) ==== @@ -125,11 +125,6 @@ init_heap(); /* - * Initialise the block cache - */ - bcache_init(32, 512); /* 16k XXX tune this */ - - /* * March through the device switch probing for things. */ for (i = 0; devsw[i] != NULL; i++) ==== //depot/projects/ia64/sys/boot/pc98/loader/Makefile#15 (text+ko) ==== @@ -17,6 +17,8 @@ CFLAGS+= -DLOADER_NFS_SUPPORT .endif +HAVE_BCACHE= yes + # Enable PnP and ISA-PnP code. HAVE_PNP= yes HAVE_ISABUS= yes ==== //depot/projects/ia64/sys/boot/sparc64/loader/main.c#20 (text+ko) ==== @@ -487,8 +487,6 @@ mmu_ops->tlb_init(); - bcache_init(32, 512); - /* * Initialize devices. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610302333.k9UNX3G1006700>