diff options
author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-01-26 22:07:56 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:03:18 -0500 |
commit | a8229a9e5211a52839268b82ae14cdf528d48f58 (patch) | |
tree | f5bea53b8eb7dae084456efce92e50b471e78d1c | |
parent | 43d80439c5f619446e174abdbdaff4fc0e539546 (diff) |
[POWERPC] ps3: fix struct alignment attributes
Remove incorrect alignment attributes in PS3 platform code for
struct spe_shadow, struct os_area_header, and struct os_area_params.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/platforms/ps3/os-area.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/spu.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c index 58358305dc10..b4ac924ada43 100644 --- a/arch/powerpc/platforms/ps3/os-area.c +++ b/arch/powerpc/platforms/ps3/os-area.c | |||
@@ -59,7 +59,7 @@ struct os_area_header { | |||
59 | u32 ldr_format; | 59 | u32 ldr_format; |
60 | u32 ldr_size; | 60 | u32 ldr_size; |
61 | u32 _reserved_2[6]; | 61 | u32 _reserved_2[6]; |
62 | } __attribute__ ((packed)); | 62 | }; |
63 | 63 | ||
64 | enum { | 64 | enum { |
65 | PARAM_BOOT_FLAG_GAME_OS = 0, | 65 | PARAM_BOOT_FLAG_GAME_OS = 0, |
@@ -114,7 +114,7 @@ struct os_area_params { | |||
114 | u8 dns_primary[4]; | 114 | u8 dns_primary[4]; |
115 | u8 dns_secondary[4]; | 115 | u8 dns_secondary[4]; |
116 | u8 _reserved_5[8]; | 116 | u8 _reserved_5[8]; |
117 | } __attribute__ ((packed)); | 117 | }; |
118 | 118 | ||
119 | /** | 119 | /** |
120 | * struct saved_params - Static working copies of data from the 'Other OS' area. | 120 | * struct saved_params - Static working copies of data from the 'Other OS' area. |
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c index 644532c3b7c4..ed88dc6a7f2f 100644 --- a/arch/powerpc/platforms/ps3/spu.c +++ b/arch/powerpc/platforms/ps3/spu.c | |||
@@ -50,7 +50,7 @@ enum spe_type { | |||
50 | */ | 50 | */ |
51 | 51 | ||
52 | struct spe_shadow { | 52 | struct spe_shadow { |
53 | u8 padding_0000[0x0140]; | 53 | u8 padding_0140[0x0140]; |
54 | u64 int_status_class0_RW; /* 0x0140 */ | 54 | u64 int_status_class0_RW; /* 0x0140 */ |
55 | u64 int_status_class1_RW; /* 0x0148 */ | 55 | u64 int_status_class1_RW; /* 0x0148 */ |
56 | u64 int_status_class2_RW; /* 0x0150 */ | 56 | u64 int_status_class2_RW; /* 0x0150 */ |
@@ -67,8 +67,7 @@ struct spe_shadow { | |||
67 | u8 padding_0c08[0x0f00-0x0c08]; | 67 | u8 padding_0c08[0x0f00-0x0c08]; |
68 | u64 spe_execution_status; /* 0x0f00 */ | 68 | u64 spe_execution_status; /* 0x0f00 */ |
69 | u8 padding_0f08[0x1000-0x0f08]; | 69 | u8 padding_0f08[0x1000-0x0f08]; |
70 | } __attribute__ ((packed)); | 70 | }; |
71 | |||
72 | 71 | ||
73 | /** | 72 | /** |
74 | * enum spe_ex_state - Logical spe execution state. | 73 | * enum spe_ex_state - Logical spe execution state. |