Module: xenomai-2.6
Branch: master
Commit: 125946ed8d193fd331facad50fcbaf887908f5ab
URL:    
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=125946ed8d193fd331facad50fcbaf887908f5ab

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Thu Sep 26 20:51:20 2013 +0200

hal: upgrade I-pipe patches

---

 ...3-arm-1.patch => ipipe-core-3.8.13-arm-2.patch} |   19 ++++++++++++++++---
 ...-1.patch => ipipe-core-3.8.13-blackfin-2.patch} |   19 ++++++++++++++++---
 ...c-1.patch => ipipe-core-3.8.13-powerpc-2.patch} |   19 ++++++++++++++++---
 ...3-x86-2.patch => ipipe-core-3.8.13-x86-3.patch} |   19 ++++++++++++++++---
 4 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/ksrc/arch/arm/patches/ipipe-core-3.8.13-arm-1.patch 
b/ksrc/arch/arm/patches/ipipe-core-3.8.13-arm-2.patch
similarity index 99%
rename from ksrc/arch/arm/patches/ipipe-core-3.8.13-arm-1.patch
rename to ksrc/arch/arm/patches/ipipe-core-3.8.13-arm-2.patch
index 309b6de..fae4121 100644
--- a/ksrc/arch/arm/patches/ipipe-core-3.8.13-arm-1.patch
+++ b/ksrc/arch/arm/patches/ipipe-core-3.8.13-arm-2.patch
@@ -1224,7 +1224,7 @@ index 2dd9d3f..5f8ed7f 100644
  void sp804_clockevents_init(void __iomem *, unsigned int, const char *);
 diff --git a/arch/arm/include/asm/ipipe.h b/arch/arm/include/asm/ipipe.h
 new file mode 100644
-index 0000000..7c156bf
+index 0000000..5413b18
 --- /dev/null
 +++ b/arch/arm/include/asm/ipipe.h
 @@ -0,0 +1,268 @@
@@ -1271,7 +1271,7 @@ index 0000000..7c156bf
 +
 +#include <linux/ipipe_trace.h>
 +
-+#define IPIPE_CORE_RELEASE    1
++#define IPIPE_CORE_RELEASE    2
 +
 +struct ipipe_domain;
 +
