From dbe8dafaac1252063040f697c27a54d3f905e3a9 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Mon, 13 May 2013 14:52:15 +0200
Subject: [PATCH] Refactor kernel calltrace.h header.

---
 sortix/calltrace.cpp                           | 2 +-
 sortix/{ => include/sortix/kernel}/calltrace.h | 6 +++---
 sortix/interrupt.cpp                           | 2 +-
 sortix/panic.cpp                               | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)
 rename sortix/{ => include/sortix/kernel}/calltrace.h (90%)

diff --git a/sortix/calltrace.cpp b/sortix/calltrace.cpp
index 855d04b6..d5c91ebd 100644
--- a/sortix/calltrace.cpp
+++ b/sortix/calltrace.cpp
@@ -23,7 +23,7 @@
 *******************************************************************************/
 
 #include <sortix/kernel/platform.h>
-#include "calltrace.h"
+#include <sortix/kernel/calltrace.h>
 
 namespace Sortix {
 namespace Calltrace {
diff --git a/sortix/calltrace.h b/sortix/include/sortix/kernel/calltrace.h
similarity index 90%
rename from sortix/calltrace.h
rename to sortix/include/sortix/kernel/calltrace.h
index 8ebfa420..7858047e 100644
--- a/sortix/calltrace.h
+++ b/sortix/include/sortix/kernel/calltrace.h
@@ -17,13 +17,13 @@
     You should have received a copy of the GNU General Public License along with
     Sortix. If not, see <http://www.gnu.org/licenses/>.
 
-    calltrace.h
+    sortix/kernel/calltrace.h
     Traverses the stack and prints the callstack, which aids debugging.
 
 *******************************************************************************/
 
-#ifndef SORTIX_CALLTRACE_H
-#define SORTIX_CALLTRACE_H
+#ifndef INCLUDE_SORTIX_KERNEL_CALLTRACE_H
+#define INCLUDE_SORTIX_KERNEL_CALLTRACE_H
 
 namespace Sortix {
 namespace Calltrace {
diff --git a/sortix/interrupt.cpp b/sortix/interrupt.cpp
index f4ebdb55..27e29c2d 100644
--- a/sortix/interrupt.cpp
+++ b/sortix/interrupt.cpp
@@ -28,13 +28,13 @@
 #include <sortix/kernel/scheduler.h>
 #include <sortix/kernel/signal.h>
 #include <sortix/kernel/process.h>
+#include <sortix/kernel/calltrace.h>
 
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
 #include "x86-family/idt.h"
-#include "calltrace.h"
 
 #include "sound.h" // Hack for SIGSEGV
 
diff --git a/sortix/panic.cpp b/sortix/panic.cpp
index 21c8183c..42c76544 100644
--- a/sortix/panic.cpp
+++ b/sortix/panic.cpp
@@ -22,12 +22,13 @@
 
 *******************************************************************************/
 
+#include <string.h>
+
 #include <sortix/kernel/platform.h>
 #include <sortix/kernel/interrupt.h>
-#include <string.h>
 #include <sortix/kernel/log.h>
-#include "calltrace.h"
 #include <sortix/kernel/panic.h>
+#include <sortix/kernel/calltrace.h>
 
 namespace Sortix
 {