Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Move declaration of avail_start, avail_end to <machine/k...
details: https://anonhg.NetBSD.org/src/rev/38747ba39fda
branches: trunk
changeset: 338839:38747ba39fda
user: matt <matt%NetBSD.org@localhost>
date: Thu Jun 11 08:14:38 2015 +0000
description:
Move declaration of avail_start, avail_end to <machine/kloader.h>
diffstat:
sys/arch/hpcarm/include/kloader.h | 7 +++----
sys/arch/hpcsh/include/kloader.h | 4 +++-
sys/dev/kloader.c | 5 ++---
3 files changed, 8 insertions(+), 8 deletions(-)
diffs (65 lines):
diff -r 37ec5aa00343 -r 38747ba39fda sys/arch/hpcarm/include/kloader.h
--- a/sys/arch/hpcarm/include/kloader.h Thu Jun 11 08:04:44 2015 +0000
+++ b/sys/arch/hpcarm/include/kloader.h Thu Jun 11 08:14:38 2015 +0000
@@ -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>
diff -r 37ec5aa00343 -r 38747ba39fda sys/arch/hpcsh/include/kloader.h
--- a/sys/arch/hpcsh/include/kloader.h Thu Jun 11 08:04:44 2015 +0000
+++ b/sys/arch/hpcsh/include/kloader.h Thu Jun 11 08:14:38 2015 +0000
@@ -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;
diff -r 37ec5aa00343 -r 38747ba39fda sys/dev/kloader.c
--- a/sys/dev/kloader.c Thu Jun 11 08:04:44 2015 +0000
+++ b/sys/dev/kloader.c Thu Jun 11 08:14:38 2015 +0000
@@ -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 @@
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 */
Home |
Main Index |
Thread Index |
Old Index