@@ -20323,7 +20323,7 @@ index 5e2f7c3..9d38840 100644
 +
 +#endif /* CONFIG_IPIPE */
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 50e425c..b003e75 100644
+index 50e425c..1126540 100644
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
 @@ -686,6 +686,10 @@ int dequeue_signal(struct task_struct *tsk, sigset_t 
*mask, siginfo_t *info)
@@ -20337,6 +20337,19 @@ index 50e425c..b003e75 100644
        /*
         * TASK_WAKEKILL also means wake it up in the stopped/traced/killable
         * case. We don't check t->state here because there is a race with it
+@@ -933,8 +937,11 @@ static inline int wants_signal(int sig, struct 
task_struct *p)
+               return 0;
+       if (sig == SIGKILL)
+               return 1;
+-      if (task_is_stopped_or_traced(p))
++      if (task_is_stopped_or_traced(p)) {
++              if (!signal_pending(p))
++                      __ipipe_report_sigwake(p);
+               return 0;
++      }
+       return task_curr(p) || !signal_pending(p);
+ }
+ 
 diff --git a/kernel/spinlock.c b/kernel/spinlock.c
 index 5cdd806..5ab3a87 100644
 --- a/kernel/spinlock.c
diff --git a/ksrc/arch/blackfin/patches/ipipe-core-3.8.13-blackfin-1.patch 
b/ksrc/arch/blackfin/patches/ipipe-core-3.8.13-blackfin-2.patch
similarity index 99%
rename from ksrc/arch/blackfin/patches/ipipe-core-3.8.13-blackfin-1.patch
rename to ksrc/arch/blackfin/patches/ipipe-core-3.8.13-blackfin-2.patch
index 432b195..bf0796a 100644
--- a/ksrc/arch/blackfin/patches/ipipe-core-3.8.13-blackfin-1.patch
+++ b/ksrc/arch/blackfin/patches/ipipe-core-3.8.13-blackfin-2.patch
@@ -12,7 +12,7 @@ index b6f3ad5..90b8a01 100644
  
  comment "Processor and Board Settings"
 diff --git a/arch/blackfin/include/asm/ipipe.h 
b/arch/blackfin/include/asm/ipipe.h
-index 17b5e92..3c135e6 100644
+index 17b5e92..e942a44 100644
 --- a/arch/blackfin/include/asm/ipipe.h
 +++ b/arch/blackfin/include/asm/ipipe.h
 @@ -28,7 +28,7 @@
@@ -32,7 +32,7 @@ index 17b5e92..3c135e6 100644
 -#define IPIPE_MAJOR_NUMBER    1
 -#define IPIPE_MINOR_NUMBER    16
 -#define IPIPE_PATCH_NUMBER    1
-+#define IPIPE_CORE_RELEASE    1
++#define IPIPE_CORE_RELEASE    2
  
  #ifdef CONFIG_SMP
  #error "I-pipe/blackfin: SMP not implemented"
@@ -10148,7 +10148,7 @@ index 5e2f7c3..9d38840 100644
 +
 +#endif /* CONFIG_IPIPE */
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 50e425c..b003e75 100644
+index 50e425c..1126540 100644
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
 @@ -686,6 +686,10 @@ int dequeue_signal(struct task_struct *tsk, sigset_t 
*mask, siginfo_t *info)
@@ -10162,6 +10162,19 @@ index 50e425c..b003e75 100644
        /*
         * TASK_WAKEKILL also means wake it up in the stopped/traced/killable
         * case. We don't check t->state here because there is a race with it
+@@ -933,8 +937,11 @@ static inline int wants_signal(int sig, struct 
task_struct *p)
+               return 0;
+       if (sig == SIGKILL)
+               return 1;
+-      if (task_is_stopped_or_traced(p))
++      if (task_is_stopped_or_traced(p)) {
++              if (!signal_pending(p))
++                      __ipipe_report_sigwake(p);
+               return 0;
++      }
+       return task_curr(p) || !signal_pending(p);
+ }
+ 
 diff --git a/kernel/spinlock.c b/kernel/spinlock.c
 index 5cdd806..5ab3a87 100644
 --- a/kernel/spinlock.c
diff --git a/ksrc/arch/powerpc/patches/ipipe-core-3.8.13-powerpc-1.patch 
b/ksrc/arch/powerpc/patches/ipipe-core-3.8.13-powerpc-2.patch
similarity index 99%
rename from ksrc/arch/powerpc/patches/ipipe-core-3.8.13-powerpc-1.patch
rename to ksrc/arch/powerpc/patches/ipipe-core-3.8.13-powerpc-2.patch
index eb37579..66220c4 100644
--- a/ksrc/arch/powerpc/patches/ipipe-core-3.8.13-powerpc-1.patch
+++ b/ksrc/arch/powerpc/patches/ipipe-core-3.8.13-powerpc-2.patch
@@ -241,7 +241,7 @@ index e45c494..54ef67b 100644
   * or should we not care like we do now ? --BenH.
 diff --git a/arch/powerpc/include/asm/ipipe.h 
b/arch/powerpc/include/asm/ipipe.h
 new file mode 100644
-index 0000000..0483359
+index 0000000..82950d6
 --- /dev/null
 +++ b/arch/powerpc/include/asm/ipipe.h
 @@ -0,0 +1,164 @@
@@ -286,7 +286,7 @@ index 0000000..0483359
 +#include <linux/cache.h>
 +#include <linux/threads.h>
 +
-+#define IPIPE_CORE_RELEASE    1
++#define IPIPE_CORE_RELEASE    2
 +
 +struct ipipe_domain;
 +
@@ -13435,7 +13435,7 @@ index 5e2f7c3..9d38840 100644
 +
 +#endif /* CONFIG_IPIPE */
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 50e425c..b003e75 100644
+index 50e425c..1126540 100644
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
 @@ -686,6 +686,10 @@ int dequeue_signal(struct task_struct *tsk, sigset_t 
*mask, siginfo_t *info)
@@ -13449,6 +13449,19 @@ index 50e425c..b003e75 100644
        /*
         * TASK_WAKEKILL also means wake it up in the stopped/traced/killable
         * case. We don't check t->state here because there is a race with it
+@@ -933,8 +937,11 @@ static inline int wants_signal(int sig, struct 
task_struct *p)
+               return 0;
+       if (sig == SIGKILL)
+               return 1;
+-      if (task_is_stopped_or_traced(p))
++      if (task_is_stopped_or_traced(p)) {
++              if (!signal_pending(p))
++                      __ipipe_report_sigwake(p);
+               return 0;
++      }
+       return task_curr(p) || !signal_pending(p);
+ }
+ 
 diff --git a/kernel/spinlock.c b/kernel/spinlock.c
 index 5cdd806..5ab3a87 100644
 --- a/kernel/spinlock.c
diff --git a/ksrc/arch/x86/patches/ipipe-core-3.8.13-x86-2.patch 
b/ksrc/arch/x86/patches/ipipe-core-3.8.13-x86-3.patch
similarity index 99%
rename from ksrc/arch/x86/patches/ipipe-core-3.8.13-x86-2.patch
rename to ksrc/arch/x86/patches/ipipe-core-3.8.13-x86-3.patch
index a5229b3..098647a 100644
--- a/ksrc/arch/x86/patches/ipipe-core-3.8.13-x86-2.patch
+++ b/ksrc/arch/x86/patches/ipipe-core-3.8.13-x86-3.patch
@@ -284,7 +284,7 @@ index 615fa90..e0a62ab 100644
  extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask,
 diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h
 new file mode 100644
-index 0000000..7bd1277
+index 0000000..09f250e
 --- /dev/null
 +++ b/arch/x86/include/asm/ipipe.h
 @@ -0,0 +1,104 @@
@@ -314,7 +314,7 @@ index 0000000..7bd1277
 +
 +#ifdef CONFIG_IPIPE
 +
-+#define IPIPE_CORE_RELEASE    2
++#define IPIPE_CORE_RELEASE    3
 +
 +struct ipipe_domain;
 +
@@ -13718,7 +13718,7 @@ index 5e2f7c3..9d38840 100644
 +
 +#endif /* CONFIG_IPIPE */
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 50e425c..b003e75 100644
+index 50e425c..1126540 100644
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
 @@ -686,6 +686,10 @@ int dequeue_signal(struct task_struct *tsk, sigset_t 
*mask, siginfo_t *info)
@@ -13732,6 +13732,19 @@ index 50e425c..b003e75 100644
        /*
         * TASK_WAKEKILL also means wake it up in the stopped/traced/killable
         * case. We don't check t->state here because there is a race with it
+@@ -933,8 +937,11 @@ static inline int wants_signal(int sig, struct 
task_struct *p)
+               return 0;
+       if (sig == SIGKILL)
+               return 1;
+-      if (task_is_stopped_or_traced(p))
++      if (task_is_stopped_or_traced(p)) {
++              if (!signal_pending(p))
++                      __ipipe_report_sigwake(p);
+               return 0;
++      }
+       return task_curr(p) || !signal_pending(p);
+ }
+ 
 diff --git a/kernel/spinlock.c b/kernel/spinlock.c
 index 5cdd806..5ab3a87 100644
 --- a/kernel/spinlock.c


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to