From owner-svn-src-head@FreeBSD.ORG  Sat Dec 28 23:02:49 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 707638D6;
 Sat, 28 Dec 2013 23:02:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5CA9511FC;
 Sat, 28 Dec 2013 23:02:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSN2nfG002493;
 Sat, 28 Dec 2013 23:02:49 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSN2nfe002492;
 Sat, 28 Dec 2013 23:02:49 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201312282302.rBSN2nfe002492@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 28 Dec 2013 23:02:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260023 - head/lib/libkvm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Dec 2013 23:02:49 -0000

Author: marcel
Date: Sat Dec 28 23:02:48 2013
New Revision: 260023
URL: http://svnweb.freebsd.org/changeset/base/260023

Log:
  Allow building a cross libkvm for ia64.

Modified:
  head/lib/libkvm/kvm_ia64.c

Modified: head/lib/libkvm/kvm_ia64.c
==============================================================================
--- head/lib/libkvm/kvm_ia64.c	Sat Dec 28 23:01:57 2013	(r260022)
+++ head/lib/libkvm/kvm_ia64.c	Sat Dec 28 23:02:48 2013	(r260023)
@@ -32,9 +32,15 @@
 #include <sys/elf64.h>
 #include <sys/mman.h>
 
+#ifndef CROSS_LIBKVM
 #include <machine/atomic.h>
 #include <machine/bootinfo.h>
 #include <machine/pte.h>
+#else
+#include "../../sys/ia64/include/atomic.h"
+#include "../../sys/ia64/include/bootinfo.h"
+#include "../../sys/ia64/include/pte.h"
+#endif
 
 #include <kvm.h>
 #include <limits.h>
@@ -163,7 +169,11 @@ _kvm_initvtop(kvm_t *kd)
 		return (-1);
 	}
 
+#ifndef CROSS_LIBKVM
 	kd->vmst->pagesize = getpagesize();
+#else
+	kd->vmst->pagesize = 8192;
+#endif
 
 	if (_kvm_maphdrs(kd, sizeof(Elf64_Ehdr)) == -1)
 		return (-1);