[Xenomai-git] Philippe Gerum : x86: upgrade I-pipe support to 2.6.34-x86-2.6-04

2010-06-19 Thread GIT version control 
Module: xenomai-head
Branch: master
Commit: 2465f3dea7ff399bb68d46f9d4e6c796fabaa72f
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=2465f3dea7ff399bb68d46f9d4e6c796fabaa72f

Author: Philippe Gerum r...@xenomai.org
Date:   Wed May 26 18:54:15 2010 +0200

x86: upgrade I-pipe support to 2.6.34-x86-2.6-04

---

 ...3.patch = adeos-ipipe-2.6.34-x86-2.6-04.patch} |  175 +---
 1 files changed, 81 insertions(+), 94 deletions(-)

diff --git a/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch 
b/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
similarity index 98%
rename from ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch
rename to ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
index c5c34af..01a029b 100644
--- a/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch
+++ b/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
@@ -168,7 +168,7 @@ index 0b72282..6574056 100644
  /*
 diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h
 new file mode 100644
-index 000..37ed040
+index 000..4d711dd
 --- /dev/null
 +++ b/arch/x86/include/asm/ipipe.h
 @@ -0,0 +1,156 @@
@@ -199,10 +199,10 @@ index 000..37ed040
 +#ifdef CONFIG_IPIPE
 +
 +#ifndef IPIPE_ARCH_STRING
-+#define IPIPE_ARCH_STRING 2.6-03
++#define IPIPE_ARCH_STRING 2.6-04
 +#define IPIPE_MAJOR_NUMBER2
 +#define IPIPE_MINOR_NUMBER6
-+#define IPIPE_PATCH_NUMBER3
++#define IPIPE_PATCH_NUMBER4
 +#endif
 +
 +DECLARE_PER_CPU(struct pt_regs, __ipipe_tick_regs);
@@ -1358,7 +1358,7 @@ index 09d3b17..0820b62 100644
  
  static void flat_send_IPI_mask(const struct cpumask *cpumask, int vector)
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 127b871..d77ffa8 100644
+index eb2789c..4069f88 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
 @@ -74,8 +74,8 @@
@@ -1414,7 +1414,7 @@ index 127b871..d77ffa8 100644
raw_spin_unlock_irqrestore(ioapic_lock, flags);
  
return was_pending;
-@@ -2553,11 +2560,13 @@ static inline void irq_complete_move(struct irq_desc 
**descp) {}
+@@ -2556,11 +2563,13 @@ static inline void irq_complete_move(struct irq_desc 
**descp) {}
  
  static void ack_apic_edge(unsigned int irq)
  {
@@ -1429,7 +1429,7 @@ index 127b871..d77ffa8 100644
  }
  
  atomic_t irq_mis_count;
-@@ -2601,6 +2610,8 @@ static void __eoi_ioapic_irq(unsigned int irq, struct 
irq_cfg *cfg)
+@@ -2604,6 +2613,8 @@ static void __eoi_ioapic_irq(unsigned int irq, struct 
irq_cfg *cfg)
}
  }
  
@@ -1438,7 +1438,7 @@ index 127b871..d77ffa8 100644
  static void eoi_ioapic_irq(struct irq_desc *desc)
  {
struct irq_cfg *cfg;
-@@ -2615,12 +2626,44 @@ static void eoi_ioapic_irq(struct irq_desc *desc)
+@@ -2618,12 +2629,44 @@ static void eoi_ioapic_irq(struct irq_desc *desc)
raw_spin_unlock_irqrestore(ioapic_lock, flags);
  }
  
@@ -1483,7 +1483,7 @@ index 127b871..d77ffa8 100644
int do_unmask_irq = 0;
  
irq_complete_move(desc);
-@@ -2720,19 +2763,40 @@ static void ack_apic_level(unsigned int irq)
+@@ -2723,19 +2766,40 @@ static void ack_apic_level(unsigned int irq)
move_masked_irq(irq);
unmask_IO_APIC_irq_desc(desc);
}
@@ -1526,7 +1526,7 @@ index 127b871..d77ffa8 100644
eoi_ioapic_irq(desc);
  }
  #endif /* CONFIG_INTR_REMAP */
