git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-s390
/
timer.h
diff --git
a/include/asm-s390/timer.h
b/include/asm-s390/timer.h
index
ea07889
..
30e5cbe
100644
(file)
--- a/
include/asm-s390/timer.h
+++ b/
include/asm-s390/timer.h
@@
-1,7
+1,7
@@
/*
* include/asm-s390/timer.h
*
/*
* include/asm-s390/timer.h
*
- * (C) Copyright IBM Corp. 2003
+ * (C) Copyright IBM Corp. 2003
,2006
* Virtual CPU timer
*
* Author: Jan Glauber (jang@de.ibm.com)
* Virtual CPU timer
*
* Author: Jan Glauber (jang@de.ibm.com)
@@
-10,6
+10,8
@@
#ifndef _ASM_S390_TIMER_H
#define _ASM_S390_TIMER_H
#ifndef _ASM_S390_TIMER_H
#define _ASM_S390_TIMER_H
+#ifdef __KERNEL__
+
#include <linux/timer.h>
#define VTIMER_MAX_SLICE (0x7ffffffffffff000LL)
#include <linux/timer.h>
#define VTIMER_MAX_SLICE (0x7ffffffffffff000LL)
@@
-24,7
+26,7
@@
struct vtimer_list {
spinlock_t lock;
unsigned long magic;
spinlock_t lock;
unsigned long magic;
- void (*function)(unsigned long
, struct pt_regs*
);
+ void (*function)(unsigned long);
unsigned long data;
};
unsigned long data;
};
@@
-43,4
+45,6
@@
extern void add_virt_timer_periodic(void *new);
extern int mod_virt_timer(struct vtimer_list *timer, __u64 expires);
extern int del_virt_timer(struct vtimer_list *timer);
extern int mod_virt_timer(struct vtimer_list *timer, __u64 expires);
extern int del_virt_timer(struct vtimer_list *timer);
-#endif
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_S390_TIMER_H */