[Xenomai-git] 3.x build test report
next branch build test: git hash: 54b978b71311dbc33afa3a9f7363aceec98927f8 see: http://git.xenomai.org/xenomai-3.git/log/?id=54b978b71311dbc33afa3a9f7363aceec98927f8 Building /work/build/bx3/build-forge-next/at91/3.10-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/at91/3.14-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/at91/3.18-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/at91/4.1-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/i686/3.10-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/i686/3.14-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/i686/3.18-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/i686/4.1-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/i686-smp/3.10-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/i686-smp/3.14-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/i686-smp/3.18-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/i686-smp/4.1-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/imx_v4_v5/3.10-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/imx_v4_v5/3.14-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/imx_v4_v5/3.18-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/imx_v4_v5/4.1-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/imx_v6_v7/3.10-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/imx_v6_v7/3.14-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/imx_v6_v7/3.18-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/imx_v6_v7/4.1-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/ixp4xx/3.10-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/ixp4xx/3.14-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/ixp4xx/3.18-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/ixp4xx/4.1-arm-none-linux-gnueabi-gcc-4.8.3: failed Building /work/build/bx3/build-forge-next/lite5200/3.10-powerpc-linux-gcc-4.6.4: failed Building /work/build/bx3/build-forge-next/lite5200/3.14-powerpc-linux-gcc-4.6.4: failed Building /work/build/bx3/build-forge-next/lite5200/3.18-powerpc-linux-gcc-4.6.4: failed Building /work/build/bx3/build-forge-next/lite5200/4.1-powerpc-linux-gcc-4.6.4: failed Building /work/build/bx3/build-forge-next/mpc8641_hpcn/3.10-powerpc-linux-gcc-4.6.4: failed Building /work/build/bx3/build-forge-next/mpc8641_hpcn/3.14-powerpc-linux-gcc-4.6.4: failed Building /work/build/bx3/build-forge-next/mpc8641_hpcn/3.18-powerpc-linux-gcc-4.6.4: failed Building /work/build/bx3/build-forge-next/mpc8641_hpcn/4.1-powerpc-linux-gcc-4.6.4: failed Building /work/build/bx3/build-forge-next/omap/3.10-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/omap/3.14-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/omap/3.18-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/omap/4.1-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/pasemi/3.10-powerpc64-unknown-linux-gnu-gcc-4.9.1: failed Building /work/build/bx3/build-forge-next/pasemi/3.14-powerpc64-unknown-linux-gnu-gcc-4.9.1: failed Building /work/build/bx3/build-forge-next/pasemi/3.18-powerpc64-unknown-linux-gnu-gcc-4.9.1: failed Building /work/build/bx3/build-forge-next/pasemi/4.1-powerpc64-unknown-linux-gnu-gcc-4.9.1: failed Building /work/build/bx3/build-forge-next/sama5/3.10-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/sama5/3.14-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/sama5/3.18-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/sama5/4.1-arm-linux-gnueabihf-gcc-4.9.3: failed Building /work/build/bx3/build-forge-next/x86_64/3.10-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/x86_64/3.14-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/x86_64/3.18-gcc-4.8.2: failed Building /work/build/bx3/build-forge-next/x86_64/4.1-gcc-4.8.2: failed at91/3.10-arm-none-linux-gnueabi-gcc-4.8.3: failed with 4 warnings/errors See http://xenomai.org/build-test-next/at91/3.10-arm-none-linux-gnueabi-gcc-4.8.3/log.html#1 at91/3.14-arm-none-linux-gnueabi-gcc-4.8.3: failed with 4 warnings/errors See http://xenomai.org/build-test-next/at91/3.14-arm-none-linux-gnueabi-gcc-4.8.3/log.html#1 at91/3.18-arm-none-linux-gnueabi-gcc-4.8.3: failed with 5 warnings/errors See http://xenomai.org/build-test-next/at91/3.18-arm-none-linux-gnueabi-gcc-4.8.3/log.html#1 at91/4.1-arm-none-linux-gnueabi-gcc-4.8.3: f
[Xenomai-git] Philippe Gerum : cobalt/x86: upgrade I-pipe support
Module: xenomai-3 Branch: stable-3.0.x Commit: 260a33cf15afe5d3ea0717bb48f049ca23875cb6 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=260a33cf15afe5d3ea0717bb48f049ca23875cb6 Author: Philippe Gerum Date: Thu Mar 24 12:35:02 2016 +0100 cobalt/x86: upgrade I-pipe support --- ...-x86-7.patch => ipipe-core-3.10.32-x86-8.patch} | 23 +--- ...86-11.patch => ipipe-core-3.14.44-x86-12.patch} | 16 ++ ...-x86-5.patch => ipipe-core-3.18.20-x86-6.patch} | 16 ++ 3 files changed, 10 insertions(+), 45 deletions(-) diff --git a/kernel/cobalt/arch/x86/patches/ipipe-core-3.10.32-x86-7.patch b/kernel/cobalt/arch/x86/patches/ipipe-core-3.10.32-x86-8.patch similarity index 99% rename from kernel/cobalt/arch/x86/patches/ipipe-core-3.10.32-x86-7.patch rename to kernel/cobalt/arch/x86/patches/ipipe-core-3.10.32-x86-8.patch index 2702f29..eeed695 100644 --- a/kernel/cobalt/arch/x86/patches/ipipe-core-3.10.32-x86-7.patch +++ b/kernel/cobalt/arch/x86/patches/ipipe-core-3.10.32-x86-8.patch @@ -277,7 +277,7 @@ index 615fa90..e0a62ab 100644 extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask, diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h new file mode 100644 -index 000..6e490b5 +index 000..fb77224 --- /dev/null +++ b/arch/x86/include/asm/ipipe.h @@ -0,0 +1,104 @@ @@ -307,7 +307,7 @@ index 000..6e490b5 + +#ifdef CONFIG_IPIPE + -+#define IPIPE_CORE_RELEASE7 ++#define IPIPE_CORE_RELEASE8 + +struct ipipe_domain; + @@ -2059,7 +2059,7 @@ index deeb48d..4c1be96 100644 #else /* CONFIG_X86_64 */ diff --git a/arch/x86/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c -index 68a3343..057710f3 100644 +index 68a3343..057710f 100644 --- a/arch/x86/kernel/cpu/mtrr/cyrix.c +++ b/arch/x86/kernel/cpu/mtrr/cyrix.c @@ -18,7 +18,7 @@ cyrix_get_arr(unsigned int reg, unsigned long *base, @@ -10853,10 +10853,10 @@ index 000..2746906 +#endif diff --git a/kernel/ipipe/timer.c b/kernel/ipipe/timer.c new file mode 100644 -index 000..0c9b908 +index 000..f32a7ff --- /dev/null +++ b/kernel/ipipe/timer.c -@@ -0,0 +1,492 @@ +@@ -0,0 +1,493 @@ +/* -*- linux-c -*- + * linux/kernel/ipipe/timer.c + * @@ -11224,6 +11224,7 @@ index 000..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; @@ -14627,18 +14628,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/x86/patches/ipipe-core-3.14.44-x86-11.patch b/kernel/cobalt/arch/x86/patches/ipipe-core-3.14.44-x86-12.patch similarity index 99% rename from kernel/cobalt/arch/x86/patches/ipipe-core-3.14.44-x86-11.patch rename to kernel/cobalt/arch/x86/patches/ipipe-core-3.14.44-x86-12.patch index d22dfed..3c6dfd0 100644 --- a/kernel/cobalt/arch/x86/patches/ipipe-core-3.14.44-x86-11.patch +++ b/kernel/cobalt/arch/x86/patches/ipipe-core-3.14.44-x86-12.patch @@ -442,7 +442,7 @@ index 615fa90..e0a62ab 100644 extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask, diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h new file mode 100644 -index 000..4ad79ed +index 000..b741c33 --- /dev/null +++ b/arch/x86/include/asm/ipipe.h @@ -0,0 +1,96 @@ @@ -472,7 +472,7 @@ index 000..4ad79ed + +#ifdef CONFIG_IPIPE + -+#define IPIPE_CORE_RELEASE11 ++#define IPIPE_CORE_RELEASE12 + +struct ipipe_domain; + @@ -15267,18 +15267,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/x86/patches/ipipe-core-3.18.20-x86-5.patch b/kernel/cobalt/arch/x86/patches/ipipe-core-3.18.20-x86-6.patch similarity index 99% re
[Xenomai-git] Philippe Gerum : cobalt/powerpc: upgrade I-pipe support
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 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 000..2b71932 +index 000..68f0275 --- /dev/null +++ b/arch/powerpc/include/asm/ipipe.h @@ -0,0 +1,164 @@ @@ -284,7 +284,7 @@ index 000..2b71932 +#include +#include + -+#define IPIPE_CORE_RELEASE7 ++#define IPIPE_CORE_RELEASE8 + +struct ipipe_domain; + @@ -10593,10 +10593,10 @@ index 000..2746906 +#endif diff --git a/kernel/ipipe/timer.c b/kernel/ipipe/timer.c new file mode 100644 -index 000..0c9b908 +index 000..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 000..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 000..6a5f109 +index 000..363c353 --- /dev/null +++ b/arch/powerpc/include/asm/ipipe.h @@ -0,0 +1,157 @@ @@ -386,7 +386,7 @@ index 000..6a5f109 +#include +#include + -+#define IPIPE_CORE_RELEASE12 ++#define IPIPE_CORE_RELEASE13 + +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
[Xenomai-git] Philippe Gerum : cobalt/blackfin: upgrade I-pipe support
Module: xenomai-3 Branch: stable-3.0.x Commit: 00cef1ae404e80eb1ecbf6b6c9e89d91656cf708 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=00cef1ae404e80eb1ecbf6b6c9e89d91656cf708 Author: Philippe Gerum Date: Thu Mar 24 12:33:34 2016 +0100 cobalt/blackfin: upgrade I-pipe support --- ...6.patch => ipipe-core-3.10.32-blackfin-7.patch} | 21 +--- patch => ipipe-core-3.14.44-blackfin-10.patch} | 16 ++- ...5.patch => ipipe-core-3.18.20-blackfin-6.patch} | 16 ++- 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.10.32-blackfin-6.patch b/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.10.32-blackfin-7.patch similarity index 99% rename from kernel/cobalt/arch/blackfin/patches/ipipe-core-3.10.32-blackfin-6.patch rename to kernel/cobalt/arch/blackfin/patches/ipipe-core-3.10.32-blackfin-7.patch index d07d514..cdab697 100644 --- a/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.10.32-blackfin-6.patch +++ b/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.10.32-blackfin-7.patch @@ -12,7 +12,7 @@ index a117652..c5d277d1 100644 comment "Processor and Board Settings" diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h -index 17b5e92..c8d1a8a 100644 +index 17b5e92..c4e3876 100644 --- a/arch/blackfin/include/asm/ipipe.h +++ b/arch/blackfin/include/asm/ipipe.h @@ -28,7 +28,7 @@ @@ -32,7 +32,7 @@ index 17b5e92..c8d1a8a 100644 -#define IPIPE_MAJOR_NUMBER1 -#define IPIPE_MINOR_NUMBER16 -#define IPIPE_PATCH_NUMBER1 -+#define IPIPE_CORE_RELEASE6 ++#define IPIPE_CORE_RELEASE7 #ifdef CONFIG_SMP #error "I-pipe/blackfin: SMP not implemented" @@ -7280,10 +7280,10 @@ index 000..2746906 +#endif diff --git a/kernel/ipipe/timer.c b/kernel/ipipe/timer.c new file mode 100644 -index 000..0c9b908 +index 000..f32a7ff --- /dev/null +++ b/kernel/ipipe/timer.c -@@ -0,0 +1,492 @@ +@@ -0,0 +1,493 @@ +/* -*- linux-c -*- + * linux/kernel/ipipe/timer.c + * @@ -7651,6 +7651,7 @@ index 000..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; @@ -11054,18 +11055,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/blackfin/patches/ipipe-core-3.14.44-blackfin-9.patch b/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.44-blackfin-10.patch similarity index 99% rename from kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.44-blackfin-9.patch rename to kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.44-blackfin-10.patch index 5112b5a..6d7183f 100644 --- a/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.44-blackfin-9.patch +++ b/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.14.44-blackfin-10.patch @@ -12,7 +12,7 @@ index 9ceccef..3c94fa7 100644 comment "Processor and Board Settings" diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h -index 17b5e92..db71a80 100644 +index 17b5e92..07d4364 100644 --- a/arch/blackfin/include/asm/ipipe.h +++ b/arch/blackfin/include/asm/ipipe.h @@ -28,7 +28,7 @@ @@ -32,7 +32,7 @@ index 17b5e92..db71a80 100644 -#define IPIPE_MAJOR_NUMBER1 -#define IPIPE_MINOR_NUMBER16 -#define IPIPE_PATCH_NUMBER1 -+#define IPIPE_CORE_RELEASE9 ++#define IPIPE_CORE_RELEASE10 #ifdef CONFIG_SMP #error "I-pipe/blackfin: SMP not implemented" @@ -11571,18 +11571,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/blackfin/patches/ipipe-core-3.18.20-blackfin-5.patch b/kernel/cobalt/arch/blackfin/patches/ipipe-core-3.18.20-blackfin-6.patch similarity index
[Xenomai-git] Philippe Gerum : cobalt/arm: upgrade I-pipe support
Module: xenomai-3
Branch: stable-3.0.x
Commit: 9e885dbd83b87640c5b641d8d961777997a093dc
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=9e885dbd83b87640c5b641d8d961777997a093dc
Author: Philippe Gerum
Date: Thu Mar 24 12:32:33 2016 +0100
cobalt/arm: upgrade I-pipe support
---
...rm-11.patch => ipipe-core-3.10.32-arm-13.patch} | 40 ---
...rm-15.patch => ipipe-core-3.14.44-arm-16.patch} | 39 +++
...-arm-8.patch => ipipe-core-3.18.20-arm-9.patch} | 41
3 files changed, 47 insertions(+), 73 deletions(-)
diff --git a/kernel/cobalt/arch/arm/patches/ipipe-core-3.10.32-arm-11.patch
b/kernel/cobalt/arch/arm/patches/ipipe-core-3.10.32-arm-13.patch
similarity index 99%
rename from kernel/cobalt/arch/arm/patches/ipipe-core-3.10.32-arm-11.patch
rename to kernel/cobalt/arch/arm/patches/ipipe-core-3.10.32-arm-13.patch
index 092b67d..99f1933 100644
--- a/kernel/cobalt/arch/arm/patches/ipipe-core-3.10.32-arm-11.patch
+++ b/kernel/cobalt/arch/arm/patches/ipipe-core-3.10.32-arm-13.patch
@@ -1092,7 +1092,7 @@ index bb28af7..780ca50 100644
static inline void sp804_clockevents_init(void __iomem *base, unsigned int
irq, const char *name)
diff --git a/arch/arm/include/asm/ipipe.h b/arch/arm/include/asm/ipipe.h
new file mode 100644
-index 000..c7704e8
+index 000..a1737b1
--- /dev/null
+++ b/arch/arm/include/asm/ipipe.h
@@ -0,0 +1,274 @@
@@ -1140,7 +1140,7 @@ index 000..c7704e8
+#include
+#include
+
-+#define IPIPE_CORE_RELEASE11
++#define IPIPE_CORE_RELEASE13
+
+struct ipipe_domain;
+
@@ -5512,7 +5512,7 @@ index da84188..888372f 100644
+ hard_local_irq_enable();
}
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
-index a5afcf7..8ef9c3e 100644
+index a5afcf7..8ef9c3eb 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -24,9 +24,18 @@
@@ -9769,7 +9769,7 @@ index 869254c..69438c1 100644
if (IS_ERR(timer->io_base))
return PTR_ERR(timer->io_base);
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h
b/arch/arm/plat-omap/include/plat/dmtimer.h
-index fb92abb..e593b85 100644
+index fb92abb9..e593b85 100644
--- a/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -104,6 +104,7 @@ struct omap_dm_timer {
@@ -10181,7 +10181,7 @@ index 5dfbb0b..2f1562c 100644
/*
diff --git a/drivers/clocksource/arm_arch_timer.c
b/drivers/clocksource/arm_arch_timer.c
-index 053d846..316b382 100644
+index 053d846..16a9412 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -17,6 +17,8 @@
@@ -10193,7 +10193,7 @@ index 053d846..316b382 100644
#include
#include
-@@ -43,14 +45,54 @@ static bool arch_timer_use_virtual = true;
+@@ -43,14 +45,57 @@ static bool arch_timer_use_virtual = true;
* Architected system timer support.
*/
@@ -10246,11 +10246,14 @@ index 053d846..316b382 100644
+ itimer->irq = irq;
+#endif /* CONFIG_IPIPE */
+stolen:
-+ __ipipe_tsc_update();
++ /*
++ * This is a 64bit clock source, no need for TSC
++ * update.
++ */
evt->event_handler(evt);
return IRQ_HANDLED;
}
-@@ -62,14 +104,14 @@ static irqreturn_t arch_timer_handler_virt(int irq, void
*dev_id)
+@@ -62,14 +107,14 @@ static irqreturn_t arch_timer_handler_virt(int irq, void
*dev_id)
{
struct clock_event_device *evt = dev_id;
@@ -10267,7 +10270,7 @@ index 053d846..316b382 100644
}
static inline void timer_set_mode(const int access, int mode)
-@@ -142,6 +184,30 @@ static int __cpuinit arch_timer_setup(struct
clock_event_device *clk)
+@@ -142,6 +187,30 @@ static int __cpuinit arch_timer_setup(struct
clock_event_device *clk)
clk->set_mode(CLOCK_EVT_MODE_SHUTDOWN, NULL);
@@ -10298,7 +10301,7 @@ index 053d846..316b382 100644
clockevents_config_and_register(clk, arch_timer_rate,
0xf, 0x7fff);
-@@ -275,6 +341,11 @@ static int __init arch_timer_register(void)
+@@ -275,6 +344,11 @@ static int __init arch_timer_register(void)
goto out;
}
@@ -17281,10 +17284,10 @@ index 000..2746906
+#endif
diff --git a/kernel/ipipe/timer.c b/kernel/ipipe/timer.c
new file mode 100644
-index 000..0c9b908
+index 000..f32a7ff
--- /dev/null
+++ b/kernel/ipipe/timer.c
-@@ -0,0 +1,492 @@
+@@ -0,0 +1,493 @@
+/* -*- linux-c -*-
+ * linux/kernel/ipipe/timer.c
+ *
@@ -17652,6 +17655,7 @@ index 000..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;
@@ -21055,18 +21059,
[Xenomai-git] Gilles Chanteperdrix : cobalt/config: disallow page migration
Module: xenomai-3 Branch: next Commit: 54b978b71311dbc33afa3a9f7363aceec98927f8 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=54b978b71311dbc33afa3a9f7363aceec98927f8 Author: Gilles Chanteperdrix Date: Wed Mar 23 11:01:12 2016 +0100 cobalt/config: disallow page migration --- scripts/Kconfig.frag |6 ++ 1 file changed, 6 insertions(+) diff --git a/scripts/Kconfig.frag b/scripts/Kconfig.frag index a952d88..61398ed 100644 --- a/scripts/Kconfig.frag +++ b/scripts/Kconfig.frag @@ -1,4 +1,5 @@ menuconfig XENOMAI + depends on !MIGRATION depends on X86_TSC || !X86 bool "Xenomai/cobalt" select IPIPE @@ -19,6 +20,11 @@ if XENOMAI source "arch/$SRCARCH/xenomai/Kconfig" endif +if MIGRATION +comment "Xenomai requires disabling page migration/memory compaction" +comment "(Support for transparent hugepages requires memory compaction)" +endif + if APM || CPU_FREQ || ACPI_PROCESSOR || INTEL_IDLE comment "WARNING! You enabled APM, CPU Frequency scaling, ACPI 'processor'" comment "or Intel cpuidle option. These options are known to cause troubles" ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Gilles Chanteperdrix : cobalt/config: disallow page migration
Module: xenomai-3 Branch: stable-3.0.x Commit: 00fa0c06a1295b26b3d785c8d823717603921bd5 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=00fa0c06a1295b26b3d785c8d823717603921bd5 Author: Gilles Chanteperdrix Date: Wed Mar 23 11:01:12 2016 +0100 cobalt/config: disallow page migration --- scripts/Kconfig.frag |6 ++ 1 file changed, 6 insertions(+) diff --git a/scripts/Kconfig.frag b/scripts/Kconfig.frag index a952d88..61398ed 100644 --- a/scripts/Kconfig.frag +++ b/scripts/Kconfig.frag @@ -1,4 +1,5 @@ menuconfig XENOMAI + depends on !MIGRATION depends on X86_TSC || !X86 bool "Xenomai/cobalt" select IPIPE @@ -19,6 +20,11 @@ if XENOMAI source "arch/$SRCARCH/xenomai/Kconfig" endif +if MIGRATION +comment "Xenomai requires disabling page migration/memory compaction" +comment "(Support for transparent hugepages requires memory compaction)" +endif + if APM || CPU_FREQ || ACPI_PROCESSOR || INTEL_IDLE comment "WARNING! You enabled APM, CPU Frequency scaling, ACPI 'processor'" comment "or Intel cpuidle option. These options are known to cause troubles" ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/powerpc: upgrade I-pipe support
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 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 000..837a554 +index 000..271fc48 --- /dev/null +++ b/arch/powerpc/include/asm/ipipe.h @@ -0,0 +1,151 @@ @@ -349,7 +349,7 @@ index 000..837a554 +#include +#include + -+#define IPIPE_CORE_RELEASE2 ++#define IPIPE_CORE_RELEASE3 + +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
[Xenomai-git] Philippe Gerum : cobalt/x86: upgrade I-pipe support
Module: xenomai-3 Branch: stable-3.0.x Commit: c2105542f39200b185fd89e994d46967bbf59f58 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=c2105542f39200b185fd89e994d46967bbf59f58 Author: Philippe Gerum Date: Thu Mar 24 12:01:06 2016 +0100 cobalt/x86: upgrade I-pipe support --- 1.18-x86-2.patch => ipipe-core-4.1.18-x86-3.patch} | 16 ++-- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/kernel/cobalt/arch/x86/patches/ipipe-core-4.1.18-x86-2.patch b/kernel/cobalt/arch/x86/patches/ipipe-core-4.1.18-x86-3.patch similarity index 99% rename from kernel/cobalt/arch/x86/patches/ipipe-core-4.1.18-x86-2.patch rename to kernel/cobalt/arch/x86/patches/ipipe-core-4.1.18-x86-3.patch index 5cc2396..5a8cf1e 100644 --- a/kernel/cobalt/arch/x86/patches/ipipe-core-4.1.18-x86-2.patch +++ b/kernel/cobalt/arch/x86/patches/ipipe-core-4.1.18-x86-3.patch @@ -434,7 +434,7 @@ index 615fa90..e0a62ab 100644 extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask, diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h new file mode 100644 -index 000..f01ff21 +index 000..b5966a6 --- /dev/null +++ b/arch/x86/include/asm/ipipe.h @@ -0,0 +1,112 @@ @@ -464,7 +464,7 @@ index 000..f01ff21 + +#ifdef CONFIG_IPIPE + -+#define IPIPE_CORE_RELEASE2 ++#define IPIPE_CORE_RELEASE3 + +struct ipipe_domain; +struct pt_regs; @@ -15294,18 +15294,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
[Xenomai-git] Philippe Gerum : cobalt/arm: upgrade I-pipe support
Module: xenomai-3
Branch: stable-3.0.x
Commit: 5f57eb3f4dc868f064cbe90d0415b55e79f55c96
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=5f57eb3f4dc868f064cbe90d0415b55e79f55c96
Author: Philippe Gerum
Date: Thu Mar 24 11:59:35 2016 +0100
cobalt/arm: upgrade I-pipe support
---
...8-arm-2.patch => ipipe-core-4.1.18-arm-3.patch} | 45 +++-
1 file changed, 16 insertions(+), 29 deletions(-)
diff --git a/kernel/cobalt/arch/arm/patches/ipipe-core-4.1.18-arm-2.patch
b/kernel/cobalt/arch/arm/patches/ipipe-core-4.1.18-arm-3.patch
similarity index 99%
rename from kernel/cobalt/arch/arm/patches/ipipe-core-4.1.18-arm-2.patch
rename to kernel/cobalt/arch/arm/patches/ipipe-core-4.1.18-arm-3.patch
index 7c5aaff..01d0fce 100644
--- a/kernel/cobalt/arch/arm/patches/ipipe-core-4.1.18-arm-2.patch
+++ b/kernel/cobalt/arch/arm/patches/ipipe-core-4.1.18-arm-3.patch
@@ -1635,7 +1635,7 @@ index bb28af7..780ca50 100644
static inline void sp804_clockevents_init(void __iomem *base, unsigned int
irq, const char *name)
diff --git a/arch/arm/include/asm/ipipe.h b/arch/arm/include/asm/ipipe.h
new file mode 100644
-index 000..77969f4
+index 000..eccfbcb
--- /dev/null
+++ b/arch/arm/include/asm/ipipe.h
@@ -0,0 +1,297 @@
@@ -1685,7 +1685,7 @@ index 000..77969f4
+#include
+#include
+
-+#define IPIPE_CORE_RELEASE2
++#define IPIPE_CORE_RELEASE3
+
+struct ipipe_domain;
+struct timekeeper;
@@ -4277,7 +4277,7 @@ index 000..ffe02fe
+EXPORT_SYMBOL_GPL(cpu_architecture);
diff --git a/arch/arm/kernel/ipipe_tsc.c b/arch/arm/kernel/ipipe_tsc.c
new file mode 100644
-index 000..d122b39
+index 000..aa9571e
--- /dev/null
+++ b/arch/arm/kernel/ipipe_tsc.c
@@ -0,0 +1,214 @@
@@ -4409,7 +4409,7 @@ index 000..d122b39
+
+ default:
+ unimplemented:
-+ printk("I-pipel: Unimplemented tsc configuration, "
++ printk("I-pipe: Unimplemented tsc configuration, "
+ "type: %d, mask: 0x%08Lx\n", info->type, info->u.mask);
+ BUG();
+ }
@@ -4446,8 +4446,8 @@ index 000..d122b39
+
+ wrap_ms *= HZ / 2;
+ do_div(wrap_ms, 1000);
-+ if (wrap_ms > 0x)
-+ wrap_ms = 0x;
++ if (wrap_ms > 0x7fff)
++ wrap_ms = 0x7fff;
+ ipipe_tsc_update_timer.data = wrap_ms;
+ ipipe_tsc_update_timer.function = __ipipe_tsc_update_fn;
+ mod_timer(&ipipe_tsc_update_timer,
@@ -10738,7 +10738,7 @@ index f6e4d56..e2904aa 100644
/*
diff --git a/drivers/clocksource/arm_arch_timer.c
b/drivers/clocksource/arm_arch_timer.c
-index 0aa135d..b13608c 100644
+index 0aa135d..c48e8f7 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -17,6 +17,8 @@
@@ -10760,7 +10760,7 @@ index 0aa135d..b13608c 100644
{
unsigned long ctrl;
-@@ -146,6 +147,49 @@ static __always_inline irqreturn_t timer_handler(const
int access,
+@@ -146,6 +147,52 @@ static __always_inline irqreturn_t timer_handler(const
int access,
if (ctrl & ARCH_TIMER_CTRL_IT_STAT) {
ctrl |= ARCH_TIMER_CTRL_IT_MASK;
arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, evt);
@@ -10806,11 +10806,14 @@ index 0aa135d..b13608c 100644
+ itimer->irq = irq;
+#endif /* CONFIG_IPIPE */
+stolen:
-+ __ipipe_tsc_update();
++ /*
++ * This is a 64bit clock source, no need for TSC
++ * update.
++ */
evt->event_handler(evt);
return IRQ_HANDLED;
}
-@@ -157,28 +201,28 @@ static irqreturn_t arch_timer_handler_virt(int irq, void
*dev_id)
+@@ -157,28 +204,28 @@ static irqreturn_t arch_timer_handler_virt(int irq, void
*dev_id)
{
struct clock_event_device *evt = dev_id;
@@ -10843,7 +10846,7 @@ index 0aa135d..b13608c 100644
}
static __always_inline void timer_set_mode(const int access, int mode,
-@@ -280,6 +324,18 @@ static void __arch_timer_setup(unsigned type,
+@@ -280,6 +327,18 @@ static void __arch_timer_setup(unsigned type,
clk->set_mode = arch_timer_set_mode_phys;
clk->set_next_event = arch_timer_set_next_event_phys;
}
@@ -10862,21 +10865,17 @@ index 0aa135d..b13608c 100644
} else {
clk->features |= CLOCK_EVT_FEAT_DYNIRQ;
clk->name = "arch_mem_timer";
-@@ -342,6 +398,13 @@ static void arch_counter_set_user_access(void)
+@@ -342,6 +401,9 @@ static void arch_counter_set_user_access(void)
/* Enable user access to the virtual counter */
cntkctl |= ARCH_TIMER_USR_VCT_ACCESS_EN;
+#ifdef CONFIG_IPIPE
+ cntkctl |= ARCH_TIMER_USR_PCT_ACCESS_EN;
+#endif
-+
-+#ifdef CONFIG_IPIPE
-+ cntkctl |= ARCH_TIMER_USR_PCT_ACCESS_EN;
-+#endif
arch_timer_set_cntkctl(cntkctl);
}
-@@ -483,6 +546,11 @@ static void __init arch_counte
[Xenomai-git] Philippe Gerum : cobalt/blackfin: upgrade I-pipe support
Module: xenomai-3 Branch: stable-3.0.x Commit: 4a160053ca5e2aaa1541fe33c104dc7a7a612d58 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=4a160053ca5e2aaa1541fe33c104dc7a7a612d58 Author: Philippe Gerum Date: Thu Mar 24 12:00:17 2016 +0100 cobalt/blackfin: upgrade I-pipe support --- ...kfin-1.patch => ipipe-core-4.1.18-blackfin-2.patch} | 16 ++-- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/kernel/cobalt/arch/blackfin/patches/ipipe-core-4.1.18-blackfin-1.patch b/kernel/cobalt/arch/blackfin/patches/ipipe-core-4.1.18-blackfin-2.patch similarity index 99% rename from kernel/cobalt/arch/blackfin/patches/ipipe-core-4.1.18-blackfin-1.patch rename to kernel/cobalt/arch/blackfin/patches/ipipe-core-4.1.18-blackfin-2.patch index 70446f6..9ad6bc4 100644 --- a/kernel/cobalt/arch/blackfin/patches/ipipe-core-4.1.18-blackfin-1.patch +++ b/kernel/cobalt/arch/blackfin/patches/ipipe-core-4.1.18-blackfin-2.patch @@ -12,7 +12,7 @@ index af76634..ebff376 100644 comment "Processor and Board Settings" diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h -index fe1160f..cc96472 100644 +index fe1160f..d988c1f 100644 --- a/arch/blackfin/include/asm/ipipe.h +++ b/arch/blackfin/include/asm/ipipe.h @@ -28,7 +28,7 @@ @@ -32,7 +32,7 @@ index fe1160f..cc96472 100644 -#define IPIPE_MAJOR_NUMBER1 -#define IPIPE_MINOR_NUMBER16 -#define IPIPE_PATCH_NUMBER1 -+#define IPIPE_CORE_RELEASE1 ++#define IPIPE_CORE_RELEASE2 #ifdef CONFIG_SMP #error "I-pipe/blackfin: SMP not implemented" @@ -11722,18 +11722,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
