Module Name: src
Committed By: matt
Date: Mon Jun 20 08:18:28 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: genassym.cf locore_subr.S
Log Message:
If this is a MODULAR kernel, export USRSTACK and CPU_MAXNUM as linker symbols
so modules can access them.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/powerpc/genassym.cf
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/powerpc/powerpc/locore_subr.S
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/powerpc/powerpc/genassym.cf
diff -u src/sys/arch/powerpc/powerpc/genassym.cf:1.7 src/sys/arch/powerpc/powerpc/genassym.cf:1.8
--- src/sys/arch/powerpc/powerpc/genassym.cf:1.7 Sat Jun 18 21:17:29 2011
+++ src/sys/arch/powerpc/powerpc/genassym.cf Mon Jun 20 08:18:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.7 2011/06/18 21:17:29 matt Exp $
+# $NetBSD: genassym.cf,v 1.8 2011/06/20 08:18:28 matt Exp $
#-
# Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -48,23 +48,26 @@
quote #define __INTR_PRIVATE
include <sys/param.h>
-include <sys/intr.h>
+include <sys/bitops.h>
include <sys/cpu.h>
-include <sys/mutex.h>
-include <sys/rwlock.h>
+include <sys/intr.h>
include <sys/lwp.h>
+include <sys/mutex.h>
include <sys/proc.h>
-include <sys/bitops.h>
+include <sys/rwlock.h>
include <uvm/uvm_extern.h>
-include <machine/pcb.h>
-include <machine/frame.h>
+include <powerpc/frame.h>
+include <powerpc/pcb.h>
+include <powerpc/psl.h>
define IPL_HIGH IPL_HIGH
define IPL_SCHED IPL_SCHED
define IPL_VM IPL_VM
+define CPU_MAXNUM CPU_MAXNUM
+
define FRAMELEN FRAMELEN
define FRAME_TF offsetof(struct ktrapframe, ktf_tf)
define FRAME_R0 offsetof(struct ktrapframe, ktf_tf.tf_fixreg[0])
@@ -198,6 +201,7 @@
define PAGE_SIZE PAGE_SIZE
define PAGE_MASK PAGE_MASK
define PAGE_SHIFT PAGE_SHIFT
+define USRSTACK USRSTACK
ifdef __HAVE_FAST_SOFTINTS
define __HAVE_FAST_SOFTINTS __HAVE_FAST_SOFTINTS
Index: src/sys/arch/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.44 src/sys/arch/powerpc/powerpc/locore_subr.S:1.45
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.44 Fri Jun 17 23:14:40 2011
+++ src/sys/arch/powerpc/powerpc/locore_subr.S Mon Jun 20 08:18:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_subr.S,v 1.44 2011/06/17 23:14:40 matt Exp $ */
+/* $NetBSD: locore_subr.S,v 1.45 2011/06/20 08:18:28 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -77,6 +77,7 @@
#include "opt_lockdebug.h"
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
+#include "opt_modular.h"
#ifdef DDB
#define CFRAME_LRSAVE(t0) \
@@ -142,6 +143,13 @@
GLOBAL(powersave)
.long -1
+#ifdef MODULAR
+ .global __USRSTACK
+ .equ __USRSTACK, USRSTACK
+ .global __CPU_MAXNUM
+ .equ __CPU_MAXNUM, CPU_MAXNUM
+#endif
+
.text
.align 2
/*
