x86: Minimal changes to fix previous commit that renamed headers

include/arch/x86/arch/32/mode/machine.h

@@ -8,8 +8,8 @@
  * @TAG(GD_GPL)
  */
 
-#ifndef __ARCH_MACHINE_H
-#define __ARCH_MACHINE_H
+#ifndef __MODE_MACHINE_H
+#define __MODE_MACHINE_H
 
 #include <arch/types.h>
 #include <arch/object/structures.h>

include/arch/x86/arch/32/mode/machine/cpu_registers.h

@@ -8,8 +8,8 @@
  * @TAG(GD_GPL)
  */
 
-#ifndef __ARCH_MACHINE_CPU_REGISTERS_H
-#define __ARCH_MACHINE_CPU_REGISTERS_H
+#ifndef __MODE_MACHINE_CPU_REGISTERS_H
+#define __MODE_MACHINE_CPU_REGISTERS_H
 
 #define CR0_MONITOR_COPROC  BIT(1)  /* Trap on FPU "WAIT" commands. */
 #define CR0_EMULATION       BIT(2)  /* Enable OS emulation of FPU. */

include/arch/x86/arch/32/mode/machine/registerset.h

@@ -8,8 +8,8 @@
  * @TAG(GD_GPL)
  */
 
-#ifndef __ARCH_MACHINE_REGISTERSET_H
-#define __ARCH_MACHINE_REGISTERSET_H
+#ifndef __MODE_MACHINE_REGISTERSET_H
+#define __MODE_MACHINE_REGISTERSET_H
 
 #include <arch/types.h>
 #include <util.h>

include/arch/x86/arch/32/mode/object/structures.h

@@ -8,8 +8,8 @@
  * @TAG(GD_GPL)
  */
 
-#ifndef __ARCH_OBJECT_STRUCTURES_H
-#define __ARCH_OBJECT_STRUCTURES_H
+#ifndef __MODE_OBJECT_STRUCTURES_H
+#define __MODE_OBJECT_STRUCTURES_H
 
 #include <assert.h>
 #include <config.h>

include/arch/x86/arch/machine.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2014, General Dynamics C4 Systems
+ *
+ * This software may be distributed and modified according to the terms of
+ * the GNU General Public License version 2. Note that NO WARRANTY is provided.
+ * See "LICENSE_GPLv2.txt" for details.
+ *
+ * @TAG(GD_GPL)
+ */
+
+#ifndef __ARCH_MACHINE_H
+#define __ARCH_MACHINE_H
+
+#include <mode/machine.h>
+
+#endif

include/arch/x86/arch/machine/cpu_registers.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2014, General Dynamics C4 Systems
+ *
+ * This software may be distributed and modified according to the terms of
+ * the GNU General Public License version 2. Note that NO WARRANTY is provided.
+ * See "LICENSE_GPLv2.txt" for details.
+ *
+ * @TAG(GD_GPL)
+ */
+
+#ifndef __ARCH_MACHINE_CPU_REGISTERS_H
+#define __ARCH_MACHINE_CPU_REGISTERS_H
+
+#include <mode/machine/cpu_registers.h>
+
+#endif

include/arch/x86/arch/machine/registerset.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2014, General Dynamics C4 Systems
+ *
+ * This software may be distributed and modified according to the terms of
+ * the GNU General Public License version 2. Note that NO WARRANTY is provided.
+ * See "LICENSE_GPLv2.txt" for details.
+ *
+ * @TAG(GD_GPL)
+ */
+
+#ifndef __ARCH_MACHINE_REGISTERSET_H
+#define __ARCH_MACHINE_REGISTERSET_H
+
+#include <mode/machine/registerset.h>
+
+#endif

include/arch/x86/arch/object/structures.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2014, General Dynamics C4 Systems
+ *
+ * This software may be distributed and modified according to the terms of
+ * the GNU General Public License version 2. Note that NO WARRANTY is provided.
+ * See "LICENSE_GPLv2.txt" for details.
+ *
+ * @TAG(GD_GPL)
+ */
+
+#ifndef __ARCH_OBJECT_STRUCTURES_H
+#define __ARCH_OBJECT_STRUCTURES_H
+
+#include <mode/object/structures.h>
+
+#endif

include/plat/pc99/plat/32/plat_mode/machine/hardware.h

@@ -8,8 +8,8 @@
  * @TAG(GD_GPL)
  */
 
-#ifndef __PLAT_MACHINE_HARDWARE_H
-#define __PLAT_MACHINE_HARDWARE_H
+#ifndef __PLAT_MODE_MACHINE_HARDWARE_H
+#define __PLAT_MODE_MACHINE_HARDWARE_H
 
 #include <config.h>
 #include <types.h>

include/plat/pc99/plat/machine/hardware.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2014, General Dynamics C4 Systems
+ *
+ * This software may be distributed and modified according to the terms of
+ * the GNU General Public License version 2. Note that NO WARRANTY is provided.
+ * See "LICENSE_GPLv2.txt" for details.
+ *
+ * @TAG(GD_GPL)
+ */
+
+#ifndef __PLAT_MACHINE_HARDWARE_H
+#define __PLAT_MACHINE_HARDWARE_H
+
+#include <plat_mode/machine/hardware.h>
+
+#endif