- fix refcount EXPORT_SYMBOL markings from upstream git

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 319191ce2821f2eacb3c4fdd4b50d92f33d2f795..079d2f43294277977305e8f63c0bdcdfc879cec9 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -61,3 +61,124 @@ index 098ce9b179ee..fcf8d0aa66ec 100644
 -- 
 2.11.0
 
+From d557d1b58b3546bab2c5bc2d624c5709840e6b10 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 4 May 2017 15:51:03 -0700
+Subject: refcount: change EXPORT_SYMBOL markings
+
+Now that kref is using the refcount apis, the _GPL markings are getting
+exported to places that it previously wasn't.  Now kref.h is GPLv2
+licensed, so any non-GPL code using it better be talking to some
+lawyers, but changing api markings isn't considered "nice", so let's fix
+this up.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ lib/refcount.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lib/refcount.c b/lib/refcount.c
+index f42124c..9f90678 100644
+--- a/lib/refcount.c
++++ b/lib/refcount.c
+@@ -76,7 +76,7 @@ bool refcount_add_not_zero(unsigned int i, refcount_t *r)
+ 
+       return true;
+ }
+-EXPORT_SYMBOL_GPL(refcount_add_not_zero);
++EXPORT_SYMBOL(refcount_add_not_zero);
+ 
+ /**
+  * refcount_add - add a value to a refcount
+@@ -98,7 +98,7 @@ void refcount_add(unsigned int i, refcount_t *r)
+ {
+       WARN_ONCE(!refcount_add_not_zero(i, r), "refcount_t: addition on 0; use-after-free.\n");
+ }
+-EXPORT_SYMBOL_GPL(refcount_add);
++EXPORT_SYMBOL(refcount_add);
+ 
+ /**
+  * refcount_inc_not_zero - increment a refcount unless it is 0
+@@ -131,7 +131,7 @@ bool refcount_inc_not_zero(refcount_t *r)
+ 
+       return true;
+ }
+-EXPORT_SYMBOL_GPL(refcount_inc_not_zero);
++EXPORT_SYMBOL(refcount_inc_not_zero);
+ 
+ /**
+  * refcount_inc - increment a refcount
+@@ -149,7 +149,7 @@ void refcount_inc(refcount_t *r)
+ {
+       WARN_ONCE(!refcount_inc_not_zero(r), "refcount_t: increment on 0; use-after-free.\n");
+ }
+-EXPORT_SYMBOL_GPL(refcount_inc);
++EXPORT_SYMBOL(refcount_inc);
+ 
+ /**
+  * refcount_sub_and_test - subtract from a refcount and test if it is 0
+@@ -189,7 +189,7 @@ bool refcount_sub_and_test(unsigned int i, refcount_t *r)
+ 
+       return !new;
+ }
+-EXPORT_SYMBOL_GPL(refcount_sub_and_test);
++EXPORT_SYMBOL(refcount_sub_and_test);
+ 
+ /**
+  * refcount_dec_and_test - decrement a refcount and test if it is 0
+@@ -208,7 +208,7 @@ bool refcount_dec_and_test(refcount_t *r)
+ {
+       return refcount_sub_and_test(1, r);
+ }
+-EXPORT_SYMBOL_GPL(refcount_dec_and_test);
++EXPORT_SYMBOL(refcount_dec_and_test);
+ 
+ /**
+  * refcount_dec - decrement a refcount
+@@ -224,7 +224,7 @@ void refcount_dec(refcount_t *r)
+ {
+       WARN_ONCE(refcount_dec_and_test(r), "refcount_t: decrement hit 0; leaking memory.\n");
+ }
+-EXPORT_SYMBOL_GPL(refcount_dec);
++EXPORT_SYMBOL(refcount_dec);
+ 
+ /**
+  * refcount_dec_if_one - decrement a refcount if it is 1
+@@ -248,7 +248,7 @@ bool refcount_dec_if_one(refcount_t *r)
+ 
+       return atomic_try_cmpxchg_release(&r->refs, &val, 0);
+ }
+-EXPORT_SYMBOL_GPL(refcount_dec_if_one);
++EXPORT_SYMBOL(refcount_dec_if_one);
+ 
+ /**
+  * refcount_dec_not_one - decrement a refcount if it is not 1
+@@ -282,7 +282,7 @@ bool refcount_dec_not_one(refcount_t *r)
+ 
+       return true;
+ }
+-EXPORT_SYMBOL_GPL(refcount_dec_not_one);
++EXPORT_SYMBOL(refcount_dec_not_one);
+ 
+ /**
+  * refcount_dec_and_mutex_lock - return holding mutex if able to decrement
+@@ -313,7 +313,7 @@ bool refcount_dec_and_mutex_lock(refcount_t *r, struct mutex *lock)
+ 
+       return true;
+ }
+-EXPORT_SYMBOL_GPL(refcount_dec_and_mutex_lock);
++EXPORT_SYMBOL(refcount_dec_and_mutex_lock);
+ 
+ /**
+  * refcount_dec_and_lock - return holding spinlock if able to decrement
+@@ -344,5 +344,5 @@ bool refcount_dec_and_lock(refcount_t *r, spinlock_t *lock)
+ 
+       return true;
+ }
+-EXPORT_SYMBOL_GPL(refcount_dec_and_lock);
++EXPORT_SYMBOL(refcount_dec_and_lock);
+ 
+-- 
+cgit v1.1
+