[Xenomai-git] Philippe Gerum : x86: upgrade I-pipe support to 2.6.32.13-x86-2.6-04
Module: xenomai-rpm
Branch: queue/mayday
Commit: b7073ca9d528945ce2f4ebcf13d731ca56d4
URL:
http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=b7073ca9d528945ce2f4ebcf13d731ca56d4
Author: Philippe Gerum r...@xenomai.org
Date: Tue May 25 23:03:01 2010 +0200
x86: upgrade I-pipe support to 2.6.32.13-x86-2.6-04
---
...atch = adeos-ipipe-2.6.32.13-x86-2.6-04.patch} | 81 +++
1 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.11-x86-2.6-03.patch
b/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.13-x86-2.6-04.patch
similarity index 99%
rename from ksrc/arch/x86/patches/adeos-ipipe-2.6.32.11-x86-2.6-03.patch
rename to ksrc/arch/x86/patches/adeos-ipipe-2.6.32.13-x86-2.6-04.patch
index a52c3f0..b8c36c6 100644
--- a/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.11-x86-2.6-03.patch
+++ b/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.13-x86-2.6-04.patch
@@ -1,5 +1,5 @@
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 4fdb669..89b72a9 100644
+index fbc161d..966de95 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -480,6 +480,7 @@ config SCHED_OMIT_FRAME_POINTER
@@ -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..7d29f03
+index 000..8d31e67
--- /dev/null
+++ b/arch/x86/include/asm/ipipe.h
@@ -0,0 +1,158 @@
@@ -199,10 +199,10 @@ index 000..7d29f03
+#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);
@@ -1251,7 +1251,7 @@ index d8e5d0c..847cc01 100644
obj-$(CONFIG_HPET_TIMER) += hpet.o
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index 0e69e17..47586ca 100644
+index 168e172..948c033 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -446,7 +446,7 @@ static void lapic_timer_setup(enum clock_event_mode mode,
@@ -1310,7 +1310,7 @@ index 0e69e17..47586ca 100644
}
}
-@@ -1735,7 +1739,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
+@@ -1737,7 +1741,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
*/
v = apic_read(APIC_ISR + ((SPURIOUS_APIC_VECTOR ~0x1f) 1));
if (v (1 (SPURIOUS_APIC_VECTOR 0x1f)))
@@ -1319,7 +1319,7 @@ index 0e69e17..47586ca 100644
inc_irq_stat(irq_spurious_count);
-@@ -2004,13 +2008,13 @@ static int lapic_suspend(struct sys_device *dev,
pm_message_t state)
+@@ -2006,13 +2010,13 @@ static int lapic_suspend(struct sys_device *dev,
pm_message_t state)
apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
#endif
@@ -1335,7 +1335,7 @@ index 0e69e17..47586ca 100644
return 0;
}
-@@ -2025,7 +2029,7 @@ static int lapic_resume(struct sys_device *dev)
+@@ -2027,7 +2031,7 @@ static int lapic_resume(struct sys_device *dev)
if (!apic_pm_state.active)
return 0;
@@ -1344,7 +1344,7 @@ index 0e69e17..47586ca 100644
if (intr_remapping_enabled) {
ioapic_entries = alloc_ioapic_entries();
if (!ioapic_entries) {
-@@ -2091,7 +2095,7 @@ static int lapic_resume(struct sys_device *dev)
+@@ -2093,7 +2097,7 @@ static int lapic_resume(struct sys_device *dev)
free_ioapic_entries(ioapic_entries);
}
restore:
@@ -4251,7 +4251,7 @@ index 4cf7956..fff349c 100644
bool preload_fpu;
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index 6eabe90..e96b01d 100644
+index 868fdb4..ddf025d 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -58,6 +58,8 @@ asmlinkage extern void ret_from_fork(void);
@@ -4271,7 +4271,7 @@ index 6eabe90..e96b01d 100644
set_tsk_thread_flag(p, TIF_FORK);
-@@ -358,10 +361,12 @@ start_thread(struct pt_regs *regs, unsigned long new_ip,
unsigned long new_sp)
+@@ -357,10 +360,12 @@ start_thread(struct pt_regs *regs, unsigned long new_ip,
unsigned long new_sp)
regs-ss= __USER_DS;
regs-flags = 0x200;
set_fs(USER_DS);
@@ -4284,7 +4284,7 @@ index 6eabe90..e96b01d 100644
}
EXPORT_SYMBOL_GPL(start_thread);
-@@ -380,7 +385,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct
*next_p)
+@@ -379,7 +384,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct
*next_p)
{
struct thread_struct *prev = prev_p-thread;
struct thread_struct *next = next_p-thread;
@@ -6275,6 +6275,19 @@ index f4e3184..3b80b7b 100644
#endif
#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+diff --git a/include/linux/module.h b/include/linux/module.h
+index 460df15..482efc8 100644
+--- a/include/linux/module.h
[Xenomai-git] Philippe Gerum : x86: upgrade I-pipe support to 2.6.32.13-x86-2.6-04
Module: xenomai-2.5
Branch: master
Commit: a6acc0899fcf4cd6a17de156da1cde584b74b7bb
URL:
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=a6acc0899fcf4cd6a17de156da1cde584b74b7bb
Author: Philippe Gerum r...@xenomai.org
Date: Tue May 25 23:03:01 2010 +0200
x86: upgrade I-pipe support to 2.6.32.13-x86-2.6-04
---
...atch = adeos-ipipe-2.6.32.13-x86-2.6-04.patch} | 81 +++
1 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.11-x86-2.6-03.patch
b/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.13-x86-2.6-04.patch
similarity index 99%
rename from ksrc/arch/x86/patches/adeos-ipipe-2.6.32.11-x86-2.6-03.patch
rename to ksrc/arch/x86/patches/adeos-ipipe-2.6.32.13-x86-2.6-04.patch
index a52c3f0..b8c36c6 100644
--- a/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.11-x86-2.6-03.patch
+++ b/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.13-x86-2.6-04.patch
@@ -1,5 +1,5 @@
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 4fdb669..89b72a9 100644
+index fbc161d..966de95 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -480,6 +480,7 @@ config SCHED_OMIT_FRAME_POINTER
@@ -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..7d29f03
+index 000..8d31e67
--- /dev/null
+++ b/arch/x86/include/asm/ipipe.h
@@ -0,0 +1,158 @@
@@ -199,10 +199,10 @@ index 000..7d29f03
+#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);
@@ -1251,7 +1251,7 @@ index d8e5d0c..847cc01 100644
obj-$(CONFIG_HPET_TIMER) += hpet.o
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index 0e69e17..47586ca 100644
+index 168e172..948c033 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -446,7 +446,7 @@ static void lapic_timer_setup(enum clock_event_mode mode,
@@ -1310,7 +1310,7 @@ index 0e69e17..47586ca 100644
}
}
-@@ -1735,7 +1739,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
+@@ -1737,7 +1741,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
*/
v = apic_read(APIC_ISR + ((SPURIOUS_APIC_VECTOR ~0x1f) 1));
if (v (1 (SPURIOUS_APIC_VECTOR 0x1f)))
@@ -1319,7 +1319,7 @@ index 0e69e17..47586ca 100644
inc_irq_stat(irq_spurious_count);
-@@ -2004,13 +2008,13 @@ static int lapic_suspend(struct sys_device *dev,
pm_message_t state)
+@@ -2006,13 +2010,13 @@ static int lapic_suspend(struct sys_device *dev,
pm_message_t state)
apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
#endif
@@ -1335,7 +1335,7 @@ index 0e69e17..47586ca 100644
return 0;
}
-@@ -2025,7 +2029,7 @@ static int lapic_resume(struct sys_device *dev)
+@@ -2027,7 +2031,7 @@ static int lapic_resume(struct sys_device *dev)
if (!apic_pm_state.active)
return 0;
@@ -1344,7 +1344,7 @@ index 0e69e17..47586ca 100644
if (intr_remapping_enabled) {
ioapic_entries = alloc_ioapic_entries();
if (!ioapic_entries) {
-@@ -2091,7 +2095,7 @@ static int lapic_resume(struct sys_device *dev)
+@@ -2093,7 +2097,7 @@ static int lapic_resume(struct sys_device *dev)
free_ioapic_entries(ioapic_entries);
}
restore:
@@ -4251,7 +4251,7 @@ index 4cf7956..fff349c 100644
bool preload_fpu;
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index 6eabe90..e96b01d 100644
+index 868fdb4..ddf025d 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -58,6 +58,8 @@ asmlinkage extern void ret_from_fork(void);
@@ -4271,7 +4271,7 @@ index 6eabe90..e96b01d 100644
set_tsk_thread_flag(p, TIF_FORK);
-@@ -358,10 +361,12 @@ start_thread(struct pt_regs *regs, unsigned long new_ip,
unsigned long new_sp)
+@@ -357,10 +360,12 @@ start_thread(struct pt_regs *regs, unsigned long new_ip,
unsigned long new_sp)
regs-ss= __USER_DS;
regs-flags = 0x200;
set_fs(USER_DS);
@@ -4284,7 +4284,7 @@ index 6eabe90..e96b01d 100644
}
EXPORT_SYMBOL_GPL(start_thread);
-@@ -380,7 +385,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct
*next_p)
+@@ -379,7 +384,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct
*next_p)
{
struct thread_struct *prev = prev_p-thread;
struct thread_struct *next = next_p-thread;
@@ -6275,6 +6275,19 @@ index f4e3184..3b80b7b 100644
#endif
#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+diff --git a/include/linux/module.h b/include/linux/module.h
+index 460df15..482efc8 100644
+--- a/include/linux/module.h
b/include/linux/module.h
[Xenomai-git] Philippe Gerum : x86: upgrade I-pipe support to 2.6.32.13-x86-2.6-04
Module: xenomai-rpm
Branch: for-upstream
Commit: a6acc0899fcf4cd6a17de156da1cde584b74b7bb
URL:
http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=a6acc0899fcf4cd6a17de156da1cde584b74b7bb
Author: Philippe Gerum r...@xenomai.org
Date: Tue May 25 23:03:01 2010 +0200
x86: upgrade I-pipe support to 2.6.32.13-x86-2.6-04
---
...atch = adeos-ipipe-2.6.32.13-x86-2.6-04.patch} | 81 +++
1 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.11-x86-2.6-03.patch
b/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.13-x86-2.6-04.patch
similarity index 99%
rename from ksrc/arch/x86/patches/adeos-ipipe-2.6.32.11-x86-2.6-03.patch
rename to ksrc/arch/x86/patches/adeos-ipipe-2.6.32.13-x86-2.6-04.patch
index a52c3f0..b8c36c6 100644
--- a/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.11-x86-2.6-03.patch
+++ b/ksrc/arch/x86/patches/adeos-ipipe-2.6.32.13-x86-2.6-04.patch
@@ -1,5 +1,5 @@
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 4fdb669..89b72a9 100644
+index fbc161d..966de95 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -480,6 +480,7 @@ config SCHED_OMIT_FRAME_POINTER
@@ -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..7d29f03
+index 000..8d31e67
--- /dev/null
+++ b/arch/x86/include/asm/ipipe.h
@@ -0,0 +1,158 @@
@@ -199,10 +199,10 @@ index 000..7d29f03
+#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);
@@ -1251,7 +1251,7 @@ index d8e5d0c..847cc01 100644
obj-$(CONFIG_HPET_TIMER) += hpet.o
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index 0e69e17..47586ca 100644
+index 168e172..948c033 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -446,7 +446,7 @@ static void lapic_timer_setup(enum clock_event_mode mode,
@@ -1310,7 +1310,7 @@ index 0e69e17..47586ca 100644
}
}
-@@ -1735,7 +1739,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
+@@ -1737,7 +1741,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
*/
v = apic_read(APIC_ISR + ((SPURIOUS_APIC_VECTOR ~0x1f) 1));
if (v (1 (SPURIOUS_APIC_VECTOR 0x1f)))
@@ -1319,7 +1319,7 @@ index 0e69e17..47586ca 100644
inc_irq_stat(irq_spurious_count);
-@@ -2004,13 +2008,13 @@ static int lapic_suspend(struct sys_device *dev,
pm_message_t state)
+@@ -2006,13 +2010,13 @@ static int lapic_suspend(struct sys_device *dev,
pm_message_t state)
apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
#endif
@@ -1335,7 +1335,7 @@ index 0e69e17..47586ca 100644
return 0;
}
-@@ -2025,7 +2029,7 @@ static int lapic_resume(struct sys_device *dev)
+@@ -2027,7 +2031,7 @@ static int lapic_resume(struct sys_device *dev)
if (!apic_pm_state.active)
return 0;
@@ -1344,7 +1344,7 @@ index 0e69e17..47586ca 100644
if (intr_remapping_enabled) {
ioapic_entries = alloc_ioapic_entries();
if (!ioapic_entries) {
-@@ -2091,7 +2095,7 @@ static int lapic_resume(struct sys_device *dev)
+@@ -2093,7 +2097,7 @@ static int lapic_resume(struct sys_device *dev)
free_ioapic_entries(ioapic_entries);
}
restore:
@@ -4251,7 +4251,7 @@ index 4cf7956..fff349c 100644
bool preload_fpu;
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index 6eabe90..e96b01d 100644
+index 868fdb4..ddf025d 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -58,6 +58,8 @@ asmlinkage extern void ret_from_fork(void);
@@ -4271,7 +4271,7 @@ index 6eabe90..e96b01d 100644
set_tsk_thread_flag(p, TIF_FORK);
-@@ -358,10 +361,12 @@ start_thread(struct pt_regs *regs, unsigned long new_ip,
unsigned long new_sp)
+@@ -357,10 +360,12 @@ start_thread(struct pt_regs *regs, unsigned long new_ip,
unsigned long new_sp)
regs-ss= __USER_DS;
regs-flags = 0x200;
set_fs(USER_DS);
@@ -4284,7 +4284,7 @@ index 6eabe90..e96b01d 100644
}
EXPORT_SYMBOL_GPL(start_thread);
-@@ -380,7 +385,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct
*next_p)
+@@ -379,7 +384,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct
*next_p)
{
struct thread_struct *prev = prev_p-thread;
struct thread_struct *next = next_p-thread;
@@ -6275,6 +6275,19 @@ index f4e3184..3b80b7b 100644
#endif
#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+diff --git a/include/linux/module.h b/include/linux/module.h
+index 460df15..482efc8 100644
+--- a/include/linux/module.h
