From owner-svn-src-head@FreeBSD.ORG Mon Dec 5 03:10:02 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 477C41065676; Mon, 5 Dec 2011 03:10:02 +0000 (UTC) (envelope-from jchandra@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3199A8FC13; Mon, 5 Dec 2011 03:10:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB53A2aM014544; Mon, 5 Dec 2011 03:10:02 GMT (envelope-from jchandra@svn.freebsd.org) Received: (from jchandra@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB53A2bt014543; Mon, 5 Dec 2011 03:10:02 GMT (envelope-from jchandra@svn.freebsd.org) Message-Id: <201112050310.pB53A2bt014543@svn.freebsd.org> From: "Jayachandran C." Date: Mon, 5 Dec 2011 03:10:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228272 - head/sys/mips/nlm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 03:10:02 -0000 Author: jchandra Date: Mon Dec 5 03:10:01 2011 New Revision: 228272 URL: http://svn.freebsd.org/changeset/base/228272 Log: Fix N32 compilation again for XLP. Disable DDB/KDB related options for N32, and add back a cast that was lost during the last set of updates. Reported by: gonzo, bz Modified: head/sys/mips/nlm/xlp_machdep.c Modified: head/sys/mips/nlm/xlp_machdep.c ============================================================================== --- head/sys/mips/nlm/xlp_machdep.c Mon Dec 5 02:56:08 2011 (r228271) +++ head/sys/mips/nlm/xlp_machdep.c Mon Dec 5 03:10:01 2011 (r228272) @@ -278,7 +278,7 @@ xlp_bootargs_init(__register_t arg) phandle_t chosen; ihandle_t mask; - dtbp = (void *)arg; + dtbp = (void *)(intptr_t)arg; #if defined(FDT_DTB_STATIC) /* * In case the device tree blob was not passed as argument try