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>2017-05-26 17:12:19 -0400
commit226447ffbc294ab3cf8b8d67d46c43ac49967f66 (patch)
treedb5734c2daa9de197a011b511fe11196213eb9a0
parentdb3fd4527ed32be44cbd8ffa6dd6a301c89d0d6d (diff)
Add LITMUS^RT directory
Hookup litmus/ with kernel and add extra version.
-rw-r--r--Makefile1
-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, 0 deletions
diff --git a/Makefile b/Makefile
index b78a45bcf9b1..87f67ccca0f1 100644
--- a/Makefile
+++ b/Makefile
@@ -911,6 +911,7 @@ export mod_sign_cmd
911 911
912ifeq ($(KBUILD_EXTMOD),) 912ifeq ($(KBUILD_EXTMOD),)
913core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ 913core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
914core-y += litmus/
914 915
915vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 916vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
916 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 917 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b5d529fdffab..6d0974122093 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2209,3 +2209,6 @@ endif
2209source "lib/Kconfig" 2209source "lib/Kconfig"
2210 2210
2211source "arch/arm/kvm/Kconfig" 2211source "arch/arm/kvm/Kconfig"
2212
2213source "litmus/Kconfig"
2214
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bada636d1065..762bf038ab03 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2774,3 +2774,5 @@ source "crypto/Kconfig"
2774source "arch/x86/kvm/Kconfig" 2774source "arch/x86/kvm/Kconfig"
2775 2775
2776source "lib/Kconfig" 2776source "lib/Kconfig"
2777
2778source "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#