Rename __attribute__((packed)) --> __packed

Also unify __attribute__ ((..)) to __attribute__((..)) and
handle ((__packed__)) like ((packed))

Change-Id: Ie60a51c3fa92b5009724a5b7c2932e361bf3490c
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: https://review.coreboot.org/15921
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

5 files changed, 12 insertions, 9 deletions

diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index c03efe9455..4eb9519c7c 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -16,6 +16,7 @@
 
 #include <console/console.h>
 #include <stdint.h>
+#include <compiler.h>
 #include <rmodule.h>
 #include <arch/cpu.h>
 #include <cpu/cpu.h>
@@ -103,14 +104,14 @@ struct sipi_params {
 	uint32_t msr_count;
 	uint32_t c_handler;
 	atomic_t ap_count;
-} __attribute__((packed));
+} __packed;
 
 /* This also needs to match the assembly code for saved MSR encoding. */
 struct saved_msr {
 	uint32_t index;
 	uint32_t lo;
 	uint32_t hi;
-} __attribute__((packed));
+} __packed;
 
 
 /* The sipi vector rmodule is included in the ramstage using 'objdump -B'. */
diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c
index 1ff9371b98..3532e9781e 100644
--- a/src/cpu/x86/pae/pgtbl.c
+++ b/src/cpu/x86/pae/pgtbl.c
@@ -13,6 +13,7 @@
  * GNU General Public License for more details.
  */
 
+#include <compiler.h>
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/pae.h>
@@ -59,14 +60,14 @@ void *map_2M_page(unsigned long page)
 	struct pde {
 		uint32_t addr_lo;
 		uint32_t addr_hi;
-	} __attribute__ ((packed));
+	} __packed;
 	struct pg_table {
 		struct pde pd[2048];
 		struct pde pdp[512];
-	} __attribute__ ((packed));
+	} __packed;
 
 	static struct pg_table pgtbl[CONFIG_MAX_CPUS]
-		__attribute__ ((aligned(4096)));
+		__attribute__((aligned(4096)));
 	static unsigned long mapped_window[CONFIG_MAX_CPUS];
 	unsigned long index;
 	unsigned long window;
diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c
index 16415baac1..6999f566e2 100644
--- a/src/cpu/x86/smm/smihandler.c
+++ b/src/cpu/x86/smm/smihandler.c
@@ -28,7 +28,7 @@ static int do_driver_init = 1;
 typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore;
 
 /* SMI multiprocessing semaphore */
-static __attribute__ ((aligned(4))) volatile smi_semaphore smi_handler_status
+static __attribute__((aligned(4))) volatile smi_semaphore smi_handler_status
 	= SMI_UNLOCKED;
 
 static int smi_obtain_lock(void)
diff --git a/src/cpu/x86/smm/smm_module_handler.c b/src/cpu/x86/smm/smm_module_handler.c
index 4bcd853b9a..cfb2b91668 100644
--- a/src/cpu/x86/smm/smm_module_handler.c
+++ b/src/cpu/x86/smm/smm_module_handler.c
@@ -28,7 +28,7 @@ typedef enum { SMI_LOCKED, SMI_UNLOCKED } smi_semaphore;
 
 /* SMI multiprocessing semaphore */
 static volatile
-__attribute__ ((aligned(4))) smi_semaphore smi_handler_status = SMI_UNLOCKED;
+__attribute__((aligned(4))) smi_semaphore smi_handler_status = SMI_UNLOCKED;
 
 static int smi_obtain_lock(void)
 {
diff --git a/src/cpu/x86/smm/smm_module_loader.c b/src/cpu/x86/smm/smm_module_loader.c
index b7de178bd9..3d7952ff42 100644
--- a/src/cpu/x86/smm/smm_module_loader.c
+++ b/src/cpu/x86/smm/smm_module_loader.c
@@ -13,6 +13,7 @@
  * GNU General Public License for more details.
  */
 
+#include <compiler.h>
 #include <string.h>
 #include <rmodule.h>
 #include <cpu/x86/smm.h>
@@ -47,7 +48,7 @@ struct smm_stub_params {
 	u32 fxsave_area;
 	u32 fxsave_area_size;
 	struct smm_runtime runtime;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * The stub is the entry point that sets up protected mode and stacks for each
@@ -67,7 +68,7 @@ extern unsigned char _binary_smmstub_start[];
 struct smm_entry_ins {
 	char jmp_rel;
 	uint16_t rel16;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Place the entry instructions for num entries beginning at entry_start with