From owner-freebsd-current@FreeBSD.ORG Sat Jun 12 22:21:21 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4CE2216A4CE for ; Sat, 12 Jun 2004 22:21:21 +0000 (GMT) Received: from mail.geek.sh (decoder.geek.sh [196.36.198.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7B3B43D2F for ; Sat, 12 Jun 2004 22:21:20 +0000 (GMT) (envelope-from aragon@geek.sh) Received: by mail.geek.sh (Postfix, from userid 1000) id CAE0624D13; Sun, 13 Jun 2004 00:21:10 +0200 (SAST) Date: Sun, 13 Jun 2004 00:21:10 +0200 From: Aragon Gouveia To: Doug White Message-ID: <20040612222110.GB50196@phat.za.net> References: <20040611152223.GA81299@phat.za.net> <20040612133330.Y74026@carver.gumbysoft.com> <20040612150955.O74026@carver.gumbysoft.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040612150955.O74026@carver.gumbysoft.com> User-Agent: Mutt/1.4i X-Operating-System: FreeBSD 4.8-RELEASE-p1 i386 X-Mailman-Approved-At: Sun, 13 Jun 2004 11:40:38 +0000 cc: current@freebsd.org Subject: Re: kernel compile error, 5.2.1-RELEASE X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jun 2004 22:21:21 -0000 | By Doug White | [ 2004-06-13 00:10 +0200 ] > Please try the attached patch and see if that makes the warning go away. I'm getting the following output when patching: --- Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- vga.c.orig Sat Jun 12 13:51:48 2004 |+++ vga.c Sat Jun 12 14:18:28 2004 -------------------------- Patching file vga.c using Plan A... Hunk #1 succeeded at 471. Hunk #2 succeeded at 500 with fuzz 2. Hunk #3 failed at 1330. Hunk #4 succeeded at 1350 with fuzz 1. 1 out of 4 hunks failed--saving rejects to vga.c.rej done --- Contents of vga.c.rej: --- *************** *** 1330,1335 **** return 0; } #if defined(__i386__) || defined(__amd64__) /* XXX */ static void fill(int val, void *d, size_t size) --- 1330,1336 ---- return 0; } + #ifndef VGA_NO_MODE_CHANGE #if defined(__i386__) || defined(__amd64__) /* XXX */ static void fill(int val, void *d, size_t size) --- Regards, Aragon