Skip to content

Commit

Permalink
[POWERPC] ps3: fix struct alignment attributes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geoff Levand authored and Paul Mackerras committed Feb 7, 2007
1 parent 43d8043 commit a8229a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/ps3/os-area.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ struct os_area_header {
u32 ldr_format;
u32 ldr_size;
u32 _reserved_2[6];
} __attribute__ ((packed));
};

enum {
PARAM_BOOT_FLAG_GAME_OS = 0,
Expand Down Expand Up @@ -114,7 +114,7 @@ struct os_area_params {
u8 dns_primary[4];
u8 dns_secondary[4];
u8 _reserved_5[8];
} __attribute__ ((packed));
};

/**
* struct saved_params - Static working copies of data from the 'Other OS' area.
Expand Down
5 changes: 2 additions & 3 deletions arch/powerpc/platforms/ps3/spu.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ enum spe_type {
*/

struct spe_shadow {
u8 padding_0000[0x0140];
u8 padding_0140[0x0140];
u64 int_status_class0_RW; /* 0x0140 */
u64 int_status_class1_RW; /* 0x0148 */
u64 int_status_class2_RW; /* 0x0150 */
Expand All @@ -67,8 +67,7 @@ struct spe_shadow {
u8 padding_0c08[0x0f00-0x0c08];
u64 spe_execution_status; /* 0x0f00 */
u8 padding_0f08[0x1000-0x0f08];
} __attribute__ ((packed));

};

/**
* enum spe_ex_state - Logical spe execution state.
Expand Down

0 comments on commit a8229a9

Please sign in to comment.