Module: xenomai-3 Branch: stable-3.0.x Commit: bb3187985f7ca95f257db99255adfeb3e1566cd7 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=bb3187985f7ca95f257db99255adfeb3e1566cd7
Author: Philippe Gerum <[email protected]> Date: Thu Mar 24 12:34:18 2016 +0100 cobalt/powerpc: upgrade I-pipe support --- ...-7.patch => ipipe-core-3.10.32-powerpc-8.patch} | 21 +++++--------------- ...2.patch => ipipe-core-3.14.44-powerpc-13.patch} | 16 ++------------- ...-5.patch => ipipe-core-3.18.20-powerpc-6.patch} | 16 ++------------- 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.10.32-powerpc-7.patch b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.10.32-powerpc-8.patch similarity index 99% rename from kernel/cobalt/arch/powerpc/patches/ipipe-core-3.10.32-powerpc-7.patch rename to kernel/cobalt/arch/powerpc/patches/ipipe-core-3.10.32-powerpc-8.patch index cdae495..6cc4d98 100644 --- a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.10.32-powerpc-7.patch +++ b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.10.32-powerpc-8.patch @@ -239,7 +239,7 @@ index ba713f1..ed1b099 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..2b71932 +index 0000000..68f0275 --- /dev/null +++ b/arch/powerpc/include/asm/ipipe.h @@ -0,0 +1,164 @@ @@ -284,7 +284,7 @@ index 0000000..2b71932 +#include <linux/cache.h> +#include <linux/threads.h> + -+#define IPIPE_CORE_RELEASE 7 ++#define IPIPE_CORE_RELEASE 8 + +struct ipipe_domain; + @@ -10593,10 +10593,10 @@ index 0000000..2746906 +#endif diff --git a/kernel/ipipe/timer.c b/kernel/ipipe/timer.c new file mode 100644 -index 0000000..0c9b908 +index 0000000..f32a7ff --- /dev/null +++ b/kernel/ipipe/timer.c -@@ -0,0 +1,492 @@ +@@ -0,0 +1,493 @@ +/* -*- linux-c -*- + * linux/kernel/ipipe/timer.c + * @@ -10964,6 +10964,7 @@ index 0000000..0c9b908 + timer->real_set_next_event = evtdev->set_next_event; + evtdev->mult = 1; + evtdev->shift = 0; ++ evtdev->max_delta_ns = UINT_MAX; + evtdev->set_mode = emumode; + evtdev->set_next_event = emutick; + evtdev->ipipe_stolen = 1; @@ -14367,18 +14368,6 @@ index 4c0d0e5..886125d 100644 goto out; /* -diff --git a/mm/Kconfig b/mm/Kconfig -index e742d06..32bedf1 100644 ---- a/mm/Kconfig -+++ b/mm/Kconfig -@@ -385,6 +385,7 @@ config NOMMU_INITIAL_TRIM_EXCESS - config TRANSPARENT_HUGEPAGE - bool "Transparent Hugepage Support" - depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE -+ depends on !IPIPE - select COMPACTION - help - Transparent Hugepages allows the kernel to use huge pages and diff --git a/mm/memory.c b/mm/memory.c index 4b60011..b4c639e 100644 --- a/mm/memory.c diff --git a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.44-powerpc-12.patch b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.44-powerpc-13.patch similarity index 99% rename from kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.44-powerpc-12.patch rename to kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.44-powerpc-13.patch index f2f0acd..76976eb 100644 --- a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.44-powerpc-12.patch +++ b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.14.44-powerpc-13.patch @@ -341,7 +341,7 @@ index 10be1dd..cfad863 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..6a5f109 +index 0000000..363c353 --- /dev/null +++ b/arch/powerpc/include/asm/ipipe.h @@ -0,0 +1,157 @@ @@ -386,7 +386,7 @@ index 0000000..6a5f109 +#include <linux/cache.h> +#include <linux/threads.h> + -+#define IPIPE_CORE_RELEASE 12 ++#define IPIPE_CORE_RELEASE 13 + +struct ipipe_domain; + @@ -15335,18 +15335,6 @@ index 04abe53..9b2ff41 100644 goto out; /* -diff --git a/mm/Kconfig b/mm/Kconfig -index 0862816..aacbf2df 100644 ---- a/mm/Kconfig -+++ b/mm/Kconfig -@@ -397,6 +397,7 @@ config NOMMU_INITIAL_TRIM_EXCESS - config TRANSPARENT_HUGEPAGE - bool "Transparent Hugepage Support" - depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE -+ depends on !IPIPE - select COMPACTION - help - Transparent Hugepages allows the kernel to use huge pages and diff --git a/mm/memory.c b/mm/memory.c index 749e1c6..090df7e 100644 --- a/mm/memory.c diff --git a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.18.20-powerpc-5.patch b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.18.20-powerpc-6.patch similarity index 99% rename from kernel/cobalt/arch/powerpc/patches/ipipe-core-3.18.20-powerpc-5.patch rename to kernel/cobalt/arch/powerpc/patches/ipipe-core-3.18.20-powerpc-6.patch index a0b9349..a3792aa 100644 --- a/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.18.20-powerpc-5.patch +++ b/kernel/cobalt/arch/powerpc/patches/ipipe-core-3.18.20-powerpc-6.patch @@ -304,7 +304,7 @@ index b59ac27..9cc1d25 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..b510fd4 +index 0000000..f79050e --- /dev/null +++ b/arch/powerpc/include/asm/ipipe.h @@ -0,0 +1,157 @@ @@ -349,7 +349,7 @@ index 0000000..b510fd4 +#include <linux/cache.h> +#include <linux/threads.h> + -+#define IPIPE_CORE_RELEASE 5 ++#define IPIPE_CORE_RELEASE 6 + +struct ipipe_domain; + @@ -15294,18 +15294,6 @@ index 1afec32..5803111 100644 goto out; /* -diff --git a/mm/Kconfig b/mm/Kconfig -index 1d1ae6b..dbe4ef9 100644 ---- a/mm/Kconfig -+++ b/mm/Kconfig -@@ -409,6 +409,7 @@ config NOMMU_INITIAL_TRIM_EXCESS - config TRANSPARENT_HUGEPAGE - bool "Transparent Hugepage Support" - depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE -+ depends on !IPIPE - select COMPACTION - help - Transparent Hugepages allows the kernel to use huge pages and diff --git a/mm/memory.c b/mm/memory.c index 90fb265..8a1fd79 100644 --- a/mm/memory.c _______________________________________________ Xenomai-git mailing list [email protected] https://xenomai.org/mailman/listinfo/xenomai-git
