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 <r...@xenomai.org>
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 0000000..6e490b5
+index 0000000..fb77224
--- /dev/null
+++ b/arch/x86/include/asm/ipipe.h
@@ -0,0 +1,104 @@
@@ -307,7 +307,7 @@ index 0000000..6e490b5
+
+#ifdef CONFIG_IPIPE
+
-+#define IPIPE_CORE_RELEASE 7
++#define IPIPE_CORE_RELEASE 8
+
+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 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
+ *
@@ -11224,6 +11224,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;
@@ -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 0000000..4ad79ed
+index 0000000..b741c33
--- /dev/null
+++ b/arch/x86/include/asm/ipipe.h
@@ -0,0 +1,96 @@
@@ -472,7 +472,7 @@ index 0000000..4ad79ed
+
+#ifdef CONFIG_IPIPE
+
-+#define IPIPE_CORE_RELEASE 11
++#define IPIPE_CORE_RELEASE 12
+
+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%
rename from kernel/cobalt/arch/x86/patches/ipipe-core-3.18.20-x86-5.patch
rename to kernel/cobalt/arch/x86/patches/ipipe-core-3.18.20-x86-6.patch
index 757ae74..128c382 100644
--- 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
@@ -449,7 +449,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 0000000..07859a5
+index 0000000..ccc8945
--- /dev/null
+++ b/arch/x86/include/asm/ipipe.h
@@ -0,0 +1,118 @@
@@ -479,7 +479,7 @@ index 0000000..07859a5
+
+#ifdef CONFIG_IPIPE
+
-+#define IPIPE_CORE_RELEASE 5
++#define IPIPE_CORE_RELEASE 6
+
+struct ipipe_domain;
+struct pt_regs;
@@ -15121,18 +15121,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
