Module: xenomai-rpm Branch: for-upstream Commit: 0357b3435fcc70dd0b416ecfe4cab463620dc3a7 URL: http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=0357b3435fcc70dd0b416ecfe4cab463620dc3a7
Author: Philippe Gerum <[email protected]> Date: Fri Jun 18 16:45:32 2010 +0200 powerpc: upgrade I-pipe support to 2.6.34-powerpc-2.10-02 --- ... => adeos-ipipe-2.6.33.5-powerpc-2.10-03.patch} | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ksrc/arch/powerpc/patches/adeos-ipipe-2.6.33.5-powerpc-2.10-02.patch b/ksrc/arch/powerpc/patches/adeos-ipipe-2.6.33.5-powerpc-2.10-03.patch similarity index 99% rename from ksrc/arch/powerpc/patches/adeos-ipipe-2.6.33.5-powerpc-2.10-02.patch rename to ksrc/arch/powerpc/patches/adeos-ipipe-2.6.33.5-powerpc-2.10-03.patch index 9ae5e24..499ccf6 100644 --- a/ksrc/arch/powerpc/patches/adeos-ipipe-2.6.33.5-powerpc-2.10-02.patch +++ b/ksrc/arch/powerpc/patches/adeos-ipipe-2.6.33.5-powerpc-2.10-03.patch @@ -262,7 +262,7 @@ index bd100fc..8fa1901 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..8ec5cd7 +index 0000000..4e90de7 --- /dev/null +++ b/arch/powerpc/include/asm/ipipe.h @@ -0,0 +1,276 @@ @@ -313,10 +313,10 @@ index 0000000..8ec5cd7 +#include <asm/paca.h> +#endif + -+#define IPIPE_ARCH_STRING "2.10-02" ++#define IPIPE_ARCH_STRING "2.10-03" +#define IPIPE_MAJOR_NUMBER 2 +#define IPIPE_MINOR_NUMBER 10 -+#define IPIPE_PATCH_NUMBER 2 ++#define IPIPE_PATCH_NUMBER 3 + +#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH + @@ -7250,7 +7250,7 @@ index 328bca6..4ed869d 100644 #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h -index 9ccf0e2..f500f1e 100644 +index 9ccf0e2..ec98e63 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -395,7 +395,7 @@ do { \ @@ -7262,6 +7262,15 @@ index 9ccf0e2..f500f1e 100644 /* * On lockdep we dont want the hand-coded irq-enable of +@@ -403,7 +403,7 @@ do { \ + * that interrupts are not re-enabled during lock-acquire: + */ + #define LOCK_CONTENDED_FLAGS(_lock, try, lock, lockfl, flags) \ +- LOCK_CONTENDED((_lock), (try), (lock)) ++ LOCK_CONTENDED((_lock), (try), lock) + + #else /* CONFIG_LOCKDEP */ + diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 2e681d9..130b7d5 100644 --- a/include/linux/preempt.h _______________________________________________ Xenomai-git mailing list [email protected] https://mail.gna.org/listinfo/xenomai-git
