Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Mar 2011 23:55:25 +0000 (UTC)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r219762 - projects/altix/sys/ia64/ia64
Message-ID:  <201103182355.p2INtP0J083905@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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));



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103182355.p2INtP0J083905>