vserver 2.0 rc7

[linux-2.6.git] / arch / x86_64 / kernel / i8259.c

diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index 8bc3d65..7873d9b 100644 (file)
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86_64/kernel/i8259.c
@@ -148,7 +148,7 @@ static void end_8259A_irq (unsigned int irq)
 
 #define shutdown_8259A_irq     disable_8259A_irq
 
-void mask_and_ack_8259A(unsigned int);
+static void mask_and_ack_8259A(unsigned int);
 
 static unsigned int startup_8259A_irq(unsigned int irq)
 { 
@@ -272,7 +272,7 @@ static inline int i8259A_irq_real(unsigned int irq)
  * first, _then_ send the EOI, and the order of EOI
  * to the two 8259s is important!
  */
-void mask_and_ack_8259A(unsigned int irq)
+static void mask_and_ack_8259A(unsigned int irq)
 {
        unsigned int irqmask = 1 << irq;
        unsigned long flags;
@@ -409,7 +409,7 @@ static int i8259A_resume(struct sys_device *dev)
        return 0;
 }
 
-static int i8259A_suspend(struct sys_device *dev, u32 state)
+static int i8259A_suspend(struct sys_device *dev, pm_message_t state)
 {
        save_ELCR(irq_trigger);
        return 0;
@@ -477,6 +477,7 @@ void reschedule_interrupt(void);
 void call_function_interrupt(void);
 void invalidate_interrupt(void);
 void thermal_interrupt(void);
+void i8254_timer_resume(void);
 
 static void setup_timer(void)
 {
@@ -493,6 +494,11 @@ static int timer_resume(struct sys_device *dev)
        return 0;
 }
 
+void i8254_timer_resume(void)
+{
+       setup_timer();
+}
+
 static struct sysdev_class timer_sysclass = {
        set_kset_name("timer"),
        .resume         = timer_resume,