-@@ -2746,6 +2810,9 @@ static struct irq_chip ioapic_chip __read_mostly = {
+@@ -2749,6 +2813,9 @@ static struct irq_chip ioapic_chip __read_mostly = {
.eoi= ack_apic_level,
  #ifdef CONFIG_SMP
.set_affinity   = set_ioapic_affinity_irq,
@@ -1536,7 +1536,7 @@ index 127b871..d77ffa8 100644
  #endif
.retrigger  = ioapic_retrigger_irq,
  };
-@@ -2760,6 +2827,9 @@ static struct irq_chip ir_ioapic_chip __read_mostly = {
+@@ -2763,6 +2830,9 @@ static struct irq_chip ir_ioapic_chip __read_mostly = {
.eoi= ir_ack_apic_level,
  #ifdef CONFIG_SMP
.set_affinity   = set_ir_ioapic_affinity_irq,
@@ -1546,7 +1546,7 @@ index 127b871..d77ffa8 100644
  #endif
  #endif
.retrigger  = ioapic_retrigger_irq,
-@@ -2805,23 +2875,29 @@ static inline void init_IO_APIC_traps(void)
+@@ -2808,23 +2878,29 @@ static inline void init_IO_APIC_traps(void)
  
  static void mask_lapic_irq(unsigned int irq)
  {
@@ -1579,7 +1579,7 @@ index 127b871..d77ffa8 100644
  }
  
  static struct irq_chip lapic_chip __read_mostly = {
-@@ -2829,6 +2905,9 @@ static struct irq_chip lapic_chip __read_mostly = {
+@@ -2832,6 +2908,9 @@ static struct irq_chip lapic_chip __read_mostly = {
.mask   = mask_lapic_irq,
.unmask = unmask_lapic_irq,
.ack= ack_lapic_irq,
@@ -1589,7 +1589,7 @@ index 127b871..d77ffa8 100644
  };
  
  static void lapic_register_intr(int irq, struct irq_desc *desc)
-@@ -3076,6 +3155,10 @@ static inline void __init check_timer(void)
+@@ -3079,6 +3158,10 @@

[Xenomai-git] Philippe Gerum : x86: upgrade I-pipe support to 2.6.34-x86-2.6-04

2010-05-30 Thread GIT version control 
Module: xenomai-2.5
Branch: master
Commit: 2465f3dea7ff399bb68d46f9d4e6c796fabaa72f
URL:
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=2465f3dea7ff399bb68d46f9d4e6c796fabaa72f

Author: Philippe Gerum r...@xenomai.org
Date:   Wed May 26 18:54:15 2010 +0200

x86: upgrade I-pipe support to 2.6.34-x86-2.6-04

---

 ...3.patch = adeos-ipipe-2.6.34-x86-2.6-04.patch} |  175 +---
 1 files changed, 81 insertions(+), 94 deletions(-)

diff --git a/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch 
b/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
similarity index 98%
rename from ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch
rename to ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
index c5c34af..01a029b 100644
--- a/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch
+++ b/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
@@ -168,7 +168,7 @@ index 0b72282..6574056 100644
  /*
 diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h
 new file mode 100644
-index 000..37ed040
+index 000..4d711dd
 --- /dev/null
 +++ b/arch/x86/include/asm/ipipe.h
 @@ -0,0 +1,156 @@
@@ -199,10 +199,10 @@ index 000..37ed040
 +#ifdef CONFIG_IPIPE
 +
 +#ifndef IPIPE_ARCH_STRING
-+#define IPIPE_ARCH_STRING 2.6-03
++#define IPIPE_ARCH_STRING 2.6-04
 +#define IPIPE_MAJOR_NUMBER2
 +#define IPIPE_MINOR_NUMBER6
-+#define IPIPE_PATCH_NUMBER3
++#define IPIPE_PATCH_NUMBER4
 +#endif
 +
 +DECLARE_PER_CPU(struct pt_regs, __ipipe_tick_regs);
@@ -1358,7 +1358,7 @@ index 09d3b17..0820b62 100644
  
  static void flat_send_IPI_mask(const struct cpumask *cpumask, int vector)
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 127b871..d77ffa8 100644
+index eb2789c..4069f88 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
 @@ -74,8 +74,8 @@
@@ -1414,7 +1414,7 @@ index 127b871..d77ffa8 100644
raw_spin_unlock_irqrestore(ioapic_lock, flags);
  
return was_pending;
-@@ -2553,11 +2560,13 @@ static inline void irq_complete_move(struct irq_desc 
**descp) {}
+@@ -2556,11 +2563,13 @@ static inline void irq_complete_move(struct irq_desc 
**descp) {}
  
  static void ack_apic_edge(unsigned int irq)
  {
@@ -1429,7 +1429,7 @@ index 127b871..d77ffa8 100644
  }
  
  atomic_t irq_mis_count;
-@@ -2601,6 +2610,8 @@ static void __eoi_ioapic_irq(unsigned int irq, struct 
irq_cfg *cfg)
+@@ -2604,6 +2613,8 @@ static void __eoi_ioapic_irq(unsigned int irq, struct 
irq_cfg *cfg)
}
  }
  
@@ -1438,7 +1438,7 @@ index 127b871..d77ffa8 100644
  static void eoi_ioapic_irq(struct irq_desc *desc)
  {
struct irq_cfg *cfg;
-@@ -2615,12 +2626,44 @@ static void eoi_ioapic_irq(struct irq_desc *desc)
+@@ -2618,12 +2629,44 @@ static void eoi_ioapic_irq(struct irq_desc *desc)
raw_spin_unlock_irqrestore(ioapic_lock, flags);
  }
  
@@ -1483,7 +1483,7 @@ index 127b871..d77ffa8 100644
int do_unmask_irq = 0;
  
irq_complete_move(desc);
-@@ -2720,19 +2763,40 @@ static void ack_apic_level(unsigned int irq)
+@@ -2723,19 +2766,40 @@ static void ack_apic_level(unsigned int irq)
move_masked_irq(irq);
unmask_IO_APIC_irq_desc(desc);
}
@@ -1526,7 +1526,7 @@ index 127b871..d77ffa8 100644
eoi_ioapic_irq(desc);
  }
  #endif /* CONFIG_INTR_REMAP */
-@@ -2746,6 +2810,9 @@ static struct irq_chip ioapic_chip __read_mostly = {
+@@ -2749,6 +2813,9 @@ static struct irq_chip ioapic_chip __read_mostly = {
.eoi= ack_apic_level,
  #ifdef CONFIG_SMP
.set_affinity   = set_ioapic_affinity_irq,
@@ -1536,7 +1536,7 @@ index 127b871..d77ffa8 100644
  #endif
.retrigger  = ioapic_retrigger_irq,
  };
-@@ -2760,6 +2827,9 @@ static struct irq_chip ir_ioapic_chip __read_mostly = {
+@@ -2763,6 +2830,9 @@ static struct irq_chip ir_ioapic_chip __read_mostly = {
.eoi= ir_ack_apic_level,
  #ifdef CONFIG_SMP
.set_affinity   = set_ir_ioapic_affinity_irq,
@@ -1546,7 +1546,7 @@ index 127b871..d77ffa8 100644
  #endif
  #endif
.retrigger  = ioapic_retrigger_irq,
-@@ -2805,23 +2875,29 @@ static inline void init_IO_APIC_traps(void)
+@@ -2808,23 +2878,29 @@ static inline void init_IO_APIC_traps(void)
  
  static void mask_lapic_irq(unsigned int irq)
  {
@@ -1579,7 +1579,7 @@ index 127b871..d77ffa8 100644
  }
  
  static struct irq_chip lapic_chip __read_mostly = {
-@@ -2829,6 +2905,9 @@ static struct irq_chip lapic_chip __read_mostly = {
+@@ -2832,6 +2908,9 @@ static struct irq_chip lapic_chip __read_mostly = {
.mask   = mask_lapic_irq,
.unmask = unmask_lapic_irq,
.ack= ack_lapic_irq,
@@ -1589,7 +1589,7 @@ index 127b871..d77ffa8 100644
  };
  
  static void lapic_register_intr(int irq, struct irq_desc *desc)
-@@ -3076,6 +3155,10 @@ static inline void __init check_timer(void)
+@@ -3079,6 +3158,10 @@

[Xenomai-git] Philippe Gerum : x86: upgrade I-pipe support to 2.6.34-x86-2.6-04

2010-05-26 Thread GIT version control 
Module: xenomai-rpm
Branch: for-upstream
Commit: 66f9d24ad1ffa476c91925d952190ca97ac1158a
URL:
http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=66f9d24ad1ffa476c91925d952190ca97ac1158a

Author: Philippe Gerum r...@xenomai.org
Date:   Wed May 26 12:14:03 2010 +0200

x86: upgrade I-pipe support to 2.6.34-x86-2.6-04

---

 ...3.patch = adeos-ipipe-2.6.34-x86-2.6-04.patch} |  175 +---
 1 files changed, 81 insertions(+), 94 deletions(-)

diff --git a/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch 
b/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
similarity index 98%
rename from ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch
rename to ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
index c5c34af..01a029b 100644
--- a/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch
+++ b/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
@@ -168,7 +168,7 @@ index 0b72282..6574056 100644
  /*
 diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h
 new file mode 100644
-index 000..37ed040
+index 000..4d711dd
 --- /dev/null
 +++ b/arch/x86/include/asm/ipipe.h
 @@ -0,0 +1,156 @@
@@ -199,10 +199,10 @@ index 000..37ed040
 +#ifdef CONFIG_IPIPE
 +
 +#ifndef IPIPE_ARCH_STRING
-+#define IPIPE_ARCH_STRING 2.6-03
++#define IPIPE_ARCH_STRING 2.6-04
 +#define IPIPE_MAJOR_NUMBER2
 +#define IPIPE_MINOR_NUMBER6
-+#define IPIPE_PATCH_NUMBER3
++#define IPIPE_PATCH_NUMBER4
 +#endif
 +
 +DECLARE_PER_CPU(struct pt_regs, __ipipe_tick_regs);
@@ -1358,7 +1358,7 @@ index 09d3b17..0820b62 100644
  
  static void flat_send_IPI_mask(const struct cpumask *cpumask, int vector)
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 127b871..d77ffa8 100644
+index eb2789c..4069f88 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
 @@ -74,8 +74,8 @@
@@ -1414,7 +1414,7 @@ index 127b871..d77ffa8 100644
raw_spin_unlock_irqrestore(ioapic_lock, flags);
  
return was_pending;
-@@ -2553,11 +2560,13 @@ static inline void irq_complete_move(struct irq_desc 
**descp) {}
+@@ -2556,11 +2563,13 @@ static inline void irq_complete_move(struct irq_desc 
**descp) {}
  
  static void ack_apic_edge(unsigned int irq)
  {
@@ -1429,7 +1429,7 @@ index 127b871..d77ffa8 100644
  }
  
  atomic_t irq_mis_count;
-@@ -2601,6 +2610,8 @@ static void __eoi_ioapic_irq(unsigned int irq, struct 
irq_cfg *cfg)
+@@ -2604,6 +2613,8 @@ static void __eoi_ioapic_irq(unsigned int irq, struct 
irq_cfg *cfg)
}
  }
  
@@ -1438,7 +1438,7 @@ index 127b871..d77ffa8 100644
  static void eoi_ioapic_irq(struct irq_desc *desc)
  {
struct irq_cfg *cfg;
-@@ -2615,12 +2626,44 @@ static void eoi_ioapic_irq(struct irq_desc *desc)
+@@ -2618,12 +2629,44 @@ static void eoi_ioapic_irq(struct irq_desc *desc)
raw_spin_unlock_irqrestore(ioapic_lock, flags);
  }
  
@@ -1483,7 +1483,7 @@ index 127b871..d77ffa8 100644
int do_unmask_irq = 0;
  
irq_complete_move(desc);
-@@ -2720,19 +2763,40 @@ static void ack_apic_level(unsigned int irq)
+@@ -2723,19 +2766,40 @@ static void ack_apic_level(unsigned int irq)
move_masked_irq(irq);
unmask_IO_APIC_irq_desc(desc);
}
@@ -1526,7 +1526,7 @@ index 127b871..d77ffa8 100644
eoi_ioapic_irq(desc);
  }
  #endif /* CONFIG_INTR_REMAP */
-@@ -2746,6 +2810,9 @@ static struct irq_chip ioapic_chip __read_mostly = {
+@@ -2749,6 +2813,9 @@ static struct irq_chip ioapic_chip __read_mostly = {
.eoi= ack_apic_level,
  #ifdef CONFIG_SMP
.set_affinity   = set_ioapic_affinity_irq,
@@ -1536,7 +1536,7 @@ index 127b871..d77ffa8 100644
  #endif
.retrigger  = ioapic_retrigger_irq,
  };
-@@ -2760,6 +2827,9 @@ static struct irq_chip ir_ioapic_chip __read_mostly = {
+@@ -2763,6 +2830,9 @@ static struct irq_chip ir_ioapic_chip __read_mostly = {
.eoi= ir_ack_apic_level,
  #ifdef CONFIG_SMP
.set_affinity   = set_ir_ioapic_affinity_irq,
@@ -1546,7 +1546,7 @@ index 127b871..d77ffa8 100644
  #endif
  #endif
.retrigger  = ioapic_retrigger_irq,
-@@ -2805,23 +2875,29 @@ static inline void init_IO_APIC_traps(void)
+@@ -2808,23 +2878,29 @@ static inline void init_IO_APIC_traps(void)
  
  static void mask_lapic_irq(unsigned int irq)
  {
@@ -1579,7 +1579,7 @@ index 127b871..d77ffa8 100644
  }
  
  static struct irq_chip lapic_chip __read_mostly = {
-@@ -2829,6 +2905,9 @@ static struct irq_chip lapic_chip __read_mostly = {
+@@ -2832,6 +2908,9 @@ static struct irq_chip lapic_chip __read_mostly = {
.mask   = mask_lapic_irq,
.unmask = unmask_lapic_irq,
.ack= ack_lapic_irq,
@@ -1589,7 +1589,7 @@ index 127b871..d77ffa8 100644
  };
  
  static void lapic_register_intr(int irq, struct irq_desc *desc)
-@@ -3076,6 +3155,10 @@ static inline void __init check_timer(void)
+@@ -3079,6 +3158,10

[Xenomai-git] Philippe Gerum : x86: upgrade I-pipe support to 2.6.34-x86-2.6-04

2010-05-26 Thread GIT version control 
Module: xenomai-rpm
Branch: for-upstream
Commit: 2465f3dea7ff399bb68d46f9d4e6c796fabaa72f
URL:
http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=2465f3dea7ff399bb68d46f9d4e6c796fabaa72f

Author: Philippe Gerum r...@xenomai.org
Date:   Wed May 26 18:54:15 2010 +0200

x86: upgrade I-pipe support to 2.6.34-x86-2.6-04

---

 ...3.patch = adeos-ipipe-2.6.34-x86-2.6-04.patch} |  175 +---
 1 files changed, 81 insertions(+), 94 deletions(-)

diff --git a/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch 
b/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
similarity index 98%
rename from ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch
rename to ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
index c5c34af..01a029b 100644
--- a/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-rc5-x86-2.6-03.patch
+++ b/ksrc/arch/x86/patches/adeos-ipipe-2.6.34-x86-2.6-04.patch
@@ -168,7 +168,7 @@ index 0b72282..6574056 100644
  /*
 diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h
 new file mode 100644
-index 000..37ed040
+index 000..4d711dd
 --- /dev/null
 +++ b/arch/x86/include/asm/ipipe.h
 @@ -0,0 +1,156 @@
@@ -199,10 +199,10 @@ index 000..37ed040
 +#ifdef CONFIG_IPIPE
 +
 +#ifndef IPIPE_ARCH_STRING
-+#define IPIPE_ARCH_STRING 2.6-03
++#define IPIPE_ARCH_STRING 2.6-04
 +#define IPIPE_MAJOR_NUMBER2
 +#define IPIPE_MINOR_NUMBER6
-+#define IPIPE_PATCH_NUMBER3
++#define IPIPE_PATCH_NUMBER4
 +#endif
 +
 +DECLARE_PER_CPU(struct pt_regs, __ipipe_tick_regs);
@@ -1358,7 +1358,7 @@ index 09d3b17..0820b62 100644
  
  static void flat_send_IPI_mask(const struct cpumask *cpumask, int vector)
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 127b871..d77ffa8 100644
+index eb2789c..4069f88 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
 @@ -74,8 +74,8 @@
@@ -1414,7 +1414,7 @@ index 127b871..d77ffa8 100644
raw_spin_unlock_irqrestore(ioapic_lock, flags);
  
return was_pending;
-@@ -2553,11 +2560,13 @@ static inline void irq_complete_move(struct irq_desc 
**descp) {}
+@@ -2556,11 +2563,13 @@ static inline void irq_complete_move(struct irq_desc 
**descp) {}
  
  static void ack_apic_edge(unsigned int irq)
  {
@@ -1429,7 +1429,7 @@ index 127b871..d77ffa8 100644
  }
  
  atomic_t irq_mis_count;
-@@ -2601,6 +2610,8 @@ static void __eoi_ioapic_irq(unsigned int irq, struct 
irq_cfg *cfg)
+@@ -2604,6 +2613,8 @@ static void __eoi_ioapic_irq(unsigned int irq, struct 
irq_cfg *cfg)
}
  }
  
@@ -1438,7 +1438,7 @@ index 127b871..d77ffa8 100644
  static void eoi_ioapic_irq(struct irq_desc *desc)
  {
struct irq_cfg *cfg;
-@@ -2615,12 +2626,44 @@ static void eoi_ioapic_irq(struct irq_desc *desc)
+@@ -2618,12 +2629,44 @@ static void eoi_ioapic_irq(struct irq_desc *desc)
raw_spin_unlock_irqrestore(ioapic_lock, flags);
  }
  
@@ -1483,7 +1483,7 @@ index 127b871..d77ffa8 100644
int do_unmask_irq = 0;
  
irq_complete_move(desc);
-@@ -2720,19 +2763,40 @@ static void ack_apic_level(unsigned int irq)
+@@ -2723,19 +2766,40 @@ static void ack_apic_level(unsigned int irq)
move_masked_irq(irq);
unmask_IO_APIC_irq_desc(desc);
}
@@ -1526,7 +1526,7 @@ index 127b871..d77ffa8 100644
eoi_ioapic_irq(desc);
  }
  #endif /* CONFIG_INTR_REMAP */
-@@ -2746,6 +2810,9 @@ static struct irq_chip ioapic_chip __read_mostly = {
+@@ -2749,6 +2813,9 @@ static struct irq_chip ioapic_chip __read_mostly = {
.eoi= ack_apic_level,
  #ifdef CONFIG_SMP
.set_affinity   = set_ioapic_affinity_irq,
@@ -1536,7 +1536,7 @@ index 127b871..d77ffa8 100644
  #endif
.retrigger  = ioapic_retrigger_irq,
  };
-@@ -2760,6 +2827,9 @@ static struct irq_chip ir_ioapic_chip __read_mostly = {
+@@ -2763,6 +2830,9 @@ static struct irq_chip ir_ioapic_chip __read_mostly = {
.eoi= ir_ack_apic_level,
  #ifdef CONFIG_SMP
.set_affinity   = set_ir_ioapic_affinity_irq,
@@ -1546,7 +1546,7 @@ index 127b871..d77ffa8 100644
  #endif
  #endif
.retrigger  = ioapic_retrigger_irq,
-@@ -2805,23 +2875,29 @@ static inline void init_IO_APIC_traps(void)
+@@ -2808,23 +2878,29 @@ static inline void init_IO_APIC_traps(void)
  
  static void mask_lapic_irq(unsigned int irq)
  {
@@ -1579,7 +1579,7 @@ index 127b871..d77ffa8 100644
  }
  
  static struct irq_chip lapic_chip __read_mostly = {
-@@ -2829,6 +2905,9 @@ static struct irq_chip lapic_chip __read_mostly = {
+@@ -2832,6 +2908,9 @@ static struct irq_chip lapic_chip __read_mostly = {
.mask   = mask_lapic_irq,
.unmask = unmask_lapic_irq,
.ack= ack_lapic_irq,
@@ -1589,7 +1589,7 @@ index 127b871..d77ffa8 100644
  };
  
  static void lapic_register_intr(int irq, struct irq_desc *desc)
-@@ -3076,6 +3155,10 @@ static inline void __init check_timer(void)
+@@ -3079,6 +3158,10