zygo: turn on lock debugging, drop GPL from mutex_lock_nested export

(cherry picked from commit eb39bbf3da5e286bfb9e443dc9a3c44c5be2ef2a)

Conflicts:
	.config

zygo: drop GPL from mutex_lock_nested export and fixup GPL link failure
(cherry picked from commit 2c63d2149a7cac186068f3530b9a52ee8ea47c0f)

diff --git a/.config b/.config
index 67d4ecf2b762225cae7bf91459edef72060226c5..26fdd307774d08821aed0b938a462035cb8450ff 100644 (file)
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.18.7 Kernel Configuration
+# Linux/x86_64 3.18.8 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y

diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index dadbf88c22c48cea044aac4e34fda9deec78636a..28c54a9e16077531899ac6385a4789897ee38cad 100644 (file)
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -617,7 +617,7 @@ mutex_lock_nested(struct mutex *lock, unsigned int subclass)
                            subclass, NULL, _RET_IP_, NULL, 0);
 }
 
-EXPORT_SYMBOL_GPL(mutex_lock_nested);
+EXPORT_SYMBOL(mutex_lock_nested);
 
 void __sched
 _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest)