Don't expose port-specific if _MODULE is defined.
Don't _MACHINE_CPU_H_, _<PORT>_CPU_H_
This commit is contained in:
matt
parent
179b37ab20
commit
d9c7720855
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.19 2011/01/20 15:44:56 phx Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.20 2011/06/20 06:35:39 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995-1997 Wolfgang Solfrank.
|
||||
@ -30,12 +30,12 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _AMIGAPPC_CPU_H_
|
||||
#define _AMIGAPPC_CPU_H_
|
||||
#define _MACHINE_CPU_H_ /* for <m68k/cpu.h> */
|
||||
|
||||
#if defined(_KERNEL)
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#define CPU_MAXNUM 1
|
||||
|
||||
/*
|
||||
* Amiga models
|
||||
*/
|
||||
@ -67,8 +67,6 @@ int dma_cachectl(void *, int);
|
||||
*/
|
||||
int badaddr_read(void *, size_t, int *);
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
||||
/*
|
||||
* Reorder protection when accessing device registers.
|
||||
*/
|
||||
@ -79,6 +77,8 @@ int badaddr_read(void *, size_t, int *);
|
||||
*/
|
||||
#define amiga_cpu_sync() __asm volatile ("sync; isync")
|
||||
|
||||
#endif /* _KERNEL && !_MODULE */
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#endif /* _AMIGAPPC_CPU_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.12 2007/10/17 19:53:59 garbled Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.13 2011/06/20 06:35:39 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995-1997 Wolfgang Solfrank.
|
||||
@ -30,14 +30,14 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _BEBOX_CPU_H_
|
||||
#define _BEBOX_CPU_H_
|
||||
|
||||
#if defined(_KERNEL)
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#define CPU_MAXNUM 2
|
||||
extern char bootpath[];
|
||||
#endif
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#endif /* _BEBOX_CPU_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.6 2011/06/18 06:44:26 matt Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.7 2011/06/20 06:35:40 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002 Wasabi Systems, Inc.
|
||||
@ -35,15 +35,15 @@
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _EVBPPC_CPU_H_
|
||||
#define _EVBPPC_CPU_H_
|
||||
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_ppcarch.h"
|
||||
#include "opt_multiprocessor.h"
|
||||
#endif
|
||||
|
||||
#ifdef _KERNEL
|
||||
#ifdef PPC_IBM4XX
|
||||
extern int fake_mapiodev;
|
||||
#endif
|
||||
@ -54,11 +54,13 @@ extern int fake_mapiodev;
|
||||
#define CPU_MAXNUM 1
|
||||
#endif
|
||||
|
||||
#endif /* _KERNEL && !_MODULE */
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#if defined(_KERNEL)
|
||||
extern char module_machine_booke[];
|
||||
extern char module_machine_ibm4xx[];
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#endif /* _EVBPPC_CPU_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.2 2005/12/11 12:17:50 christos Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.3 2011/06/20 06:35:40 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995-1997 Wolfgang Solfrank.
|
||||
@ -30,14 +30,14 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _IBMNWS_CPU_H_
|
||||
#define _IBMNWS_CPU_H_
|
||||
|
||||
#if defined(_KERNEL)
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#define CPU_MAXNUM 1
|
||||
extern char *bootpath;
|
||||
#endif
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#endif /* _IBMNWS_CPU_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.18 2001/08/26 02:47:37 matt Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.19 2011/06/20 06:35:40 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995-1997 Wolfgang Solfrank.
|
||||
@ -30,14 +30,14 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _MACPPC_CPU_H_
|
||||
#define _MACPPC_CPU_H_
|
||||
|
||||
#if defined(_KERNEL)
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#define CPU_MAXNUM 2
|
||||
extern char bootpath[];
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#endif /* _MACPPC_CPU_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.1 2002/02/27 21:02:14 scw Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.2 2011/06/20 06:35:40 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995-1997 Wolfgang Solfrank.
|
||||
@ -30,15 +30,12 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _MVMEPPC_CPU_H_
|
||||
#define _MVMEPPC_CPU_H_
|
||||
|
||||
#ifdef _KERNEL
|
||||
#define CPU_MAXNUM 1
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#define CPU_MAXNUM 1
|
||||
extern char *bootpath;
|
||||
#endif
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#define MVMEPPC_FAMILY(m) ((m) & 0xfff0)
|
||||
|
||||
@ -47,5 +44,8 @@ extern char *bootpath;
|
||||
#define MVMEPPC_FAMILY_230x 0x2300
|
||||
#define MVMEPPC_FAMILY_240x 0x2400
|
||||
#define MVMEPPC_FAMILY_360x 0x3600
|
||||
#endif /* _KERNEL && !_MODULE */
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#endif /* _MVMEPPC_CPU_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.23 2008/04/08 02:33:03 garbled Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.24 2011/06/20 06:35:40 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995-1997 Wolfgang Solfrank.
|
||||
@ -30,14 +30,14 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _OFPPC_CPU_H_
|
||||
#define _OFPPC_CPU_H_
|
||||
|
||||
#if defined(_KERNEL)
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#define CPU_MAXNUM 16
|
||||
extern char bootpath[];
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#endif /* _OFPPC_CPU_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.9 2007/10/17 19:56:49 garbled Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.10 2011/06/20 06:35:40 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995-1997 Wolfgang Solfrank.
|
||||
@ -30,14 +30,14 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _PREP_CPU_H_
|
||||
#define _PREP_CPU_H_
|
||||
|
||||
#if defined(_KERNEL)
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#define CPU_MAXNUM 2
|
||||
extern char bootpath[];
|
||||
#endif
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#endif /* _PREP_CPU_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.1 2007/12/17 19:09:10 garbled Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.2 2011/06/20 06:35:41 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995-1997 Wolfgang Solfrank.
|
||||
@ -30,14 +30,14 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _RS6000_CPU_H_
|
||||
#define _RS6000_CPU_H_
|
||||
|
||||
#if defined(_KERNEL)
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#define CPU_MAXNUM 1
|
||||
extern char bootpath[];
|
||||
#endif
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#endif /* _RS6000_CPU_H_ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.h,v 1.3 2001/08/26 02:47:38 matt Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.4 2011/06/20 06:35:41 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995-1997 Wolfgang Solfrank.
|
||||
@ -30,14 +30,14 @@
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _MACHINE_CPU_H_
|
||||
#define _MACHINE_CPU_H_
|
||||
#ifndef _SANDPOINT_CPU_H_
|
||||
#define _SANDPOINT_CPU_H_
|
||||
|
||||
#ifdef _KERNEL
|
||||
#if defined(_KERNEL) && !defined(_MODULE)
|
||||
#define CPU_MAXNUM 1
|
||||
extern char *bootpath;
|
||||
#endif
|
||||
|
||||
#include <powerpc/cpu.h>
|
||||
|
||||
#endif /* _MACHINE_CPU_H_ */
|
||||
#endif /* _SANDPOINT_CPU_H_ */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user