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

Commit 4bf3b0bc authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

[x86 setup] Make struct apm_bios_info cross-architecture 



struct apm_bios_info uses "unsigned short" and "unsigned long"
to mean u16 and u32 respectively.  Correct.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 238b706d

include/linux/apm_bios.h

+11 −9
Original line number Original line Diff line number Diff line
@@ -21,20 +21,22 @@ typedef unsigned short apm_eventinfo_t; 




#ifdef __KERNEL__

#ifdef __KERNEL__





#include <linux/types.h>



#define APM_CS		(GDT_ENTRY_APMBIOS_BASE * 8)

#define APM_CS		(GDT_ENTRY_APMBIOS_BASE * 8)

#define APM_CS_16	(APM_CS + 8)

#define APM_CS_16	(APM_CS + 8)

#define APM_DS		(APM_CS_16 + 8)

#define APM_DS		(APM_CS_16 + 8)





struct apm_bios_info {

struct apm_bios_info {

	unsigned short	version;

	u16	version;

	unsigned short	cseg;

	u16	cseg;

	unsigned long	offset;

	u32	offset;

	unsigned short	cseg_16;

	u16	cseg_16;

	unsigned short	dseg;

	u16	dseg;

	unsigned short	flags;

	u16	flags;

	unsigned short	cseg_len;

	u16	cseg_len;

	unsigned short	cseg_16_len;

	u16	cseg_16_len;

	unsigned short	dseg_len;

	u16	dseg_len;

};

};





/* Results of APM Installation Check */

/* Results of APM Installation Check */