From owner-p4-projects@FreeBSD.ORG Mon Oct 30 23:33:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75CC016A503; Mon, 30 Oct 2006 23:33:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2DF7016A492 for ; Mon, 30 Oct 2006 23:33:26 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1038C43D45 for ; Mon, 30 Oct 2006 23:33:22 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9UNX4XP006745 for ; Mon, 30 Oct 2006 23:33:04 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9UNX3G1006700 for perforce@freebsd.org; Mon, 30 Oct 2006 23:33:03 GMT (envelope-from marcel@freebsd.org) Date: Mon, 30 Oct 2006 23:33:03 GMT Message-Id: <200610302333.k9UNX3G1006700@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 108786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2006 23:33:26 -0000 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. */