From owner-svn-src-projects@FreeBSD.ORG  Fri Mar 18 23:55:26 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09EEB1065670;
	Fri, 18 Mar 2011 23:55:26 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EEB6C8FC1B;
	Fri, 18 Mar 2011 23:55:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2INtP1W083907;
	Fri, 18 Mar 2011 23:55:25 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2INtP0J083905;
	Fri, 18 Mar 2011 23:55:25 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201103182355.p2INtP0J083905@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 18 Mar 2011 23:55:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219762 - projects/altix/sys/ia64/ia64
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Mar 2011 23:55:26 -0000

Author: marcel
Date: Fri Mar 18 23:55:25 2011
New Revision: 219762
URL: http://svn.freebsd.org/changeset/base/219762

Log:
  Fix merge botch.

Modified:
  projects/altix/sys/ia64/ia64/genassym.c

Modified: projects/altix/sys/ia64/ia64/genassym.c
==============================================================================
--- projects/altix/sys/ia64/ia64/genassym.c	Fri Mar 18 23:48:06 2011	(r219761)
+++ projects/altix/sys/ia64/ia64/genassym.c	Fri Mar 18 23:55:25 2011	(r219762)
@@ -82,11 +82,6 @@ ASSYM(IA64_PBVM_PAGE_SHIFT, IA64_PBVM_PA
 ASSYM(IA64_PBVM_PGTBL,	IA64_PBVM_PGTBL);
 ASSYM(IA64_PBVM_RR,	IA64_PBVM_RR);
 
-ASSYM(IA64_PBVM_BASE,	IA64_PBVM_BASE);
-ASSYM(IA64_PBVM_PAGE_SHIFT, IA64_PBVM_PAGE_SHIFT);
-ASSYM(IA64_PBVM_PGTBL,	IA64_PBVM_PGTBL);
-ASSYM(IA64_PBVM_RR,	IA64_PBVM_RR);
-
 ASSYM(KSTACK_PAGES,	KSTACK_PAGES);
 
 ASSYM(MC_PRESERVED,	offsetof(mcontext_t, mc_preserved));