[PATCH] pcmcia: fix cross-platform issues with pcmcia module aliases
- Added a missing TO_NATIVE call to scripts/mod/file2alias.c:do_pcmcia_entry() - Add an alignment attribute to struct pcmcia_device_no to solve an alignment issue seen when cross-compiling on x86 for m68k. Signed-off-by: Kars de Jong <jongk@linux-m68k.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
parent
2570b74648
commit
4fb7edce52
2 changed files with 5 additions and 2 deletions
|
@ -209,10 +209,11 @@ struct pcmcia_device_id {
|
|||
/* for real multi-function devices */
|
||||
__u8 function;
|
||||
|
||||
/* for pseude multi-function devices */
|
||||
/* for pseudo multi-function devices */
|
||||
__u8 device_no;
|
||||
|
||||
__u32 prod_id_hash[4];
|
||||
__u32 prod_id_hash[4]
|
||||
__attribute__((aligned(sizeof(__u32))));
|
||||
|
||||
/* not matched against in kernelspace*/
|
||||
#ifdef __KERNEL__
|
||||
|
|
|
@ -295,11 +295,13 @@ static int do_pcmcia_entry(const char *filename,
|
|||
{
|
||||
unsigned int i;
|
||||
|
||||
id->match_flags = TO_NATIVE(id->match_flags);
|
||||
id->manf_id = TO_NATIVE(id->manf_id);
|
||||
id->card_id = TO_NATIVE(id->card_id);
|
||||
id->func_id = TO_NATIVE(id->func_id);
|
||||
id->function = TO_NATIVE(id->function);
|
||||
id->device_no = TO_NATIVE(id->device_no);
|
||||
|
||||
for (i=0; i<4; i++) {
|
||||
id->prod_id_hash[i] = TO_NATIVE(id->prod_id_hash[i]);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue