Module: xenomai-head
Branch: master
Commit: 55b5536d4ba8c258ca7be74f9ff969877e3ba90c
URL:    
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=55b5536d4ba8c258ca7be74f9ff969877e3ba90c

Author: Philippe Gerum <r...@xenomai.org>
Date:   Tue Dec 29 10:52:14 2009 +0100

x86: upgrade I-pipe support to 2.6.31.8-x86-2.4-09

---

 ...patch => adeos-ipipe-2.6.31.8-x86-2.4-09.patch} |   52 ++++++++++----------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ksrc/arch/x86/patches/adeos-ipipe-2.6.31.1-x86-2.4-09.patch 
b/ksrc/arch/x86/patches/adeos-ipipe-2.6.31.8-x86-2.4-09.patch
similarity index 99%
rename from ksrc/arch/x86/patches/adeos-ipipe-2.6.31.1-x86-2.4-09.patch
rename to ksrc/arch/x86/patches/adeos-ipipe-2.6.31.8-x86-2.4-09.patch
index df9db27..5d24595 100644
--- a/ksrc/arch/x86/patches/adeos-ipipe-2.6.31.1-x86-2.4-09.patch
+++ b/ksrc/arch/x86/patches/adeos-ipipe-2.6.31.8-x86-2.4-09.patch
@@ -2902,7 +2902,7 @@ index c251be7..57798d5 100644
        jnz   paranoid_userspace
  paranoid_swapgs:
 diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c
-index 5cf36c0..762361b 100644
+index da890f0..8ff86d6 100644
 --- a/arch/x86/kernel/i8253.c
 +++ b/arch/x86/kernel/i8253.c
 @@ -11,6 +11,7 @@
@@ -2913,7 +2913,7 @@ index 5cf36c0..762361b 100644
  
  #include <asm/i8253.h>
  #include <asm/hpet.h>
-@@ -138,6 +139,12 @@ static cycle_t pit_read(struct clocksource *cs)
+@@ -140,6 +141,12 @@ static cycle_t pit_read(struct clocksource *cs)
        int count;
        u32 jifs;
  
@@ -6075,7 +6075,7 @@ index 72b1a10..80553be 100644
  
  #define inc_preempt_count() add_preempt_count(1)
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 0f1ea4a..6913503 100644
+index d3e910b..42b667c 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -59,6 +59,7 @@ struct sched_param {
@@ -6476,10 +6476,10 @@ index 3f7e609..987f885 100644
          Append an extra string to the end of your kernel version.
          This will show up when you type uname, for example.
 diff --git a/init/main.c b/init/main.c
-index 11f4f14..30f3a70 100644
+index 1ec6347..f85eb8e 100644
 --- a/init/main.c
 +++ b/init/main.c
-@@ -568,7 +568,7 @@ asmlinkage void __init start_kernel(void)
+@@ -563,7 +563,7 @@ asmlinkage void __init start_kernel(void)
  
        cgroup_init_early();
  
@@ -6488,7 +6488,7 @@ index 11f4f14..30f3a70 100644
        early_boot_irqs_off();
        early_init_irq_lock_class();
  
-@@ -632,6 +632,11 @@ asmlinkage void __init start_kernel(void)
+@@ -627,6 +627,11 @@ asmlinkage void __init start_kernel(void)
        timekeeping_init();
        time_init();
        sched_clock_init();
@@ -6500,7 +6500,7 @@ index 11f4f14..30f3a70 100644
        profile_init();
        if (!irqs_disabled())
                printk(KERN_CRIT "start_kernel(): bug: interrupts were "
-@@ -811,6 +816,7 @@ static void __init do_basic_setup(void)
+@@ -806,6 +811,7 @@ static void __init do_basic_setup(void)
        usermodehelper_init();
        driver_init();
        init_irq_proc();
@@ -6521,7 +6521,7 @@ index 2093a69..86416f2 100644
  obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o
  obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
 diff --git a/kernel/exit.c b/kernel/exit.c
-index 869dc22..1c5d62c 100644
+index b8606f0..a885374 100644
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
 @@ -959,6 +959,7 @@ NORET_TYPE void do_exit(long code)
@@ -6533,7 +6533,7 @@ index 869dc22..1c5d62c 100644
        exit_files(tsk);
        exit_fs(tsk);
 diff --git a/kernel/fork.c b/kernel/fork.c
-index e6c04d4..1cd6e8e 100644
+index 4b36858..d8bb474 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -487,6 +487,7 @@ void mmput(struct mm_struct *mm)
@@ -6544,7 +6544,7 @@ index e6c04d4..1cd6e8e 100644
                set_mm_exe_file(mm, NULL);
                if (!list_empty(&mm->mmlist)) {
                        spin_lock(&mmlist_lock);
-@@ -878,7 +879,7 @@ static void copy_flags(unsigned long clone_flags, struct 
task_struct *p)
+@@ -884,7 +885,7 @@ static void copy_flags(unsigned long clone_flags, struct 
task_struct *p)
  {
        unsigned long new_flags = p->flags;
  
@@ -6553,7 +6553,7 @@ index e6c04d4..1cd6e8e 100644
        new_flags |= PF_FORKNOEXEC;
        new_flags |= PF_STARTING;
        p->flags = new_flags;
-@@ -1257,6 +1258,9 @@ static struct task_struct *copy_process(unsigned long 
clone_flags,
+@@ -1263,6 +1264,9 @@ static struct task_struct *copy_process(unsigned long 
clone_flags,
        write_unlock_irq(&tasklist_lock);
        proc_fork_connector(p);
        cgroup_post_fork(p);
@@ -6563,7 +6563,7 @@ index e6c04d4..1cd6e8e 100644
        perf_counter_fork(p);
        return p;
  
-@@ -1658,11 +1662,14 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+@@ -1664,11 +1668,14 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
                }
  
                if (new_mm) {
@@ -10464,7 +10464,7 @@ index b4d97b5..fad9fee 100644
  /* cpu currently holding logbuf_lock */
  static volatile unsigned int printk_cpu = UINT_MAX;
 diff --git a/kernel/sched.c b/kernel/sched.c
-index 1b59e26..4bc5823 100644
+index 81ede13..fd294c8 100644
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
 @@ -2442,7 +2442,7 @@ static int try_to_wake_up(struct task_struct *p, 
unsigned int state, int sync)
@@ -10606,7 +10606,7 @@ index 1b59e26..4bc5823 100644
        /*
         * The BKS might be reacquired before we have dropped
         * PREEMPT_ACTIVE, which could trigger a second
-@@ -10581,3 +10607,58 @@ struct cgroup_subsys cpuacct_subsys = {
+@@ -10584,3 +10610,58 @@ struct cgroup_subsys cpuacct_subsys = {
        .subsys_id = cpuacct_subsys_id,
  };
  #endif        /* CONFIG_CGROUP_CPUACCT */
@@ -10715,10 +10715,10 @@ index 83c4417..782a209 100644
         * When the device is not per cpu, pin the interrupt to the
         * current cpu:
 diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
-index e0f59a2..0132f56 100644
+index 89aed59..aef7075 100644
 --- a/kernel/time/tick-sched.c
 +++ b/kernel/time/tick-sched.c
-@@ -520,7 +520,7 @@ static void tick_nohz_handler(struct clock_event_device 
*dev)
+@@ -525,7 +525,7 @@ static void tick_nohz_handler(struct clock_event_device 
*dev)
                ts->idle_jiffies++;
        }
  
@@ -10727,7 +10727,7 @@ index e0f59a2..0132f56 100644
        profile_tick(CPU_PROFILING);
  
        while (tick_nohz_reprogram(ts, now)) {
-@@ -671,7 +671,7 @@ static enum hrtimer_restart tick_sched_timer(struct 
hrtimer *timer)
+@@ -676,7 +676,7 @@ static enum hrtimer_restart tick_sched_timer(struct 
hrtimer *timer)
                        touch_softlockup_watchdog();
                        ts->idle_jiffies++;
                }
@@ -10768,7 +10768,7 @@ index a7f07d5..9bebec5 100644
   * This function runs timers and the timer-tq in bottom half context.
   */
 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
-index 25edd5c..9ca1e65 100644
+index 52eb251..2e50d11 100644
 --- a/kernel/trace/ftrace.c
 +++ b/kernel/trace/ftrace.c
 @@ -28,6 +28,7 @@
@@ -10779,7 +10779,7 @@ index 25edd5c..9ca1e65 100644
  
  #include <trace/events/sched.h>
  
-@@ -1179,6 +1180,9 @@ static int __ftrace_modify_code(void *data)
+@@ -1174,6 +1175,9 @@ static int __ftrace_modify_code(void *data)
  
  static void ftrace_run_update_code(int command)
  {
@@ -10789,7 +10789,7 @@ index 25edd5c..9ca1e65 100644
        int ret;
  
        ret = ftrace_arch_code_modify_prepare();
-@@ -1186,7 +1190,13 @@ static void ftrace_run_update_code(int command)
+@@ -1181,7 +1185,13 @@ static void ftrace_run_update_code(int command)
        if (ret)
                return;
  
@@ -10803,7 +10803,7 @@ index 25edd5c..9ca1e65 100644
  
        ret = ftrace_arch_code_modify_post_process();
        FTRACE_WARN_ON(ret);
-@@ -2793,7 +2803,9 @@ static int ftrace_convert_nops(struct module *mod,
+@@ -2788,7 +2798,9 @@ static int ftrace_convert_nops(struct module *mod,
  
        /* disable interrupts to prevent kstop machine */
        local_irq_save(flags);
@@ -10813,7 +10813,7 @@ index 25edd5c..9ca1e65 100644
        local_irq_restore(flags);
        mutex_unlock(&ftrace_lock);
  
-@@ -2878,7 +2890,9 @@ void __init ftrace_init(void)
+@@ -2869,7 +2881,9 @@ void __init ftrace_init(void)
        addr = (unsigned long)ftrace_stub;
  
        local_irq_save(flags);
@@ -10969,7 +10969,7 @@ index 9c4b025..08f096b 100644
 +
 +EXPORT_SYMBOL(_raw_write_unlock);
 diff --git a/mm/memory.c b/mm/memory.c
-index aede2ce..561b457 100644
+index 753b2e6..fefc2f5 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
 @@ -55,6 +55,7 @@
@@ -11137,7 +11137,7 @@ index aede2ce..561b457 100644
  /*
   * This routine handles present pages, when users try to write
   * to a shared page. It is done by copying the page to a new address
-@@ -3350,3 +3399,111 @@ void might_fault(void)
+@@ -3351,3 +3400,111 @@ void might_fault(void)
  }
  EXPORT_SYMBOL(might_fault);
  #endif
@@ -11250,10 +11250,10 @@ index aede2ce..561b457 100644
 +
 +#endif
 diff --git a/mm/mlock.c b/mm/mlock.c
-index 45eb650..f19dffb 100644
+index e13918d..aa8d876 100644
 --- a/mm/mlock.c
 +++ b/mm/mlock.c
-@@ -511,10 +511,10 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, 
len)
+@@ -492,10 +492,10 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, 
len)
  static int do_mlockall(int flags)
  {
        struct vm_area_struct * vma, * prev = NULL;


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to