From f2d81a8d62651a38134bd47143a29187c36738d8 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Tue, 2 Oct 2012 14:05:18 +0200
Subject: [PATCH] Remove superfluous, generic Thread_state definition

The 'Cpu_state' in 'base/include/base/cpu_state.h' is not needed anymore.
Moreover, it's inconsistent with the architecture-specific definitions
of 'Cpu_state' that all reside in <cpu/cpu_state.h>.
---
 base/include/base/cpu_state.h    | 35 --------------------------------
 base/include/base/thread_state.h |  2 +-
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 base/include/base/cpu_state.h

diff --git a/base/include/base/cpu_state.h b/base/include/base/cpu_state.h
deleted file mode 100644
index 32f8e2a9e..000000000
--- a/base/include/base/cpu_state.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * \brief  CPU state
- * \author Christian Prochaska
- * \date   2011-04-15
- *
- * This file contains the generic part of the CPU state.
- */
-
-/*
- * Copyright (C) 2011-2012 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU General Public License version 2.
- */
-
-#ifndef _INCLUDE__BASE__CPU_STATE_H_
-#define _INCLUDE__BASE__CPU_STATE_H_
-
-#include <base/stdint.h>
-
-namespace Genode {
-
-	struct Cpu_state
-	{
-		addr_t ip;   /* instruction pointer */
-		addr_t sp;   /* stack pointer       */
-
-		/**
-		 * Constructor
-		 */
-		Cpu_state(): ip(0), sp(0) { }
-	};
-}
-
-#endif /* _INCLUDE__BASE__CPU_STATE_H_ */
diff --git a/base/include/base/thread_state.h b/base/include/base/thread_state.h
index 59f9dcb13..aff7b6159 100644
--- a/base/include/base/thread_state.h
+++ b/base/include/base/thread_state.h
@@ -16,7 +16,7 @@
 #ifndef _INCLUDE__BASE__THREAD_STATE_H_
 #define _INCLUDE__BASE__THREAD_STATE_H_
 
-#include <base/cpu_state.h>
+#include <cpu/cpu_state.h>
 
 namespace Genode {