all: move kernel source into separate directory

This commit is contained in:
Thomas Schoebel-Theuer 2013-04-08 16:58:18 +02:00
parent 3e22a3faca
commit c58417d271
64 changed files with 12 additions and 12 deletions

View File

@ -65,8 +65,8 @@ mars-objs += \
endif
.PHONY FORCE: block/mars/buildtag.h
block/mars/buildtag.h:
.PHONY FORCE: block/mars/kernel/buildtag.h
block/mars/kernel/buildtag.h:
set -e; exec > $@;\
cd block/mars;\
/bin/echo -e "/* Automatically generated -- DO NOT EDIT! */";\

View File

@ -28,7 +28,7 @@ index 9be0b56..80cd020 100644
T10/SCSI Data Integrity Field or the T13/ATA External Path
Protection. If in doubt, say N.
+source block/mars/Kconfig
+source block/mars/kernel/Kconfig
+
endif # BLOCK
@ -42,7 +42,7 @@ index ba74ca6..d547b2c 100644
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
+
+obj-$(CONFIG_MARS) += mars/
+obj-$(CONFIG_MARS) += mars/kernel/
\ No newline at end of file
diff --git a/fs/aio.c b/fs/aio.c
index 22a19ad..466a59f 100644

View File

@ -5,7 +5,7 @@ diff -urpN source.rhel6//block/Kconfig source/block/Kconfig
See Documentation/cgroups/blkio-controller.txt for more information.
+source block/mars/Kconfig
+source block/mars/kernel/Kconfig
+
endif # BLOCK
@ -18,7 +18,7 @@ diff -urpN source.rhel6//block/Makefile source/block/Makefile
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
+
+obj-$(CONFIG_MARS) += mars/
+obj-$(CONFIG_MARS) += mars/kernel/
+
diff -urpN source.rhel6//fs/aio.c source/fs/aio.c
--- source.rhel6//fs/aio.c 2012-11-21 12:24:35.721563886 +0100

View File

@ -14,7 +14,7 @@ index e97934e..9e9201a 100644
See Documentation/cgroups/blkio-controller.txt for more information.
+source block/mars/Kconfig
+source block/mars/kernel/Kconfig
+
endif # BLOCK
@ -28,7 +28,7 @@ index 514c6e4..97dbbd4 100644
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
+
+obj-$(CONFIG_MARS) += mars/
+obj-$(CONFIG_MARS) += mars/kernel/
diff --git a/fs/aio.c b/fs/aio.c
index 3b65ee7..de4ff1f 100644
--- a/fs/aio.c

View File

@ -5,7 +5,7 @@ diff -uri linux-2.6.32.14.orig/block/Kconfig linux-2.6.32.14.new.00/block/Kconfi
T10/SCSI Data Integrity Field or the T13/ATA External Path
Protection. If in doubt, say N.
+source block/mars/Kconfig
+source block/mars/kernel/Kconfig
+
config BLK_CGROUP
bool
@ -18,7 +18,7 @@ diff -uri linux-2.6.32.14.orig/block/Makefile linux-2.6.32.14.new.00/block/Makef
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
+
+obj-$(CONFIG_MARS) += mars/
+obj-$(CONFIG_MARS) += mars/kernel/
\ No newline at end of file
--- linux-2.6.32.14.orig/fs/aio.c 2010-05-31 14:09:40.000000000 +0200
+++ linux-2.6.32.14.new.00/fs/aio.c 2011-01-26 16:02:44.000000000 +0100

View File

@ -5,7 +5,7 @@ diff -uri linux-2.6.32.14.orig/block/Kconfig linux-2.6.32.14.new.00/block/Kconfi
T10/SCSI Data Integrity Field or the T13/ATA External Path
Protection. If in doubt, say N.
+source block/mars/Kconfig
+source block/mars/kernel/Kconfig
+
endif # BLOCK
@ -18,7 +18,7 @@ diff -uri linux-2.6.32.14.orig/block/Makefile linux-2.6.32.14.new.00/block/Makef
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
+
+obj-$(CONFIG_MARS) += mars/
+obj-$(CONFIG_MARS) += mars/kernel/
\ No newline at end of file
--- linux-2.6.32.14.orig/fs/aio.c 2010-05-31 14:09:40.000000000 +0200
+++ linux-2.6.32.14.new.00/fs/aio.c 2011-01-26 16:02:44.000000000 +0100