From owner-cvs-all@FreeBSD.ORG Tue Jun 14 02:43:45 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E68FF16A41C; Tue, 14 Jun 2005 02:43:45 +0000 (GMT) (envelope-from peter@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C619643D53; Tue, 14 Jun 2005 02:43:45 +0000 (GMT) (envelope-from peter@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5E2hjWJ044695; Tue, 14 Jun 2005 02:43:45 GMT (envelope-from peter@repoman.freebsd.org) Received: (from peter@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5E2hjnh044694; Tue, 14 Jun 2005 02:43:45 GMT (envelope-from peter) Message-Id: <200506140243.j5E2hjnh044694@repoman.freebsd.org> From: Peter Wemm Date: Tue, 14 Jun 2005 02:43:45 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/dev/syscons scgfbrndr.c scvgarndr.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 02:43:46 -0000 peter 2005-06-14 02:43:45 UTC FreeBSD src repository Modified files: sys/dev/syscons scgfbrndr.c scvgarndr.c Log: Fix syscons on amd64. The SC_PIXEL_MODE commit from May 29th added a new function pointer to the vga render dispatch table and initialized it with vga_nop. The problem is that vga_nop() is a varargs function, and the table declares a non-varargs function pointer. On amd64 (and I think ppc), mixing varargs and non-varargs function pointers is fatal. Change vga_nop() and gfb_nop() from varargs to non-varargs do-nothing functions. This stops the stack corruption that only happened on amd64. Approved by: re (scottl) Revision Changes Path 1.22 +2 -2 src/sys/dev/syscons/scgfbrndr.c 1.19 +2 -2 src/sys/dev/syscons/scvgarndr.c