Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by Adam Jackson and committed by Linus Torvalds 8d936626 a3323473
+3
-3
include/linux/apm_bios.h
+3
-3
include/linux/apm_bios.h
···
18
18
19
19
#include <linux/types.h>
20
20
21
+
typedef unsigned short apm_event_t;
22
+
typedef unsigned short apm_eventinfo_t;
23
+
21
24
struct apm_bios_info {
22
25
__u16 version;
23
26
__u16 cseg;
···
34
31
};
35
32
36
33
#ifdef __KERNEL__
37
-
38
-
typedef unsigned short apm_event_t;
39
-
typedef unsigned short apm_eventinfo_t;
40
34
41
35
#define APM_CS (GDT_ENTRY_APMBIOS_BASE * 8)
42
36
#define APM_CS_16 (APM_CS + 8)