Module: xenomai-3 Branch: stable-3.0.x Commit: fef1e902f6dea69f4d71e8aecb325c2fc176f3d6 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=fef1e902f6dea69f4d71e8aecb325c2fc176f3d6
Author: Philippe Gerum <r...@xenomai.org> Date: Thu Mar 24 12:00:44 2016 +0100 cobalt/powerpc: upgrade I-pipe support --- ...werpc-2.patch => ipipe-core-4.1.18-powerpc-3.patch} | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/kernel/cobalt/arch/powerpc/patches/ipipe-core-4.1.18-powerpc-2.patch b/kernel/cobalt/arch/powerpc/patches/ipipe-core-4.1.18-powerpc-3.patch similarity index 99% rename from kernel/cobalt/arch/powerpc/patches/ipipe-core-4.1.18-powerpc-2.patch rename to kernel/cobalt/arch/powerpc/patches/ipipe-core-4.1.18-powerpc-3.patch index 97fd4a6..c524961 100644 --- a/kernel/cobalt/arch/powerpc/patches/ipipe-core-4.1.18-powerpc-2.patch +++ b/kernel/cobalt/arch/powerpc/patches/ipipe-core-4.1.18-powerpc-3.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..837a554 +index 0000000..271fc48 --- /dev/null +++ b/arch/powerpc/include/asm/ipipe.h @@ -0,0 +1,151 @@ @@ -349,7 +349,7 @@ index 0000000..837a554 +#include <linux/cache.h> +#include <linux/threads.h> + -+#define IPIPE_CORE_RELEASE 2 ++#define IPIPE_CORE_RELEASE 3 + +struct ipipe_domain; + @@ -15542,18 +15542,6 @@ index 1afec32..5803111 100644 goto out; /* -diff --git a/mm/Kconfig b/mm/Kconfig -index 390214d..0ff2650 100644 ---- a/mm/Kconfig -+++ b/mm/Kconfig -@@ -410,6 +410,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 2a9e098..46ec4cd 100644 --- a/mm/memory.c _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git