aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Brandenburg <bbb@mpi-sws.org>2015-08-09 07:18:44 -0400
committerBjoern Brandenburg <bbb@mpi-sws.org>2015-08-09 06:21:15 -0400
commit6c10dcd2d019bb63026f1fdbd158788cdf7b8b0a (patch)
tree4a3cd0939378c5ebe27dad90622b93ba921d7353
parentc8bde72f9af412de57f0ceae218d648640118b0b (diff)
Add LITMUS^RT directory
Hookup litmus/ with kernel and add extra version.
-rw-r--r--Makefile2
-rw-r--r--arch/arm/Kconfig3
-rw-r--r--arch/x86/Kconfig2
-rw-r--r--litmus/Kconfig3
-rw-r--r--litmus/Makefile3
5 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e3cdec4898be..cca06d3697f4 100644
--- a/Makefile
+++ b/Makefile
@@ -883,7 +883,7 @@ export mod_sign_cmd
883 883
884 884
885ifeq ($(KBUILD_EXTMOD),) 885ifeq ($(KBUILD_EXTMOD),)
886core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ 886core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ litmus/
887 887
888vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 888vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
889 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 889 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 45df48ba0b12..9fee3674d914 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2119,3 +2119,6 @@ endif
2119source "lib/Kconfig" 2119source "lib/Kconfig"
2120 2120
2121source "arch/arm/kvm/Kconfig" 2121source "arch/arm/kvm/Kconfig"
2122
2123source "litmus/Kconfig"
2124
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 226d5696e1d1..9f305d6e1246 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2594,3 +2594,5 @@ source "crypto/Kconfig"
2594source "arch/x86/kvm/Kconfig" 2594source "arch/x86/kvm/Kconfig"
2595 2595
2596source "lib/Kconfig" 2596source "lib/Kconfig"
2597
2598source "litmus/Kconfig"
diff --git a/litmus/Kconfig b/litmus/Kconfig
new file mode 100644
index 000000000000..382b2e426437
--- /dev/null
+++ b/litmus/Kconfig
@@ -0,0 +1,3 @@
1menu "LITMUS^RT"
2
3endmenu
diff --git a/litmus/Makefile b/litmus/Makefile
new file mode 100644
index 000000000000..f0ed31faf582
--- /dev/null
+++ b/litmus/Makefile
@@ -0,0 +1,3 @@
1#
2# Makefile for LITMUS^RT
3#