Module: xenomai-rpm Branch: for-upstream Commit: a995e179badef15103012acbdb1e9df88282cd80 URL: http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=a995e179badef15103012acbdb1e9df88282cd80
Author: Philippe Gerum <[email protected]> Date: Mon Jun 14 11:46:02 2010 +0200 blackfin: upgrade I-pipe support to 2.6.34-blackfin-1.14-01 --- ...h => adeos-ipipe-2.6.34-blackfin-1.14-01.patch} | 28 +++++++++++++++---- 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ksrc/arch/blackfin/patches/adeos-ipipe-2.6.34-blackfin-1.14-00.patch b/ksrc/arch/blackfin/patches/adeos-ipipe-2.6.34-blackfin-1.14-01.patch similarity index 99% rename from ksrc/arch/blackfin/patches/adeos-ipipe-2.6.34-blackfin-1.14-00.patch rename to ksrc/arch/blackfin/patches/adeos-ipipe-2.6.34-blackfin-1.14-01.patch index e57f536..d62e225 100644 --- a/ksrc/arch/blackfin/patches/adeos-ipipe-2.6.34-blackfin-1.14-00.patch +++ b/ksrc/arch/blackfin/patches/adeos-ipipe-2.6.34-blackfin-1.14-01.patch @@ -1,21 +1,36 @@ +diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig +index c078849..799b1c0 100644 +--- a/arch/blackfin/Kconfig ++++ b/arch/blackfin/Kconfig +@@ -84,6 +84,8 @@ source "kernel/Kconfig.freezer" + + menu "Blackfin Processor Options" + ++source "kernel/ipipe/Kconfig" ++ + comment "Processor and Board Settings" + + choice diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h -index d3b4044..32b7bad 100644 +index d3b4044..331ef0b 100644 --- a/arch/blackfin/include/asm/ipipe.h +++ b/arch/blackfin/include/asm/ipipe.h -@@ -34,10 +34,11 @@ +@@ -34,11 +34,12 @@ #include <asm/bitops.h> #include <asm/atomic.h> #include <asm/traps.h> +#include <asm/bitsperlong.h> -#define IPIPE_ARCH_STRING "1.12-00" -+#define IPIPE_ARCH_STRING "1.14-00" ++#define IPIPE_ARCH_STRING "1.14-01" #define IPIPE_MAJOR_NUMBER 1 -#define IPIPE_MINOR_NUMBER 12 +-#define IPIPE_PATCH_NUMBER 0 +#define IPIPE_MINOR_NUMBER 14 - #define IPIPE_PATCH_NUMBER 0 ++#define IPIPE_PATCH_NUMBER 1 #ifdef CONFIG_SMP + #error "I-pipe/blackfin: SMP not implemented" @@ -129,11 +130,11 @@ void __ipipe_enable_pipeline(void); #define __ipipe_hook_critical_ipi(ipd) do { } while (0) @@ -2679,10 +2694,10 @@ index 0000000..6257dfa +obj-$(CONFIG_IPIPE_TRACE) += tracer.o diff --git a/kernel/ipipe/core.c b/kernel/ipipe/core.c new file mode 100644 -index 0000000..b7d863d +index 0000000..e2503bd --- /dev/null +++ b/kernel/ipipe/core.c -@@ -0,0 +1,1976 @@ +@@ -0,0 +1,1977 @@ +/* -*- linux-c -*- + * linux/kernel/ipipe/core.c + * @@ -4647,6 +4662,7 @@ index 0000000..b7d863d +EXPORT_SYMBOL(ipipe_send_ipi); +EXPORT_SYMBOL(__ipipe_pend_irq); +EXPORT_SYMBOL(__ipipe_set_irq_pending); ++EXPORT_SYMBOL(__ipipe_event_monitors); +#if defined(CONFIG_IPIPE_DEBUG_INTERNAL) && defined(CONFIG_SMP) +EXPORT_SYMBOL(__ipipe_check_percpu_access); +#endif _______________________________________________ Xenomai-git mailing list [email protected] https://mail.gna.org/listinfo/xenomai-git
