Zap some latent problems hidden by differences between KERNEL and _KERNEL.
The KAME code intruduces _KERNEL, which exposes some of them.
This commit is contained in:
parent
4239682e7f
commit
33f86cee91
@ -635,4 +635,4 @@ label: ASCIZ msg; \
|
||||
#define __KERNEL_RCSID(_n, _s) /* nothing */
|
||||
#endif
|
||||
|
||||
#endif /* _KERNEL */
|
||||
#endif /* KERNEL */
|
||||
|
@ -176,6 +176,6 @@ void syscall __P((u_int64_t, struct trapframe *));
|
||||
void trap __P((unsigned long, unsigned long, unsigned long, unsigned long,
|
||||
struct trapframe *));
|
||||
|
||||
#endif /* _KERNEL */
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* _ALPHA_CPU_H_ */
|
||||
|
@ -165,20 +165,3 @@
|
||||
#define alpha_ptob(x) ((unsigned long)(x) << PAGE_SHIFT)
|
||||
|
||||
#define pgtok(x) ((x) * (PAGE_SIZE / 1024))
|
||||
|
||||
#ifdef _KERNEL
|
||||
#ifndef _LOCORE
|
||||
|
||||
void delay __P((unsigned long));
|
||||
#define DELAY(n) delay(n)
|
||||
|
||||
/* XXX THE FOLLOWING PROTOTYPE BELONGS IN INTR.H */
|
||||
int spl0 __P((void)); /* drop ipl to zero */
|
||||
/* XXX END INTR.H */
|
||||
|
||||
/* XXX THE FOLLOWING PROTOTYPE SHOULD BE A BUS.H INTERFACE */
|
||||
vm_offset_t alpha_XXX_dmamap __P((vm_offset_t));
|
||||
/* XXX END BUS.H */
|
||||
|
||||
#endif
|
||||
#endif /* !_KERNEL */
|
||||
|
@ -102,5 +102,5 @@ int promcncheckc __P((dev_t));
|
||||
u_int64_t prom_dispatch __P((u_int64_t, u_int64_t, u_int64_t, u_int64_t,
|
||||
u_int64_t));
|
||||
void init_bootstrap_console __P((void));
|
||||
#endif /* _KERNEL */
|
||||
#endif /* KERNEL */
|
||||
#endif /* ASSEMBLER */
|
||||
|
@ -94,17 +94,4 @@ typedef alpha_pt_entry_t pt_entry_t;
|
||||
#define ALPHA_STSIZE ((u_long)PAGE_SIZE) /* 8k */
|
||||
#define ALPHA_MAX_PTSIZE ((u_long)(NPTEPG * NBPG)) /* 8M */
|
||||
|
||||
#ifdef _KERNEL
|
||||
/*
|
||||
* Kernel virtual address to Sysmap entry and visa versa.
|
||||
*/
|
||||
#define kvtopte(va) \
|
||||
(Sysmap + (((vm_offset_t)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT))
|
||||
#define ptetokv(pte) \
|
||||
((((pt_entry_t *)(pte) - Sysmap) << PGSHIFT) + VM_MIN_KERNEL_ADDRESS)
|
||||
|
||||
extern pt_entry_t *Lev1map; /* Alpha Level One page table */
|
||||
extern pt_entry_t *Sysmap; /* kernel pte table */
|
||||
extern vm_size_t Sysmapsize; /* number of pte's in Sysmap */
|
||||
#endif
|
||||
#endif
|
||||
|
@ -1,4 +1,5 @@
|
||||
/* $NetBSD: rpb.h,v 1.20 1998/04/15 00:47:33 mjacob Exp $ */
|
||||
/* $FreeBSD$ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
|
||||
@ -429,8 +430,4 @@ struct dsrdb {
|
||||
*/
|
||||
#define HWRPB_DSRDB_MINVERS 5
|
||||
|
||||
#ifdef _KERNEL
|
||||
int cputype;
|
||||
#endif
|
||||
|
||||
#endif /* ASSEMBLER */
|
||||
|
Loading…
Reference in New Issue
Block a user