summaryrefslogtreecommitdiff
path: root/kern/linux
diff options
context:
space:
mode:
authorRon Dreslinski <rdreslin@umich.edu>2005-02-09 12:56:24 -0500
committerRon Dreslinski <rdreslin@umich.edu>2005-02-09 12:56:24 -0500
commit230a5a608dfb2204e2886a795e6bd8a30224b84f (patch)
tree81d312257237c4d13ad44836d55d2f192a479036 /kern/linux
parentd9317dd348f3acd853d1e6a09c09f2a27ad5d707 (diff)
parentc4089562d5add225cd8275b59456eb7eb559b988 (diff)
downloadgem5-230a5a608dfb2204e2886a795e6bd8a30224b84f.tar.xz
Merger
cpu/simple_cpu/simple_cpu.hh: Merge --HG-- extra : convert_revision : 1b6003ac731051fefacb7d7a30c317553b4bf1bc
Diffstat (limited to 'kern/linux')
-rw-r--r--kern/linux/linux_syscalls.hh7
1 files changed, 4 insertions, 3 deletions
diff --git a/kern/linux/linux_syscalls.hh b/kern/linux/linux_syscalls.hh
index dee7c5fcd..44a038def 100644
--- a/kern/linux/linux_syscalls.hh
+++ b/kern/linux/linux_syscalls.hh
@@ -26,14 +26,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __LINUX_SYSCALLS_HH__
-#define __LINUX_SYSCALLS_HH__
+#ifndef __KERN_LINUX_LINUX_SYSCALLS_HH__
+#define __KERN_LINUX_LINUX_SYSCALLS_HH__
#include "kern/linux/linux.hh"
template <class OS>
class SystemCalls;
+template <>
class SystemCalls<Linux>
{
public:
@@ -322,4 +323,4 @@ class SystemCalls<Linux>
};
-#endif // __LINUX_SYSCALLS_HH__
+#endif // __KERN_LINUX_LINUX_SYSCALLS_HH__