From a9e1ba1d5bce255fe8e786ceb9190428ee6987ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Tue, 16 Mar 2004 02:53:41 +0000
Subject: [PATCH] Fixes due to the team/thread.h separation and minor header
 cleanup.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6998 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kernel/core/fs/pipefs.cpp |  2 +-
 src/kernel/core/image.c       |  4 ++--
 src/kernel/core/main.c        |  6 +++---
 src/kernel/core/port.c        |  6 +++---
 src/kernel/core/sem.c         | 11 +++--------
 src/kernel/core/signal.c      |  4 +++-
 src/kernel/core/vm/vm.c       |  4 +++-
 7 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/kernel/core/fs/pipefs.cpp b/src/kernel/core/fs/pipefs.cpp
index 12057fda97..62d4538d01 100644
--- a/src/kernel/core/fs/pipefs.cpp
+++ b/src/kernel/core/fs/pipefs.cpp
@@ -15,7 +15,7 @@
 #include <khash.h>
 #include <lock.h>
 #include <vm.h>
-#include <thread.h>
+#include <team.h>
 
 #include <malloc.h>
 #include <string.h>
diff --git a/src/kernel/core/image.c b/src/kernel/core/image.c
index ed8e4b3da1..343ee75959 100644
--- a/src/kernel/core/image.c
+++ b/src/kernel/core/image.c
@@ -1,14 +1,14 @@
 /* User Runtime Loader support in the kernel
 ** 
-** Copyright 2003, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
 ** Distributed under the terms of the OpenBeOS License.
 */
 
 
 #include <KernelExport.h>
 #include <kimage.h>
-#include <thread_types.h>
 #include <thread.h>
+#include <team.h>
 
 #include <malloc.h>
 #include <string.h>
diff --git a/src/kernel/core/main.c b/src/kernel/core/main.c
index 3e424a4904..30afc44c92 100644
--- a/src/kernel/core/main.c
+++ b/src/kernel/core/main.c
@@ -8,9 +8,9 @@
 ** Distributed under the terms of the NewOS License.
 */
 
+#include <OS.h>
+
 #include <boot/kernel_args.h>
-#include <Errors.h>
-#include <kernel.h>
 #include <console.h>
 #include <debug.h>
 #include <arch/faults.h>
@@ -19,7 +19,6 @@
 #include <vm.h>
 #include <timer.h>
 #include <smp.h>
-#include <OS.h>
 #include <sem.h>
 #include <port.h>
 #include <vfs.h>
@@ -31,6 +30,7 @@
 #include <bus.h>
 #include <kmodule.h>
 #include <int.h>
+#include <team.h>
 #include <real_time_clock.h>
 #include <kernel_daemon.h>
 
diff --git a/src/kernel/core/port.c b/src/kernel/core/port.c
index 13b3ae1283..5ddf75c205 100644
--- a/src/kernel/core/port.c
+++ b/src/kernel/core/port.c
@@ -3,16 +3,16 @@
 /*
 ** Copyright 2002-2004, The OpenBeOS Team. All rights reserved.
 ** Distributed under the terms of the OpenBeOS License.
-*/
-
-/*
+**
 ** Copyright 2001, Mark-Jan Bastian. All rights reserved.
 ** Distributed under the terms of the NewOS License.
 */
 
 #include <OS.h>
+
 #include <port.h>
 #include <sem.h>
+#include <team.h>
 #include <util/list.h>
 #include <arch/int.h>
 #include <cbuf.h>
diff --git a/src/kernel/core/sem.c b/src/kernel/core/sem.c
index fe4f0ad4d2..b1a92fa2e2 100644
--- a/src/kernel/core/sem.c
+++ b/src/kernel/core/sem.c
@@ -3,25 +3,20 @@
 /*
 ** Copyright 2002-2004, The OpenBeOS Team. All rights reserved.
 ** Distributed under the terms of the OpenBeOS License.
-*/
-
-/*
+**
 ** Copyright 2001, Travis Geiselbrecht. All rights reserved.
 ** Distributed under the terms of the NewOS License.
 */
 
-#include <kernel.h>
 #include <OS.h>
+
 #include <sem.h>
 #include <smp.h>
 #include <int.h>
 #include <arch/int.h>
-#include <timer.h>
 #include <debug.h>
-#include <malloc.h>
 #include <thread.h>
-#include <Errors.h>
-
+#include <team.h>
 #include <boot/kernel_args.h>
 
 #include <string.h>
diff --git a/src/kernel/core/signal.c b/src/kernel/core/signal.c
index 28fe506ea6..bb158d331b 100644
--- a/src/kernel/core/signal.c
+++ b/src/kernel/core/signal.c
@@ -1,6 +1,8 @@
 /* POSIX signals handling routines
 ** 
 ** Copyright 2002, Angelo Mottola, a.mottola@libero.it. All rights reserved.
+** Copyright 2002-2004, The OpenBeOS Team. All rights reserved.
+**
 ** Distributed under the terms of the OpenBeOS License.
 */
 
@@ -8,7 +10,7 @@
 #include <KernelExport.h>
 #include <debug.h>
 #include <thread.h>
-#include <arch/thread.h>
+#include <team.h>
 #include <int.h>
 #include <sem.h>
 #include <ksignal.h>
diff --git a/src/kernel/core/vm/vm.c b/src/kernel/core/vm/vm.c
index 316c0b1f7f..0e150e5332 100755
--- a/src/kernel/core/vm/vm.c
+++ b/src/kernel/core/vm/vm.c
@@ -6,8 +6,8 @@
 
 #include <OS.h>
 #include <KernelExport.h>
+
 #include <kerrors.h>
-#include <kernel.h>
 #include <vm.h>
 #include <vm_priv.h>
 #include <vm_page.h>
@@ -25,6 +25,7 @@
 #include <lock.h>
 #include <khash.h>
 #include <thread.h>
+#include <team.h>
 
 #include <boot/stage2.h>
 
@@ -493,6 +494,7 @@ vm_create_anonymous_region(aspace_id aid, const char *name, void **address,
 	/* check parameters */
 	if (addr_type != REGION_ADDR_ANY_ADDRESS && addr_type != REGION_ADDR_EXACT_ADDRESS)
 		return B_BAD_VALUE;
+
 	switch (wiring) {
 		case REGION_WIRING_WIRED:
 		case REGION_WIRING_WIRED_ALREADY: