summaryrefslogtreecommitdiff
path: root/kern/linux
diff options
context:
space:
mode:
Diffstat (limited to 'kern/linux')
-rw-r--r--kern/linux/aligned.hh8
-rw-r--r--kern/linux/hwrpb.hh6
-rw-r--r--kern/linux/linux_syscalls.hh7
3 files changed, 12 insertions, 9 deletions
diff --git a/kern/linux/aligned.hh b/kern/linux/aligned.hh
index 55035c6e4..042f0ad2c 100644
--- a/kern/linux/aligned.hh
+++ b/kern/linux/aligned.hh
@@ -1,7 +1,7 @@
-#ifndef __ALIGNED_HH__
-#define __ALIGNED_HH__
+#ifndef __KERN_LINUX_ALIGNED_HH__
+#define __KERN_LINUX_ALIGNED_HH__
-#include <stdint.h>
+#include "sim/host.hh"
#include "targetarch/isa_traits.hh"
/* GCC 3.3.X has a bug in which attributes+typedefs don't work. 3.2.X is fine
@@ -18,4 +18,4 @@ typedef Addr Addr_a __attribute__ ((aligned (8))) ;
#define Addr_a Addr __attribute__ ((aligned (8)))
#endif /* __GNUC__ __GNUC_MINOR__ */
-#endif /* __ALIGNED_H__ */
+#endif /* __KERN_LINUX_ALIGNED_HH__ */
diff --git a/kern/linux/hwrpb.hh b/kern/linux/hwrpb.hh
index 3ce03efd7..16544f196 100644
--- a/kern/linux/hwrpb.hh
+++ b/kern/linux/hwrpb.hh
@@ -1,5 +1,5 @@
-#ifndef __ALPHA_HWRPB_H__
-#define __ALPHA_HWRPB_H__
+#ifndef __KERN_LINUX_HWRPB_HH__
+#define __KERN_LINUX_HWRPB_HH__
#include "kern/linux/aligned.hh"
@@ -15,4 +15,4 @@ namespace Linux {
uint64_ta res1, res2;
};
}
-#endif /* __ALPHA_HWRPB_H */
+#endif // __KERN_LINUX_HWRPB_HH__
diff --git a/kern/linux/linux_syscalls.hh b/kern/linux/linux_syscalls.hh
index a729431a0..dee7c5fcd 100644
--- a/kern/linux/linux_syscalls.hh
+++ b/kern/linux/linux_syscalls.hh
@@ -29,11 +29,14 @@
#ifndef __LINUX_SYSCALLS_HH__
#define __LINUX_SYSCALLS_HH__
-#include "targetarch/syscalls.hh"
#include "kern/linux/linux.hh"
-struct SystemCalls<Linux>
+template <class OS>
+class SystemCalls;
+
+class SystemCalls<Linux>
{
+ public:
enum {
syscall = 0,
llseek = 1,