diff --git a/kernel/brick_locks.h b/kernel/brick_locks.h index 7a64ea5b..3be57aca 100644 --- a/kernel/brick_locks.h +++ b/kernel/brick_locks.h @@ -6,69 +6,8 @@ #include "brick_say.h" -#ifdef CONFIG_DEBUG_SPINLOCK - -#include - -# define LOCK_CHECK(OP) \ - ({ \ - if (atomic_read(¤t->lock_count)) { \ - BRICK_ERR("never call " #OP "() with a spinlock held.\n"); \ - } \ - }) - -# define traced_lock(spinlock,flags) \ - do { \ - if (atomic_read(¤t->lock_count)) { \ - BRICK_ERR("please do not nest spinlocks at line %d, reorganize your code.\n", __LINE__); \ - } \ - atomic_inc(¤t->lock_count); \ - (void)flags; \ - spin_lock_irqsave(spinlock, flags); \ - } while (0) - -# define traced_unlock(spinlock,flags) \ - do { \ - spin_unlock_irqrestore(spinlock, flags); \ - atomic_dec(¤t->lock_count); \ - } while (0) - -# define traced_readlock(spinlock,flags) \ - do { \ - if (atomic_read(¤t->lock_count)) { \ - BRICK_ERR("please do not nest spinlocks at line %d, reorganize your code.\n", __LINE__); \ - } \ - atomic_inc(¤t->lock_count); \ - (void)flags; \ - read_lock(spinlock); \ - } while (0) - -# define traced_readunlock(spinlock,flags) \ - do { \ - /*spin_unlock_irqrestore(spinlock,flags);*/ \ - read_unlock(spinlock); \ - atomic_dec(¤t->lock_count); \ - } while (0) - -# define traced_writelock(spinlock,flags) \ - do { \ - if (atomic_read(¤t->lock_count)) { \ - BRICK_ERR("please do not nest spinlocks at line %d, reorganize your code.\n", __LINE__); \ - } \ - atomic_inc(¤t->lock_count); \ - (void)flags; \ - write_lock(spinlock); \ - } while (0) - -# define traced_writeunlock(spinlock,flags) \ - do { \ - /*spin_unlock_irqrestore(spinlock,flags);*/ \ - write_unlock(spinlock); \ - atomic_dec(¤t->lock_count); \ - } while (0) - -#else # define LOCK_CHECK(OP) 0 + #if 0 # define traced_lock(spinlock,flags) spin_lock_irqsave(spinlock,flags) # define traced_unlock(spinlock,flags) spin_unlock_irqrestore(spinlock,flags) @@ -84,6 +23,5 @@ # define traced_writelock(spinlock,flags) do { (void)flags; write_lock(spinlock); } while (0) # define traced_writeunlock(spinlock,flags) do { (void)flags; write_unlock(spinlock); } while (0) #endif -#endif #endif diff --git a/kernel/sy_old/mars_light.c b/kernel/sy_old/mars_light.c index db04cdd5..0824b590 100644 --- a/kernel/sy_old/mars_light.c +++ b/kernel/sy_old/mars_light.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/pre-patches/vanilla-2.6.32/0001-mars-necessary-for-in-tree-build.patch b/pre-patches/vanilla-2.6.32/0001-mars-necessary-for-in-tree-build.patch new file mode 100644 index 00000000..648ec327 --- /dev/null +++ b/pre-patches/vanilla-2.6.32/0001-mars-necessary-for-in-tree-build.patch @@ -0,0 +1,43 @@ +From 4ee63a106bd45d77babad896cac80195218921ae Mon Sep 17 00:00:00 2001 +From: Thomas Schoebel-Theuer +Date: Wed, 26 Jun 2013 14:46:41 +0200 +Subject: [PATCH] mars: necessary for in-tree build + +This patch should not go upstream (as long as the MARS source is +out-of-tree), because the kernel will no longer build without +MARS sources present in block/mars/ . + +Use this for in-tree builds of the out-of-tree MARS sourcecode, +i.e. cd block/ && git clone https://github.com/schoebel/mars +--- + block/Kconfig | 2 ++ + block/Makefile | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/block/Kconfig b/block/Kconfig +index 9be0b56..d046af5 100644 +--- a/block/Kconfig ++++ b/block/Kconfig +@@ -77,6 +77,8 @@ config BLK_DEV_INTEGRITY + T10/SCSI Data Integrity Field or the T13/ATA External Path + Protection. If in doubt, say N. + ++source block/mars/kernel/Kconfig ++ + endif # BLOCK + + config BLOCK_COMPAT +diff --git a/block/Makefile b/block/Makefile +index ba74ca6..71cdf53 100644 +--- a/block/Makefile ++++ b/block/Makefile +@@ -15,3 +15,5 @@ obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o + + obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o + obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o ++ ++obj-$(CONFIG_MARS) += mars/kernel/ +\ No newline at end of file +-- +1.8.1.4 + diff --git a/pre-patches/2.6.32-pre-patch-for-mars.patch b/pre-patches/vanilla-2.6.32/0001-mars-pre-patch-for-mars.patch similarity index 61% rename from pre-patches/2.6.32-pre-patch-for-mars.patch rename to pre-patches/vanilla-2.6.32/0001-mars-pre-patch-for-mars.patch index fccfa5ff..70bbd9da 100644 --- a/pre-patches/2.6.32-pre-patch-for-mars.patch +++ b/pre-patches/vanilla-2.6.32/0001-mars-pre-patch-for-mars.patch @@ -1,51 +1,23 @@ -From 2aac8eddf264fa96a67de5672dd4efdbec59c59c Mon Sep 17 00:00:00 2001 -From: Thomas Schoebel-Theuer -Date: Mon, 13 Feb 2012 08:55:36 +0100 -Subject: [PATCH] pre-patch for mars +From 3bbda9eb6457de0629527ced0f276f31ab820d24 Mon Sep 17 00:00:00 2001 +From: Thomas Schoebel-Theuer +Date: Wed, 26 Jun 2013 14:45:07 +0200 +Subject: [PATCH] mars: pre-patch for mars -mostly introduces missint EXPORT_SYMBOL() +Mostly introduces missing EXPORT_SYMBOL(). +Should have exactly zero impact onto the kernel. --- - block/Kconfig | 2 ++ - block/Makefile | 2 ++ - fs/aio.c | 5 +++++ - fs/namei.c | 4 ++++ - fs/open.c | 2 ++ - fs/utimes.c | 2 ++ - include/linux/major.h | 1 + - include/linux/sched.h | 3 +++ - kernel/fork.c | 1 + - lib/debug_locks.c | 1 + - mm/mmu_context.c | 3 +++ - mm/page_alloc.c | 2 ++ - mm/swap_state.c | 1 + - 13 files changed, 29 insertions(+), 0 deletions(-) + fs/aio.c | 5 +++++ + fs/namei.c | 5 +++++ + fs/open.c | 2 ++ + fs/utimes.c | 2 ++ + include/linux/major.h | 1 + + mm/mmu_context.c | 3 +++ + mm/page_alloc.c | 2 ++ + mm/swap_state.c | 1 + + 8 files changed, 21 insertions(+) -diff --git a/block/Kconfig b/block/Kconfig -index 9be0b56..80cd020 100644 ---- a/block/Kconfig -+++ b/block/Kconfig -@@ -77,6 +77,8 @@ config BLK_DEV_INTEGRITY - T10/SCSI Data Integrity Field or the T13/ATA External Path - Protection. If in doubt, say N. - -+source block/mars/kernel/Kconfig -+ - endif # BLOCK - - config BLOCK_COMPAT -diff --git a/block/Makefile b/block/Makefile -index ba74ca6..d547b2c 100644 ---- a/block/Makefile -+++ b/block/Makefile -@@ -15,3 +15,5 @@ obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o - - obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o - obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o -+ -+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 +index 02a2c93..3a0d018 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1267,6 +1267,7 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp) @@ -64,7 +36,7 @@ index 22a19ad..466a59f 100644 static void aio_advance_iovec(struct kiocb *iocb, ssize_t ret) { -@@ -1677,6 +1679,7 @@ SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr, +@@ -1674,6 +1676,7 @@ SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr, put_ioctx(ctx); return i ? i : ret; } @@ -72,7 +44,7 @@ index 22a19ad..466a59f 100644 /* lookup_kiocb * Finds a given iocb for cancellation. -@@ -1756,6 +1759,7 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb, +@@ -1753,6 +1756,7 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb, return ret; } @@ -80,16 +52,16 @@ index 22a19ad..466a59f 100644 /* io_getevents: * Attempts to read at least min_nr events and up to nr events from -@@ -1787,3 +1791,4 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, +@@ -1784,3 +1788,4 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, asmlinkage_protect(5, ret, ctx_id, min_nr, nr, events, timeout); return ret; } +EXPORT_SYMBOL(sys_io_getevents); diff --git a/fs/namei.c b/fs/namei.c -index b0afbd4..174571e 100644 +index d11f404..e5b472d 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -2956,12 +2956,16 @@ EXPORT_SYMBOL(vfs_create); +@@ -2945,12 +2945,17 @@ EXPORT_SYMBOL(vfs_create); EXPORT_SYMBOL(vfs_follow_link); EXPORT_SYMBOL(vfs_link); EXPORT_SYMBOL(vfs_mkdir); @@ -100,6 +72,7 @@ index b0afbd4..174571e 100644 EXPORT_SYMBOL(vfs_rename); +EXPORT_SYMBOL(sys_rename); EXPORT_SYMBOL(vfs_rmdir); ++EXPORT_SYMBOL(sys_rmdir); EXPORT_SYMBOL(vfs_symlink); +EXPORT_SYMBOL(sys_symlink); EXPORT_SYMBOL(vfs_unlink); @@ -155,41 +128,6 @@ index 6a8ca98..faf6692 100644 #define RTF_MAJOR 150 #define RAW_MAJOR 162 -diff --git a/include/linux/sched.h b/include/linux/sched.h -index 71849bf..570444e 100644 ---- a/include/linux/sched.h -+++ b/include/linux/sched.h -@@ -1421,6 +1421,9 @@ struct task_struct { - /* mutex deadlock detection */ - struct mutex_waiter *blocked_on; - #endif -+#ifdef CONFIG_DEBUG_SPINLOCK -+ atomic_t lock_count; -+#endif - #ifdef CONFIG_TRACE_IRQFLAGS - unsigned int irq_events; - int hardirqs_enabled; -diff --git a/kernel/fork.c b/kernel/fork.c -index 4bde56f..ff87740 100644 ---- a/kernel/fork.c -+++ b/kernel/fork.c -@@ -168,6 +168,7 @@ void __put_task_struct(struct task_struct *tsk) - if (!profile_handoff_task(tsk)) - free_task(tsk); - } -+EXPORT_SYMBOL(__put_task_struct); - - /* - * macro override instead of weak attribute alias, to workaround -diff --git a/lib/debug_locks.c b/lib/debug_locks.c -index bc3b117..35d6084 100644 ---- a/lib/debug_locks.c -+++ b/lib/debug_locks.c -@@ -45,3 +45,4 @@ int debug_locks_off(void) - } - return 0; - } -+EXPORT_SYMBOL(debug_locks_off); diff --git a/mm/mmu_context.c b/mm/mmu_context.c index ded9081..addb2e3 100644 --- a/mm/mmu_context.c @@ -216,7 +154,7 @@ index ded9081..addb2e3 100644 } +EXPORT_SYMBOL(unuse_mm); diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 3ecab7e..9774425 100644 +index 2bc2ac6..31e3a3f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -122,6 +122,7 @@ static char * const zone_names[MAX_NR_ZONES] = { @@ -227,7 +165,7 @@ index 3ecab7e..9774425 100644 static unsigned long __meminitdata nr_kernel_pages; static unsigned long __meminitdata nr_all_pages; -@@ -4645,6 +4646,7 @@ void setup_per_zone_wmarks(void) +@@ -4631,6 +4632,7 @@ void setup_per_zone_wmarks(void) /* update totalreserve_pages */ calculate_totalreserve_pages(); } @@ -248,5 +186,5 @@ index 6d1daeb..8f2038a 100644 #define INC_CACHE_INFO(x) do { swap_cache_info.x++; } while (0) -- -1.7.8.3 +1.8.1.4 diff --git a/pre-patches/vanilla-3.2/0001-mars-generic-pre-patch-for-mars.patch b/pre-patches/vanilla-3.2/0001-mars-generic-pre-patch-for-mars.patch new file mode 100644 index 00000000..3d13e8b9 --- /dev/null +++ b/pre-patches/vanilla-3.2/0001-mars-generic-pre-patch-for-mars.patch @@ -0,0 +1,124 @@ +From c508008c30cd2116823eae84ba15638cd231a16c Mon Sep 17 00:00:00 2001 +From: Thomas Schoebel-Theuer +Date: Wed, 26 Jun 2013 14:45:07 +0200 +Subject: [PATCH] mars: generic pre-patch for mars + +Mostly introduces missing EXPORT_SYMBOL(). +Should have exactly zero impact onto the kernel. + +This is the generic version which exports all sys_*() system +calls. This should not introduce any additional maintenance pain +because that interfaces has to be stable anyway due to POSIX etc. +--- + fs/open.c | 1 - + fs/utimes.c | 2 ++ + include/linux/major.h | 1 + + include/linux/syscalls.h | 4 ++++ + mm/page_alloc.c | 2 ++ + mm/swap_state.c | 1 + + 6 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/fs/open.c b/fs/open.c +index 22c41b5..0a6871a 100644 +--- a/fs/open.c ++++ b/fs/open.c +@@ -1098,7 +1098,6 @@ out_unlock: + spin_unlock(&files->file_lock); + return -EBADF; + } +-EXPORT_SYMBOL(sys_close); + + /* + * This routine simulates a hangup on the tty, to arrange that users +diff --git a/fs/utimes.c b/fs/utimes.c +index ba653f3..f021ea4 100644 +--- a/fs/utimes.c ++++ b/fs/utimes.c +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include +@@ -170,6 +171,7 @@ long do_utimes(int dfd, const char __user *filename, struct timespec *times, + out: + return error; + } ++EXPORT_SYMBOL(do_utimes); + + SYSCALL_DEFINE4(utimensat, int, dfd, const char __user *, filename, + struct timespec __user *, utimes, int, flags) +diff --git a/include/linux/major.h b/include/linux/major.h +index 6a8ca98..faf6692 100644 +--- a/include/linux/major.h ++++ b/include/linux/major.h +@@ -146,6 +146,7 @@ + #define UNIX98_PTY_SLAVE_MAJOR (UNIX98_PTY_MASTER_MAJOR+UNIX98_PTY_MAJOR_COUNT) + + #define DRBD_MAJOR 147 ++#define MARS_MAJOR 148 + #define RTF_MAJOR 150 + #define RAW_MAJOR 162 + +diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h +index 86a24b1..384877b 100644 +--- a/include/linux/syscalls.h ++++ b/include/linux/syscalls.h +@@ -72,6 +72,7 @@ struct file_handle; + #include + #include + #include ++#include + #include + #include + #include +@@ -240,12 +241,15 @@ extern struct trace_event_functions exit_syscall_print_funcs; + return (long) SYSC##name(__SC_CAST##x(__VA_ARGS__)); \ + } \ + SYSCALL_ALIAS(sys##name, SyS##name); \ ++ EXPORT_SYMBOL(sys##name); \ + static inline long SYSC##name(__SC_DECL##x(__VA_ARGS__)) + + #else /* CONFIG_HAVE_SYSCALL_WRAPPERS */ + + #define SYSCALL_DEFINE(name) asmlinkage long sys_##name + #define __SYSCALL_DEFINEx(x, name, ...) \ ++ asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__)); \ ++ EXPORT_SYMBOL(sys##name); \ + asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__)) + + #endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */ +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 2b8ba3a..2ba0c27 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -176,6 +176,7 @@ static char * const zone_names[MAX_NR_ZONES] = { + }; + + int min_free_kbytes = 1024; ++EXPORT_SYMBOL(min_free_kbytes); + + static unsigned long __meminitdata nr_kernel_pages; + static unsigned long __meminitdata nr_all_pages; +@@ -5187,6 +5188,7 @@ void setup_per_zone_wmarks(void) + /* update totalreserve_pages */ + calculate_totalreserve_pages(); + } ++EXPORT_SYMBOL(setup_per_zone_wmarks); + + /* + * The inactive anon list should be small enough that the VM never has to +diff --git a/mm/swap_state.c b/mm/swap_state.c +index 78cc4d1..36e4ee4 100644 +--- a/mm/swap_state.c ++++ b/mm/swap_state.c +@@ -43,6 +43,7 @@ struct address_space swapper_space = { + .i_mmap_nonlinear = LIST_HEAD_INIT(swapper_space.i_mmap_nonlinear), + .backing_dev_info = &swap_backing_dev_info, + }; ++EXPORT_SYMBOL(swapper_space); + + #define INC_CACHE_INFO(x) do { swap_cache_info.x++; } while (0) + +-- +1.8.1.4 + diff --git a/pre-patches/vanilla-3.2/0001-mars-necessary-for-in-tree-build.patch b/pre-patches/vanilla-3.2/0001-mars-necessary-for-in-tree-build.patch new file mode 100644 index 00000000..5cc27312 --- /dev/null +++ b/pre-patches/vanilla-3.2/0001-mars-necessary-for-in-tree-build.patch @@ -0,0 +1,42 @@ +From 534e5b60130c08ca03e4dc6516e6c6f42cb63407 Mon Sep 17 00:00:00 2001 +From: Thomas Schoebel-Theuer +Date: Wed, 26 Jun 2013 14:46:41 +0200 +Subject: [PATCH] mars: necessary for in-tree build + +This patch should not go upstream (as long as the MARS source is +out-of-tree), because the kernel will no longer build without +MARS sources present in block/mars/ . + +Use this for in-tree builds of the out-of-tree MARS sourcecode, +i.e. cd block/ && git clone https://github.com/schoebel/mars +--- + block/Kconfig | 2 ++ + block/Makefile | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/block/Kconfig b/block/Kconfig +index e97934e..ac02d66 100644 +--- a/block/Kconfig ++++ b/block/Kconfig +@@ -99,6 +99,8 @@ config BLK_DEV_THROTTLING + + See Documentation/cgroups/blkio-controller.txt for more information. + ++source block/mars/kernel/Kconfig ++ + endif # BLOCK + + config BLOCK_COMPAT +diff --git a/block/Makefile b/block/Makefile +index 514c6e4..32d37e2 100644 +--- a/block/Makefile ++++ b/block/Makefile +@@ -17,3 +17,5 @@ obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o + + obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o + obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o ++ ++obj-$(CONFIG_MARS) += mars/kernel/ +-- +1.8.1.4 + diff --git a/pre-patches/3.2-pre-patch-for-mars.patch b/pre-patches/vanilla-3.2/0001-mars-pre-patch-for-mars.patch similarity index 60% rename from pre-patches/3.2-pre-patch-for-mars.patch rename to pre-patches/vanilla-3.2/0001-mars-pre-patch-for-mars.patch index d2f20611..3789120f 100644 --- a/pre-patches/3.2-pre-patch-for-mars.patch +++ b/pre-patches/vanilla-3.2/0001-mars-pre-patch-for-mars.patch @@ -1,39 +1,25 @@ -commit ef30fa053dc9f9593b464271878e5e08ab897ef8 -Author: Thomas Schoebel-Theuer -Date: Mon Feb 13 08:55:36 2012 +0100 +From d30316ed68259450315665ac3d63c6ea7af4f1b3 Mon Sep 17 00:00:00 2001 +From: Thomas Schoebel-Theuer +Date: Wed, 26 Jun 2013 14:45:07 +0200 +Subject: [PATCH] mars: pre-patch for mars - pre-patch for mars - - mostly introduces missint EXPORT_SYMBOL() +Mostly introduces missing EXPORT_SYMBOL(). +Should have exactly zero impact onto the kernel. +--- + fs/aio.c | 5 +++++ + fs/namei.c | 5 +++++ + fs/open.c | 2 ++ + fs/utimes.c | 2 ++ + include/linux/major.h | 1 + + mm/page_alloc.c | 2 ++ + mm/swap_state.c | 1 + + 7 files changed, 18 insertions(+) -diff --git a/block/Kconfig b/block/Kconfig -index e97934e..9e9201a 100644 ---- a/block/Kconfig -+++ b/block/Kconfig -@@ -99,6 +99,8 @@ config BLK_DEV_THROTTLING - - See Documentation/cgroups/blkio-controller.txt for more information. - -+source block/mars/kernel/Kconfig -+ - endif # BLOCK - - config BLOCK_COMPAT -diff --git a/block/Makefile b/block/Makefile -index 514c6e4..97dbbd4 100644 ---- a/block/Makefile -+++ b/block/Makefile -@@ -17,3 +17,5 @@ obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o - - obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o - obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o -+ -+obj-$(CONFIG_MARS) += mars/kernel/ diff --git a/fs/aio.c b/fs/aio.c -index 3b65ee7..de4ff1f 100644 +index 78c514c..bbe4cce 100644 --- a/fs/aio.c +++ b/fs/aio.c -@@ -1346,6 +1346,7 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp) +@@ -1339,6 +1339,7 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp) out: return ret; } @@ -41,7 +27,7 @@ index 3b65ee7..de4ff1f 100644 /* sys_io_destroy: * Destroy the aio_context specified. May cancel any outstanding -@@ -1363,6 +1364,7 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx) +@@ -1356,6 +1357,7 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx) pr_debug("EINVAL: io_destroy: invalid context id\n"); return -EINVAL; } @@ -49,7 +35,7 @@ index 3b65ee7..de4ff1f 100644 static void aio_advance_iovec(struct kiocb *iocb, ssize_t ret) { -@@ -1751,6 +1753,7 @@ long do_io_submit(aio_context_t ctx_id, long nr, +@@ -1746,6 +1748,7 @@ long do_io_submit(aio_context_t ctx_id, long nr, put_ioctx(ctx); return i ? i : ret; } @@ -57,7 +43,7 @@ index 3b65ee7..de4ff1f 100644 /* sys_io_submit: * Queue the nr iocbs pointed to by iocbpp for processing. Returns -@@ -1848,6 +1851,7 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb, +@@ -1843,6 +1846,7 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb, return ret; } @@ -65,16 +51,16 @@ index 3b65ee7..de4ff1f 100644 /* io_getevents: * Attempts to read at least min_nr events and up to nr events from -@@ -1880,3 +1884,4 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, +@@ -1875,3 +1879,4 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, asmlinkage_protect(5, ret, ctx_id, min_nr, nr, events, timeout); return ret; } +EXPORT_SYMBOL(sys_io_getevents); diff --git a/fs/namei.c b/fs/namei.c -index 9680cef..ff29db5 100644 +index 5008f01..90d2b81 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -3399,12 +3399,16 @@ EXPORT_SYMBOL(vfs_create); +@@ -3397,12 +3397,17 @@ EXPORT_SYMBOL(vfs_create); EXPORT_SYMBOL(vfs_follow_link); EXPORT_SYMBOL(vfs_link); EXPORT_SYMBOL(vfs_mkdir); @@ -85,6 +71,7 @@ index 9680cef..ff29db5 100644 EXPORT_SYMBOL(vfs_rename); +EXPORT_SYMBOL(sys_rename); EXPORT_SYMBOL(vfs_rmdir); ++EXPORT_SYMBOL(sys_rmdir); EXPORT_SYMBOL(vfs_symlink); +EXPORT_SYMBOL(sys_symlink); EXPORT_SYMBOL(vfs_unlink); @@ -92,7 +79,7 @@ index 9680cef..ff29db5 100644 EXPORT_SYMBOL(dentry_unhash); EXPORT_SYMBOL(generic_readlink); diff --git a/fs/open.c b/fs/open.c -index e2b5d51..4e22bad 100644 +index 22c41b5..e5e14c0 100644 --- a/fs/open.c +++ b/fs/open.c @@ -545,6 +545,7 @@ out_release: @@ -140,43 +127,8 @@ index 6a8ca98..faf6692 100644 #define RTF_MAJOR 150 #define RAW_MAJOR 162 -diff --git a/include/linux/sched.h b/include/linux/sched.h -index 1e86bb4..4b6ab71 100644 ---- a/include/linux/sched.h -+++ b/include/linux/sched.h -@@ -1433,6 +1433,9 @@ struct task_struct { - /* mutex deadlock detection */ - struct mutex_waiter *blocked_on; - #endif -+#ifdef CONFIG_DEBUG_SPINLOCK -+ atomic_t lock_count; -+#endif - #ifdef CONFIG_TRACE_IRQFLAGS - unsigned int irq_events; - unsigned long hardirq_enable_ip; -diff --git a/lib/debug_locks.c b/lib/debug_locks.c -index b1c1773..1d312c0 100644 ---- a/lib/debug_locks.c -+++ b/lib/debug_locks.c -@@ -44,3 +44,4 @@ int debug_locks_off(void) - } - return 0; - } -+EXPORT_SYMBOL(debug_locks_off); -diff --git a/mm/mmu_context.c b/mm/mmu_context.c -index cf332bc..19cd576 100644 ---- a/mm/mmu_context.c -+++ b/mm/mmu_context.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 6e51bf0..671c322 100644 +index 2b8ba3a..2ba0c27 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -176,6 +176,7 @@ static char * const zone_names[MAX_NR_ZONES] = { @@ -187,7 +139,7 @@ index 6e51bf0..671c322 100644 static unsigned long __meminitdata nr_kernel_pages; static unsigned long __meminitdata nr_all_pages; -@@ -5230,6 +5231,7 @@ void setup_per_zone_wmarks(void) +@@ -5187,6 +5188,7 @@ void setup_per_zone_wmarks(void) /* update totalreserve_pages */ calculate_totalreserve_pages(); } @@ -196,7 +148,7 @@ index 6e51bf0..671c322 100644 /* * The inactive anon list should be small enough that the VM never has to diff --git a/mm/swap_state.c b/mm/swap_state.c -index 7704d9c..16a989b 100644 +index 78cc4d1..36e4ee4 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -43,6 +43,7 @@ struct address_space swapper_space = { @@ -207,3 +159,6 @@ index 7704d9c..16a989b 100644 #define INC_CACHE_INFO(x) do { swap_cache_info.x++; } while (0) +-- +1.8.1.4 +