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 <r...@xenomai.org>
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_NUMBER    1
 -#define IPIPE_MINOR_NUMBER    16
 -#define IPIPE_PATCH_NUMBER    1
-+#define IPIPE_CORE_RELEASE    1
++#define IPIPE_CORE_RELEASE    2
  
  #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

Reply via email to