summaryrefslogtreecommitdiff
path: root/src/arch/x86/linux
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2011-04-15 10:44:06 -0700
committerNathan Binkert <nate@binkert.org>2011-04-15 10:44:06 -0700
commit39a055645f77e0fa7bf49406635dba6bd65e361f (patch)
treea7df44358c75ff2de6e6f1549755f72cddb7d735 /src/arch/x86/linux
parent50fda09ac79b2dc1aa31fbced8d19b23d683fbab (diff)
downloadgem5-39a055645f77e0fa7bf49406635dba6bd65e361f.tar.xz
includes: sort all includes
Diffstat (limited to 'src/arch/x86/linux')
-rw-r--r--src/arch/x86/linux/linux.cc3
-rw-r--r--src/arch/x86/linux/process.cc4
-rw-r--r--src/arch/x86/linux/process.hh2
-rw-r--r--src/arch/x86/linux/syscalls.cc2
-rw-r--r--src/arch/x86/linux/system.cc3
-rw-r--r--src/arch/x86/linux/system.hh2
6 files changed, 7 insertions, 9 deletions
diff --git a/src/arch/x86/linux/linux.cc b/src/arch/x86/linux/linux.cc
index 0d9d7b676..590af0e40 100644
--- a/src/arch/x86/linux/linux.cc
+++ b/src/arch/x86/linux/linux.cc
@@ -37,9 +37,10 @@
* Authors: Gabe Black
*/
-#include "arch/x86/linux/linux.hh"
#include <fcntl.h>
+#include "arch/x86/linux/linux.hh"
+
// open(2) flags translation table
OpenFlagTransTable X86Linux64::openFlagTable[] = {
#ifdef _MSC_VER
diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc
index 4f7967424..2e665072b 100644
--- a/src/arch/x86/linux/process.cc
+++ b/src/arch/x86/linux/process.cc
@@ -37,14 +37,12 @@
* Authors: Gabe Black
*/
-#include "arch/x86/isa_traits.hh"
#include "arch/x86/linux/process.hh"
+#include "arch/x86/isa_traits.hh"
#include "arch/x86/registers.hh"
-
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/linux/linux.hh"
-
#include "sim/process.hh"
using namespace std;
diff --git a/src/arch/x86/linux/process.hh b/src/arch/x86/linux/process.hh
index 20012d960..789c2925a 100644
--- a/src/arch/x86/linux/process.hh
+++ b/src/arch/x86/linux/process.hh
@@ -40,9 +40,9 @@
#ifndef __X86_LINUX_PROCESS_HH__
#define __X86_LINUX_PROCESS_HH__
-#include "sim/process.hh"
#include "arch/x86/linux/linux.hh"
#include "arch/x86/process.hh"
+#include "sim/process.hh"
namespace X86ISA {
diff --git a/src/arch/x86/linux/syscalls.cc b/src/arch/x86/linux/syscalls.cc
index 87cddba4d..5ccb14394 100644
--- a/src/arch/x86/linux/syscalls.cc
+++ b/src/arch/x86/linux/syscalls.cc
@@ -37,8 +37,8 @@
* Authors: Gabe Black
*/
-#include "arch/x86/linux/process.hh"
#include "arch/x86/linux/linux.hh"
+#include "arch/x86/linux/process.hh"
#include "arch/x86/regs/misc.hh"
#include "kern/linux/linux.hh"
#include "sim/syscall_emul.hh"
diff --git a/src/arch/x86/linux/system.cc b/src/arch/x86/linux/system.cc
index f750019a8..104f93372 100644
--- a/src/arch/x86/linux/system.cc
+++ b/src/arch/x86/linux/system.cc
@@ -37,9 +37,9 @@
* Authors: Gabe Black
*/
-#include "arch/x86/isa_traits.hh"
#include "arch/x86/linux/system.hh"
#include "arch/x86/regs/int.hh"
+#include "arch/x86/isa_traits.hh"
#include "arch/vtophys.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
@@ -47,7 +47,6 @@
#include "params/LinuxX86System.hh"
#include "sim/byteswap.hh"
-
using namespace LittleEndianGuest;
using namespace X86ISA;
diff --git a/src/arch/x86/linux/system.hh b/src/arch/x86/linux/system.hh
index ae7e93f3d..e8adba9f2 100644
--- a/src/arch/x86/linux/system.hh
+++ b/src/arch/x86/linux/system.hh
@@ -43,9 +43,9 @@
#include <string>
#include <vector>
-#include "params/LinuxX86System.hh"
#include "arch/x86/bios/e820.hh"
#include "arch/x86/system.hh"
+#include "params/LinuxX86System.hh"
class LinuxX86System : public X86System
{