1c1
< /* $FreeBSD: head/sys/ia64/include/param.h 96606 2002-05-14 20:35:29Z phk $ */
---
> /* $FreeBSD: head/sys/ia64/include/param.h 96912 2002-05-19 04:42:19Z marcel $ */
73,75d72
< #ifndef MACHINE
< #define MACHINE "ia64"
< #endif
78a76,84
>
> #ifndef _NO_NAMESPACE_POLLUTION
>
> #ifndef _MACHINE_PARAM_H_
> #define _MACHINE_PARAM_H_
>
> #ifndef MACHINE
> #define MACHINE "ia64"
> #endif
84,86d89
< #include <machine/ia64_cpu.h>
< #include <machine/cpu.h>
<
135,137d137
< #define KERNBASE 0xfffffc0000300000LL /* start of kernel virtual */
< #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT)
<
148,149d147
< /* #define KSTACK_GUARD */ /* compile in kstack guard page */
<
162a161,163
>
> #endif /* !_MACHINE_PARAM_H_ */
> #endif /* !_NO_NAMESPACE_POLLUTION */
< /* $FreeBSD: head/sys/ia64/include/param.h 96606 2002-05-14 20:35:29Z phk $ */
---
> /* $FreeBSD: head/sys/ia64/include/param.h 96912 2002-05-19 04:42:19Z marcel $ */
73,75d72
< #ifndef MACHINE
< #define MACHINE "ia64"
< #endif
78a76,84
>
> #ifndef _NO_NAMESPACE_POLLUTION
>
> #ifndef _MACHINE_PARAM_H_
> #define _MACHINE_PARAM_H_
>
> #ifndef MACHINE
> #define MACHINE "ia64"
> #endif
84,86d89
< #include <machine/ia64_cpu.h>
< #include <machine/cpu.h>
<
135,137d137
< #define KERNBASE 0xfffffc0000300000LL /* start of kernel virtual */
< #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT)
<
148,149d147
< /* #define KSTACK_GUARD */ /* compile in kstack guard page */
<
162a161,163
>
> #endif /* !_MACHINE_PARAM_H_ */
> #endif /* !_NO_NAMESPACE_POLLUTION */