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

Commit 8d936626 authored by Adam Jackson's avatar Adam Jackson Committed by Linus Torvalds
Browse files

apm_event{,info}_t are userspace types 



These types define the size of data read from /dev/apm_bios.  They should
not be hidden behind #ifdef __KERNEL__.

This is killing my xserver compile, apm_event_t is used in the xserver
source.

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a3323473

include/linux/apm_bios.h

+3 −3
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 


#include <linux/types.h>



typedef unsigned short	apm_event_t;

typedef unsigned short	apm_eventinfo_t;



struct apm_bios_info {

	__u16	version;

	__u16	cseg;
@@ -32,9 +35,6 @@ struct apm_bios_info { 


#ifdef __KERNEL__



typedef unsigned short	apm_event_t;

typedef unsigned short	apm_eventinfo_t;



#define APM_CS		(GDT_ENTRY_APMBIOS_BASE * 8)

#define APM_CS_16	(APM_CS + 8)

#define APM_DS		(APM_CS_16 + 8)