Module Name: src
Committed By: matt
Date: Thu Jun 11 08:14:38 UTC 2015
Modified Files:
src/sys/arch/hpcarm/include: kloader.h
src/sys/arch/hpcsh/include: kloader.h
src/sys/dev: kloader.c
Log Message:
Move declaration of avail_start, avail_end to <machine/kloader.h>
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcarm/include/kloader.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpcsh/include/kloader.h
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/kloader.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcarm/include/kloader.h
diff -u src/sys/arch/hpcarm/include/kloader.h:1.1 src/sys/arch/hpcarm/include/kloader.h:1.2
--- src/sys/arch/hpcarm/include/kloader.h:1.1 Sat Mar 31 14:02:54 2012
+++ src/sys/arch/hpcarm/include/kloader.h Thu Jun 11 08:14:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.h,v 1.1 2012/03/31 14:02:54 nonaka Exp $ */
+/* $NetBSD: kloader.h,v 1.2 2015/06/11 08:14:38 matt Exp $ */
/*-
* Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -38,12 +38,11 @@
#include <sys/lock.h>
-#include <uvm/uvm.h>
-
-#include <machine/pmap.h>
+#include <uvm/uvm_extern.h>
#define PG_VADDR(pg) kloader_phystov(VM_PAGE_TO_PHYS(pg))
vaddr_t kloader_phystov(paddr_t pa);
+extern paddr_t avail_start, avail_end;
#include <dev/kloader.h>
Index: src/sys/arch/hpcsh/include/kloader.h
diff -u src/sys/arch/hpcsh/include/kloader.h:1.4 src/sys/arch/hpcsh/include/kloader.h:1.5
--- src/sys/arch/hpcsh/include/kloader.h:1.4 Mon Apr 28 20:23:23 2008
+++ src/sys/arch/hpcsh/include/kloader.h Thu Jun 11 08:14:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.h,v 1.4 2008/04/28 20:23:23 martin Exp $ */
+/* $NetBSD: kloader.h,v 1.5 2015/06/11 08:14:38 matt Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -29,3 +29,5 @@
#include <dev/kloader.h>
#define PG_VADDR(pg) SH3_PHYS_TO_P1SEG(VM_PAGE_TO_PHYS(pg))
+
+extern paddr_t avail_start, avail_end;
Index: src/sys/dev/kloader.c
diff -u src/sys/dev/kloader.c:1.26 src/sys/dev/kloader.c:1.27
--- src/sys/dev/kloader.c:1.26 Sat Jan 25 10:14:29 2014
+++ src/sys/dev/kloader.c Thu Jun 11 08:14:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.c,v 1.26 2014/01/25 10:14:29 skrll Exp $ */
+/* $NetBSD: kloader.c,v 1.27 2015/06/11 08:14:38 matt Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kloader.c,v 1.26 2014/01/25 10:14:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kloader.c,v 1.27 2015/06/11 08:14:38 matt Exp $");
#include "debug_kloader.h"
@@ -426,7 +426,6 @@ kloader_load(void)
int
kloader_alloc_memory(size_t sz)
{
- extern paddr_t avail_start, avail_end;
int n, error;
n = (sz + BUCKET_SIZE - 1) / BUCKET_SIZE /* kernel &co */
