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 <r...@xenomai.org>
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_NUMBER 1
-#define IPIPE_MINOR_NUMBER 16
-#define IPIPE_PATCH_NUMBER 1
-+#define IPIPE_CORE_RELEASE 6
++#define IPIPE_CORE_RELEASE 7
#ifdef CONFIG_SMP
#error "I-pipe/blackfin: SMP not implemented"
@@ -7280,10 +7280,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
+ *
@@ -7651,6 +7651,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;
@@ -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_NUMBER 1
-#define IPIPE_MINOR_NUMBER 16
-#define IPIPE_PATCH_NUMBER 1
-+#define IPIPE_CORE_RELEASE 9
++#define IPIPE_CORE_RELEASE 10
#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 99%
rename from
kernel/cobalt/arch/blackfin/patches/ipipe-core-3.18.20-blackfin-5.patch
rename to
kernel/cobalt/arch/blackfin/patches/ipipe-core-3.18.20-blackfin-6.patch
index fb2ca9f..6ecaf7f 100644
--- 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
@@ -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..f9a5b33 100644
+index fe1160f..cc10543 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..f9a5b33 100644
-#define IPIPE_MAJOR_NUMBER 1
-#define IPIPE_MINOR_NUMBER 16
-#define IPIPE_PATCH_NUMBER 1
-+#define IPIPE_CORE_RELEASE 5
++#define IPIPE_CORE_RELEASE 6
#ifdef CONFIG_SMP
#error "I-pipe/blackfin: SMP not implemented"
@@ -11504,18 +11504,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
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
