Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / s390 / include / asm / hardirq.h

diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h
index 881d94590aeb4c84efb8e5c58fae68b73b70f6e5..e4155d3eb2cbf356348a804262d938b711406720 100644 (file)
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
@@ -21,20 +21,4 @@
 
 #define HARDIRQ_BITS   8
 
-void clock_comparator_work(void);
-
-static inline unsigned long long local_tick_disable(void)
-{
-       unsigned long long old;
-
-       old = S390_lowcore.clock_comparator;
-       S390_lowcore.clock_comparator = -1ULL;
-       return old;
-}
-
-static inline void local_tick_enable(unsigned long long comp)
-{
-       S390_lowcore.clock_comparator = comp;
-}
-
 #endif /* __ASM_HARDIRQ_H */