From 23c12a63cfb7dc91e781a670978fecfce7bf769a Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 19 May 2002 04:42:19 +0000
Subject: o  Remove namespace pollution from param.h:    -  Don't include
 ia64_cpu.h and cpu.h    -  Guard definitions by  _NO_NAMESPACE_POLLUTION    -
  Move definition of KERNBASE to vmparam.h

o  Move definitions of IA64_RR_{BASE|MASK} to vmparam.h
o  Move definitions of IA64_PHYS_TO_RR{6|7} to vmparam.h

o  While here, remove some left-over Alpha references.
---
 sys/boot/efi/libefi/copy.c         | 1 +
 sys/boot/efi/libefi/elf_freebsd.c  | 2 ++
 sys/boot/ia64/common/copy.c        | 1 +
 sys/boot/ia64/common/exec.c        | 2 ++
 sys/boot/ia64/libski/copy.c        | 1 +
 sys/boot/ia64/libski/elf_freebsd.c | 2 ++
 sys/boot/ia64/ski/copy.c           | 1 +
 sys/boot/ia64/ski/elf_freebsd.c    | 2 ++
 8 files changed, 12 insertions(+)

(limited to 'sys/boot')

diff --git a/sys/boot/efi/libefi/copy.c b/sys/boot/efi/libefi/copy.c
index a2bb6fea4e7d..be1fcef1d1b6 100644
--- a/sys/boot/efi/libefi/copy.c
+++ b/sys/boot/efi/libefi/copy.c
@@ -37,6 +37,7 @@ static const char rcsid[] =
 #include <efi.h>
 #include <efilib.h>
 #include <machine/ia64_cpu.h>
+#include <machine/vmparam.h>
 
 int
 efi_copyin(void *src, vm_offset_t dest, size_t len)
diff --git a/sys/boot/efi/libefi/elf_freebsd.c b/sys/boot/efi/libefi/elf_freebsd.c
index c98f93c5a692..5c95d0f83b76 100644
--- a/sys/boot/efi/libefi/elf_freebsd.c
+++ b/sys/boot/efi/libefi/elf_freebsd.c
@@ -83,7 +83,9 @@
 #include <sys/linker.h>
 #include <machine/elf.h>
 #include <machine/bootinfo.h>
+#include <machine/ia64_cpu.h>
 #include <machine/pte.h>
+#include <machine/vmparam.h>
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/ia64/common/copy.c b/sys/boot/ia64/common/copy.c
index a2bb6fea4e7d..be1fcef1d1b6 100644
--- a/sys/boot/ia64/common/copy.c
+++ b/sys/boot/ia64/common/copy.c
@@ -37,6 +37,7 @@ static const char rcsid[] =
 #include <efi.h>
 #include <efilib.h>
 #include <machine/ia64_cpu.h>
+#include <machine/vmparam.h>
 
 int
 efi_copyin(void *src, vm_offset_t dest, size_t len)
diff --git a/sys/boot/ia64/common/exec.c b/sys/boot/ia64/common/exec.c
index c98f93c5a692..5c95d0f83b76 100644
--- a/sys/boot/ia64/common/exec.c
+++ b/sys/boot/ia64/common/exec.c
@@ -83,7 +83,9 @@
 #include <sys/linker.h>
 #include <machine/elf.h>
 #include <machine/bootinfo.h>
+#include <machine/ia64_cpu.h>
 #include <machine/pte.h>
+#include <machine/vmparam.h>
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/ia64/libski/copy.c b/sys/boot/ia64/libski/copy.c
index 44454600c223..d5c0623d6c6e 100644
--- a/sys/boot/ia64/libski/copy.c
+++ b/sys/boot/ia64/libski/copy.c
@@ -37,6 +37,7 @@ static const char rcsid[] =
 #include <stand.h>
 
 #include <machine/ia64_cpu.h>
+#include <machine/vmparam.h>
 
 int
 ski_copyin(void *src, vm_offset_t dest, size_t len)
diff --git a/sys/boot/ia64/libski/elf_freebsd.c b/sys/boot/ia64/libski/elf_freebsd.c
index 6465d8a49b29..461ef125363c 100644
--- a/sys/boot/ia64/libski/elf_freebsd.c
+++ b/sys/boot/ia64/libski/elf_freebsd.c
@@ -83,6 +83,8 @@
 #include <sys/linker.h>
 #include <machine/elf.h>
 #include <machine/bootinfo.h>
+#include <machine/ia64_cpu.h>
+#include <machine/vmparam.h>
 
 #include "bootstrap.h"
 #include "libski.h"
diff --git a/sys/boot/ia64/ski/copy.c b/sys/boot/ia64/ski/copy.c
index 44454600c223..d5c0623d6c6e 100644
--- a/sys/boot/ia64/ski/copy.c
+++ b/sys/boot/ia64/ski/copy.c
@@ -37,6 +37,7 @@ static const char rcsid[] =
 #include <stand.h>
 
 #include <machine/ia64_cpu.h>
+#include <machine/vmparam.h>
 
 int
 ski_copyin(void *src, vm_offset_t dest, size_t len)
diff --git a/sys/boot/ia64/ski/elf_freebsd.c b/sys/boot/ia64/ski/elf_freebsd.c
index 6465d8a49b29..461ef125363c 100644
--- a/sys/boot/ia64/ski/elf_freebsd.c
+++ b/sys/boot/ia64/ski/elf_freebsd.c
@@ -83,6 +83,8 @@
 #include <sys/linker.h>
 #include <machine/elf.h>
 #include <machine/bootinfo.h>
+#include <machine/ia64_cpu.h>
+#include <machine/vmparam.h>
 
 #include "bootstrap.h"
 #include "libski.h"
-- 
cgit v1.3