From d4d9831990332ce1834c11cc147c707976e77ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Tue, 20 Feb 2007 00:21:45 +0000
Subject: [PATCH] merge both commpage.h into the private header Travis, I hope
 this fits your needs :)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20173 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/kernel/arch/x86/commpage.h       | 23 ---------------------
 headers/private/kernel/arch/x86/commpage.h  | 15 ++++++++++++++
 src/system/kernel/arch/x86/commpage.c       |  2 --
 src/system/libroot/os/arch/x86/syscalls.inc |  2 +-
 4 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 headers/os/kernel/arch/x86/commpage.h

diff --git a/headers/os/kernel/arch/x86/commpage.h b/headers/os/kernel/arch/x86/commpage.h
deleted file mode 100644
index a68ef23def..0000000000
--- a/headers/os/kernel/arch/x86/commpage.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2007, Travis Geiselbrecht. All rights reserved.
- * Distributed under the terms of the MIT License.
- */
-#ifndef __OS_KERNEL_ARCH_x86_COMMPAGE_H
-#define __OS_KERNEL_ARCH_x86_COMMPAGE_H
-
-/* some systemwide commpage constants, used in the kernel and libroot */
-
-/* be careful what you put here, this file is included from assembly */
-#define COMMPAGE_ENTRY_MAGIC   0
-#define COMMPAGE_ENTRY_VERSION 1
-#define COMMPAGE_ENTRY_SYSCALL 2
-
-#define USER_COMMPAGE_ADDR (0xffff0000)
-#define COMMPAGE_SIZE (0x8000)
-#define TABLE_ENTRIES 64
-
-#define COMMPAGE_SIGNATURE 'COMM'
-#define COMMPAGE_VERSION 1
-
-#endif
-
diff --git a/headers/private/kernel/arch/x86/commpage.h b/headers/private/kernel/arch/x86/commpage.h
index 8a13d74354..2c6e10c591 100644
--- a/headers/private/kernel/arch/x86/commpage.h
+++ b/headers/private/kernel/arch/x86/commpage.h
@@ -5,8 +5,23 @@
 #ifndef _KERNEL_ARCH_x86_COMMPAGE_H
 #define _KERNEL_ARCH_x86_COMMPAGE_H
 
+/* some systemwide commpage constants, used in the kernel and libroot */
 
+/* be careful what you put here, this file is included from assembly */
+#define COMMPAGE_ENTRY_MAGIC   0
+#define COMMPAGE_ENTRY_VERSION 1
+#define COMMPAGE_ENTRY_SYSCALL 2
+
+#define USER_COMMPAGE_ADDR (0xffff0000)
+#define COMMPAGE_SIZE (0x8000)
+#define TABLE_ENTRIES 64
+
+#define COMMPAGE_SIGNATURE 'COMM'
+#define COMMPAGE_VERSION 1
+
+#ifndef _ASSEMBLER
 status_t commpage_init(void);
+#endif
 
 #endif
 
diff --git a/src/system/kernel/arch/x86/commpage.c b/src/system/kernel/arch/x86/commpage.c
index 42cfb167d7..de92d24661 100644
--- a/src/system/kernel/arch/x86/commpage.c
+++ b/src/system/kernel/arch/x86/commpage.c
@@ -8,8 +8,6 @@
 #include <KernelExport.h>
 #include <string.h>
 
-#include <os/kernel/arch/x86/commpage.h>
-
 static area_id comm_area;
 static area_id user_comm_area;
 static unsigned long *comm_ptr;
diff --git a/src/system/libroot/os/arch/x86/syscalls.inc b/src/system/libroot/os/arch/x86/syscalls.inc
index 4f8748cae6..030b6413bf 100644
--- a/src/system/libroot/os/arch/x86/syscalls.inc
+++ b/src/system/libroot/os/arch/x86/syscalls.inc
@@ -14,7 +14,7 @@
  * branch to the syscall vector in the commpage
  */
 
-#include <os/kernel/arch/x86/commpage.h>
+#include <arch/x86/commpage.h>
 
 #define _SYSCALL(name, n) \
 .globl name; \