Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fb7edce authored by Kars de Jong's avatar Kars de Jong Committed by Dominik Brodowski
Browse files

[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: default avatarKars de Jong <jongk@linux-m68k.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 2570b746

include/linux/mod_devicetable.h

+3 −2
Original line number Diff line number Diff line
@@ -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__

scripts/mod/file2alias.c

+2 −0
Original line number Diff line number Diff line
@@ -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]);

       }