[Xenomai-git] Philippe Gerum : Merge branch 'master' of ssh+git://xenomai.org/ xenomai-head
Module: xenomai-head Branch: master Commit: 2b705cb1488607584b6da558854c8865a6c5d33b URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=2b705cb1488607584b6da558854c8865a6c5d33b Author: Philippe Gerum r...@xenomai.org Date: Thu Nov 3 12:30:55 2011 +0100 Merge branch 'master' of ssh+git://xenomai.org/xenomai-head --- ___ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : powerpc: upgrade I-pipe support to 3.0.8-powerpc-2.13-04
Module: xenomai-head
Branch: master
Commit: 9a5e42df8bccc59620c08caeb4b9fe92dbf94a1b
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=9a5e42df8bccc59620c08caeb4b9fe92dbf94a1b
Author: Philippe Gerum r...@xenomai.org
Date: Thu Nov 3 12:28:45 2011 +0100
powerpc: upgrade I-pipe support to 3.0.8-powerpc-2.13-04
---
...tch = adeos-ipipe-3.0.8-powerpc-2.13-04.patch} | 241 ++--
1 files changed, 166 insertions(+), 75 deletions(-)
diff --git a/ksrc/arch/powerpc/patches/adeos-ipipe-3.0.4-powerpc-2.13-03.patch
b/ksrc/arch/powerpc/patches/adeos-ipipe-3.0.8-powerpc-2.13-04.patch
similarity index 98%
rename from ksrc/arch/powerpc/patches/adeos-ipipe-3.0.4-powerpc-2.13-03.patch
rename to ksrc/arch/powerpc/patches/adeos-ipipe-3.0.8-powerpc-2.13-04.patch
index 2644781..d28173e 100644
--- a/ksrc/arch/powerpc/patches/adeos-ipipe-3.0.4-powerpc-2.13-03.patch
+++ b/ksrc/arch/powerpc/patches/adeos-ipipe-3.0.8-powerpc-2.13-04.patch
@@ -265,10 +265,10 @@ index bb712c9..8885e9b 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 000..e95220b
+index 000..97c12ea
--- /dev/null
+++ b/arch/powerpc/include/asm/ipipe.h
-@@ -0,0 +1,249 @@
+@@ -0,0 +1,278 @@
+/*
+ * include/asm-powerpc/ipipe.h
+ *
@@ -304,6 +304,7 @@ index 000..e95220b
+#include asm/bitops.h
+#include asm/time.h
+#include linux/ipipe_percpu.h
++#include linux/irq.h
+#include linux/list.h
+#include linux/cpumask.h
+#include linux/cache.h
@@ -316,10 +317,10 @@ index 000..e95220b
+#include asm/paca.h
+#endif
+
-+#define IPIPE_ARCH_STRING 2.13-03
++#define IPIPE_ARCH_STRING 2.13-04
+#define IPIPE_MAJOR_NUMBER2
+#define IPIPE_MINOR_NUMBER13
-+#define IPIPE_PATCH_NUMBER3
++#define IPIPE_PATCH_NUMBER4
+
+#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+
@@ -391,8 +392,8 @@ index 000..e95220b
+
+#ifdef CONFIG_PPC64
+#define ipipe_read_tsc(t) (t = mftb())
-+#define ipipe_tsc2ns(t) (((t) * 1000UL) / (__ipipe_cpu_freq /
100UL))
-+#define ipipe_tsc2us(t) ((t) / (__ipipe_cpu_freq / 100UL))
++#define ipipe_tsc2ns(t) (((t) * 1000UL) / (__ipipe_hrclock_freq
/ 100UL))
++#define ipipe_tsc2us(t) ((t) / (__ipipe_hrclock_freq /
100UL))
+#else /* CONFIG_PPC32 */
+#define ipipe_read_tsc(t) \
+ ({ \
@@ -409,12 +410,12 @@ index 000..e95220b
+ })
+
+#define ipipe_tsc2ns(t) \
-+ unsigned long)(t)) * 1000) / (__ipipe_cpu_freq / 100))
++ unsigned long)(t)) * 1000) / (__ipipe_hrclock_freq / 100))
+
+#define ipipe_tsc2us(t) \
+ ({ \
+ unsigned long long delta = (t); \
-+ do_div(delta, __ipipe_cpu_freq/100+1); \
++ do_div(delta, __ipipe_hrclock_freq/100+1); \
+ (unsigned long)delta; \
+ })
+#endif /* CONFIG_PPC32 */
@@ -497,8 +498,29 @@ index 000..e95220b
+
+void check_stack_overflow(void);
+
-+#define ipipe_pre_cascade_eoi(desc)
irq_desc_get_chip(desc)-irq_eoi((desc)-irq_data)
-+#define ipipe_post_cascade_eoi(desc)
irq_desc_get_chip(desc)-irq_unmask((desc)-irq_data)
++static inline void ipipe_pre_cascade_noeoi(struct irq_desc *desc)
++{
++ struct irq_chip *chip = irq_desc_get_chip(desc);
++ chip-irq_mask(desc-irq_data);
++}
++
++static inline void ipipe_post_cascade_noeoi(struct irq_desc *desc)
++{
++ struct irq_chip *chip = irq_desc_get_chip(desc);
++ chip-irq_unmask(desc-irq_data);
++}
++
++static inline void ipipe_pre_cascade_eoi(struct irq_desc *desc)
++{
++ struct irq_chip *chip = irq_desc_get_chip(desc);
++ chip-irq_eoi(desc-irq_data); /* EOI will mask too. */
++}
++
++static inline void ipipe_post_cascade_eoi(struct irq_desc *desc)
++{
++ struct irq_chip *chip = irq_desc_get_chip(desc);
++ chip-irq_unmask(desc-irq_data);
++}
+
+#else /* !CONFIG_IPIPE */
+
@@ -508,8 +530,15 @@ index 000..e95220b
+
+#define ipipe_mm_switch_protect(flags)do { (void)(flags); }
while(0)
+#define ipipe_mm_switch_unprotect(flags) do { (void)(flags); } while(0)
++#define ipipe_pre_cascade_noeoi(desc) do { } while (0)
++#define ipipe_post_cascade_noeoi(desc) do { } while (0)
+#define ipipe_pre_cascade_eoi(desc) do { } while (0)
-+#define ipipe_post_cascade_eoi(desc)
irq_desc_get_chip(desc)-irq_eoi((desc)-irq_data)
++
++static inline void ipipe_post_cascade_eoi(struct irq_desc *desc)
++{
++ struct irq_chip *chip = irq_desc_get_chip(desc);
++ chip-irq_eoi(desc-irq_data);
++}
+
[Xenomai-git] Gilles Chanteperdrix : doc: fix install and dist rules for HTML doc
Module: xenomai-head Branch: master Commit: 54051b32604173eed7b8530d7036f6ff4b900756 URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=54051b32604173eed7b8530d7036f6ff4b900756 Author: Gilles Chanteperdrix gilles.chanteperd...@xenomai.org Date: Wed Nov 2 18:30:16 2011 +0100 doc: fix install and dist rules for HTML doc --- doc/docbook/Makefile.in|8 .../custom-stylesheets/xsl/html/Makefile.in|8 doc/docbook/xenomai/Makefile.in|8 doc/doxygen/Makefile.in|8 doc/install-dist.rules |8 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/docbook/Makefile.in b/doc/docbook/Makefile.in index 76406e3..d258878 100644 --- a/doc/docbook/Makefile.in +++ b/doc/docbook/Makefile.in @@ -775,8 +775,8 @@ uninstall-dbx-htmldocs: done; \ fi -install-htmldocs: $(HTML_DOCS) - docs=$^; abs_builddir=$$PWD; \ +install-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) + docs=$(HTML_DOCS); abs_builddir=$$PWD; \ for dir in $$docs; do \ dest=$(DESTDIR)$(docdir)/html/$$dir; \ $(mkinstalldirs) $$dest; \ @@ -806,8 +806,8 @@ install-psdocs: $(PS_DOCS:%=$(PS_DOCSDIR)%) install-docs-local: install-htmldocs install-psdocs install-pdfdocs -dist-htmldocs: $(HTML_DOCS) - docs=$^; abs_builddir=$$PWD; \ +dist-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) + docs=$(HTML_DOCS); abs_builddir=$$PWD; \ for dir in $$docs; do \ dest=$(GEN_DOC_DIST_ROOT)/html/$$dir; \ $(mkinstalldirs) $$dest abs_dest=`cd $$dest pwd` \ diff --git a/doc/docbook/custom-stylesheets/xsl/html/Makefile.in b/doc/docbook/custom-stylesheets/xsl/html/Makefile.in index bb180f4..55167c3 100644 --- a/doc/docbook/custom-stylesheets/xsl/html/Makefile.in +++ b/doc/docbook/custom-stylesheets/xsl/html/Makefile.in @@ -577,8 +577,8 @@ uninstall-dbx-htmldocs: done; \ fi -install-htmldocs: $(HTML_DOCS) - docs=$^; abs_builddir=$$PWD; \ +install-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) + docs=$(HTML_DOCS); abs_builddir=$$PWD; \ for dir in $$docs; do \ dest=$(DESTDIR)$(docdir)/html/$$dir; \ $(mkinstalldirs) $$dest; \ @@ -608,8 +608,8 @@ install-psdocs: $(PS_DOCS:%=$(PS_DOCSDIR)%) install-docs-local: install-htmldocs install-psdocs install-pdfdocs -dist-htmldocs: $(HTML_DOCS) - docs=$^; abs_builddir=$$PWD; \ +dist-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) + docs=$(HTML_DOCS); abs_builddir=$$PWD; \ for dir in $$docs; do \ dest=$(GEN_DOC_DIST_ROOT)/html/$$dir; \ $(mkinstalldirs) $$dest abs_dest=`cd $$dest pwd` \ diff --git a/doc/docbook/xenomai/Makefile.in b/doc/docbook/xenomai/Makefile.in index fd574c4..908e12b 100644 --- a/doc/docbook/xenomai/Makefile.in +++ b/doc/docbook/xenomai/Makefile.in @@ -574,8 +574,8 @@ uninstall-dbx-htmldocs: done; \ fi -install-htmldocs: $(HTML_DOCS) - docs=$^; abs_builddir=$$PWD; \ +install-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) + docs=$(HTML_DOCS); abs_builddir=$$PWD; \ for dir in $$docs; do \ dest=$(DESTDIR)$(docdir)/html/$$dir; \ $(mkinstalldirs) $$dest; \ @@ -605,8 +605,8 @@ install-psdocs: $(PS_DOCS:%=$(PS_DOCSDIR)%) install-docs-local: install-htmldocs install-psdocs install-pdfdocs -dist-htmldocs: $(HTML_DOCS) - docs=$^; abs_builddir=$$PWD; \ +dist-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) + docs=$(HTML_DOCS); abs_builddir=$$PWD; \ for dir in $$docs; do \ dest=$(GEN_DOC_DIST_ROOT)/html/$$dir; \ $(mkinstalldirs) $$dest abs_dest=`cd $$dest pwd` \ diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in index 92bdcb2..8138e36 100644 --- a/doc/doxygen/Makefile.in +++ b/doc/doxygen/Makefile.in @@ -465,8 +465,8 @@ uninstall-am: uninstall-local @CONFIG_XENO_DOC_DOX_TRUE@.DELETE_ON_ERROR: -install-htmldocs: $(HTML_DOCS) - docs=$^; abs_builddir=$$PWD; \ +install-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) + docs=$(HTML_DOCS); abs_builddir=$$PWD; \ for dir in $$docs; do \ dest=$(DESTDIR)$(docdir)/html/$$dir; \ $(mkinstalldirs) $$dest; \ @@ -496,8 +496,8 @@ install-psdocs: $(PS_DOCS:%=$(PS_DOCSDIR)%) install-docs-local: install-htmldocs install-psdocs install-pdfdocs -dist-htmldocs: $(HTML_DOCS) - docs=$^; abs_builddir=$$PWD; \ +dist-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) + docs=$(HTML_DOCS); abs_builddir=$$PWD; \ for dir in $$docs; do \ dest=$(GEN_DOC_DIST_ROOT)/html/$$dir; \ $(mkinstalldirs) $$dest abs_dest=`cd $$dest pwd` \ diff --git a/doc/install-dist.rules b/doc/install-dist.rules index fd37894..0583c3d 100644 --- a/doc/install-dist.rules +++ b/doc/install-dist.rules @@ -15,8 +15,8 @@ docdir=@docdir@
[Xenomai-git] Gilles Chanteperdrix : Merge branch 'master' of git://git.xenomai.org/ xenomai-head
Module: xenomai-head Branch: master Commit: 533dd83cc4f9a87b021b7074f1cf3e03af511b92 URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=533dd83cc4f9a87b021b7074f1cf3e03af511b92 Author: Gilles Chanteperdrix gilles.chanteperd...@xenomai.org Date: Thu Nov 3 14:44:35 2011 +0100 Merge branch 'master' of git://git.xenomai.org/xenomai-head --- ___ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git
