Commit 878a9f30 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

[PATCH] hpet header sanitization 



Add __KERNEL__ block.
Use __KERNEL__ to allow ioctl interface to be usable.

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a23f9a3c

include/linux/hpet.h

+20 −16
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


#include <linux/compiler.h>



#ifdef __KERNEL__



/*

 * Offsets into HPET Registers

 */
@@ -85,22 +87,6 @@ struct hpet { 
#define	Tn_FSB_INT_ADDR_SHIFT		(32UL)

#define	Tn_FSB_INT_VAL_MASK		(0x00000000ffffffffULL)



struct hpet_info {

	unsigned long hi_ireqfreq;	/* Hz */

	unsigned long hi_flags;	/* information */

	unsigned short hi_hpet;

	unsigned short hi_timer;

};



#define	HPET_INFO_PERIODIC	0x0001	/* timer is periodic */



#define	HPET_IE_ON	_IO('h', 0x01)	/* interrupt on */

#define	HPET_IE_OFF	_IO('h', 0x02)	/* interrupt off */

#define	HPET_INFO	_IOR('h', 0x03, struct hpet_info)

#define	HPET_EPI	_IO('h', 0x04)	/* enable periodic */

#define	HPET_DPI	_IO('h', 0x05)	/* disable periodic */

#define	HPET_IRQFREQ	_IOW('h', 0x6, unsigned long)	/* IRQFREQ usec */



/*

 * exported interfaces

 */
@@ -133,4 +119,22 @@ int hpet_register(struct hpet_task *, int); 
int hpet_unregister(struct hpet_task *);

int hpet_control(struct hpet_task *, unsigned int, unsigned long);



#endif /* __KERNEL__ */



struct hpet_info {

	unsigned long hi_ireqfreq;	/* Hz */

	unsigned long hi_flags;	/* information */

	unsigned short hi_hpet;

	unsigned short hi_timer;

};



#define	HPET_INFO_PERIODIC	0x0001	/* timer is periodic */



#define	HPET_IE_ON	_IO('h', 0x01)	/* interrupt on */

#define	HPET_IE_OFF	_IO('h', 0x02)	/* interrupt off */

#define	HPET_INFO	_IOR('h', 0x03, struct hpet_info)

#define	HPET_EPI	_IO('h', 0x04)	/* enable periodic */

#define	HPET_DPI	_IO('h', 0x05)	/* disable periodic */

#define	HPET_IRQFREQ	_IOW('h', 0x6, unsigned long)	/* IRQFREQ usec */



#endif				/* !__HPET__ */