]> git.pld-linux.org Git - packages/kernel.git/blob - kernel-small_fixes.patch
- fix refcount EXPORT_SYMBOL markings from upstream git
[packages/kernel.git] / kernel-small_fixes.patch
1 --- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100
2 +++ linux-2.6.33/scripts/mod/modpost.c  2010-03-07 14:26:47.242168558 +0100
3 @@ -15,7 +15,8 @@
4  #include <stdio.h>
5  #include <ctype.h>
6  #include "modpost.h"
7 -#include "../../include/generated/autoconf.h"
8 +// PLD architectures don't use CONFIG_SYMBOL_PREFIX
9 +//#include "../../include/generated/autoconf.h"
10  #include "../../include/linux/license.h"
11  
12  /* Some toolchains use a `_' prefix for all user symbols. */
13
14 --- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~       2011-07-22 04:17:23.000000000 +0200
15 +++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh        2011-08-25 21:26:04.799150642 +0200
16 @@ -9,6 +9,12 @@
17                         $cc -print-file-name=lib${lib}.${ext} | grep -q /
18                         if [ $? -eq 0 ]; then
19                                 echo "-l${lib}"
20 +                               for libt in tinfow tinfo ; do
21 +                                       $cc -print-file-name=lib${libt}.${ext} | grep -q /
22 +                                       if [ $? -eq 0 ]; then
23 +                                               echo "-l${libt}"
24 +                                       fi
25 +                               done
26                                 exit
27                         fi
28                 done
29 From 5d12f71723762a39435d054d02bbf5fb87c5cd14 Mon Sep 17 00:00:00 2001
30 From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
31 Date: Mon, 6 Feb 2017 14:45:15 +0100
32 Subject: [PATCH] mac80211: Print text for disassociation reason
33 MIME-Version: 1.0
34 Content-Type: text/plain; charset=UTF-8
35 Content-Transfer-Encoding: 8bit
36
37 When disassociation happens only numeric reason is printed
38 in ieee80211_rx_mgmt_disassoc(). Add text variant, too.
39
40 Signed-off-by: Arkadiusz Miƛkiewicz <arekm@maven.pl>
41 ---
42  net/mac80211/mlme.c | 5 +++--
43  1 file changed, 3 insertions(+), 2 deletions(-)
44
45 diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
46 index 098ce9b179ee..fcf8d0aa66ec 100644
47 --- a/net/mac80211/mlme.c
48 +++ b/net/mac80211/mlme.c
49 @@ -2801,8 +2801,9 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
50  
51         reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
52  
53 -       sdata_info(sdata, "disassociated from %pM (Reason: %u)\n",
54 -                  mgmt->sa, reason_code);
55 +       sdata_info(sdata, "disassociated from %pM (Reason: %u=%s)\n",
56 +                  mgmt->sa, reason_code,
57 +                  ieee80211_get_reason_code_string(reason_code));
58  
59         ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
60  
61 -- 
62 2.11.0
63
64 From d557d1b58b3546bab2c5bc2d624c5709840e6b10 Mon Sep 17 00:00:00 2001
65 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
66 Date: Thu, 4 May 2017 15:51:03 -0700
67 Subject: refcount: change EXPORT_SYMBOL markings
68
69 Now that kref is using the refcount apis, the _GPL markings are getting
70 exported to places that it previously wasn't.  Now kref.h is GPLv2
71 licensed, so any non-GPL code using it better be talking to some
72 lawyers, but changing api markings isn't considered "nice", so let's fix
73 this up.
74
75 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
76 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
77 ---
78  lib/refcount.c | 22 +++++++++++-----------
79  1 file changed, 11 insertions(+), 11 deletions(-)
80
81 diff --git a/lib/refcount.c b/lib/refcount.c
82 index f42124c..9f90678 100644
83 --- a/lib/refcount.c
84 +++ b/lib/refcount.c
85 @@ -76,7 +76,7 @@ bool refcount_add_not_zero(unsigned int i, refcount_t *r)
86  
87         return true;
88  }
89 -EXPORT_SYMBOL_GPL(refcount_add_not_zero);
90 +EXPORT_SYMBOL(refcount_add_not_zero);
91  
92  /**
93   * refcount_add - add a value to a refcount
94 @@ -98,7 +98,7 @@ void refcount_add(unsigned int i, refcount_t *r)
95  {
96         WARN_ONCE(!refcount_add_not_zero(i, r), "refcount_t: addition on 0; use-after-free.\n");
97  }
98 -EXPORT_SYMBOL_GPL(refcount_add);
99 +EXPORT_SYMBOL(refcount_add);
100  
101  /**
102   * refcount_inc_not_zero - increment a refcount unless it is 0
103 @@ -131,7 +131,7 @@ bool refcount_inc_not_zero(refcount_t *r)
104  
105         return true;
106  }
107 -EXPORT_SYMBOL_GPL(refcount_inc_not_zero);
108 +EXPORT_SYMBOL(refcount_inc_not_zero);
109  
110  /**
111   * refcount_inc - increment a refcount
112 @@ -149,7 +149,7 @@ void refcount_inc(refcount_t *r)
113  {
114         WARN_ONCE(!refcount_inc_not_zero(r), "refcount_t: increment on 0; use-after-free.\n");
115  }
116 -EXPORT_SYMBOL_GPL(refcount_inc);
117 +EXPORT_SYMBOL(refcount_inc);
118  
119  /**
120   * refcount_sub_and_test - subtract from a refcount and test if it is 0
121 @@ -189,7 +189,7 @@ bool refcount_sub_and_test(unsigned int i, refcount_t *r)
122  
123         return !new;
124  }
125 -EXPORT_SYMBOL_GPL(refcount_sub_and_test);
126 +EXPORT_SYMBOL(refcount_sub_and_test);
127  
128  /**
129   * refcount_dec_and_test - decrement a refcount and test if it is 0
130 @@ -208,7 +208,7 @@ bool refcount_dec_and_test(refcount_t *r)
131  {
132         return refcount_sub_and_test(1, r);
133  }
134 -EXPORT_SYMBOL_GPL(refcount_dec_and_test);
135 +EXPORT_SYMBOL(refcount_dec_and_test);
136  
137  /**
138   * refcount_dec - decrement a refcount
139 @@ -224,7 +224,7 @@ void refcount_dec(refcount_t *r)
140  {
141         WARN_ONCE(refcount_dec_and_test(r), "refcount_t: decrement hit 0; leaking memory.\n");
142  }
143 -EXPORT_SYMBOL_GPL(refcount_dec);
144 +EXPORT_SYMBOL(refcount_dec);
145  
146  /**
147   * refcount_dec_if_one - decrement a refcount if it is 1
148 @@ -248,7 +248,7 @@ bool refcount_dec_if_one(refcount_t *r)
149  
150         return atomic_try_cmpxchg_release(&r->refs, &val, 0);
151  }
152 -EXPORT_SYMBOL_GPL(refcount_dec_if_one);
153 +EXPORT_SYMBOL(refcount_dec_if_one);
154  
155  /**
156   * refcount_dec_not_one - decrement a refcount if it is not 1
157 @@ -282,7 +282,7 @@ bool refcount_dec_not_one(refcount_t *r)
158  
159         return true;
160  }
161 -EXPORT_SYMBOL_GPL(refcount_dec_not_one);
162 +EXPORT_SYMBOL(refcount_dec_not_one);
163  
164  /**
165   * refcount_dec_and_mutex_lock - return holding mutex if able to decrement
166 @@ -313,7 +313,7 @@ bool refcount_dec_and_mutex_lock(refcount_t *r, struct mutex *lock)
167  
168         return true;
169  }
170 -EXPORT_SYMBOL_GPL(refcount_dec_and_mutex_lock);
171 +EXPORT_SYMBOL(refcount_dec_and_mutex_lock);
172  
173  /**
174   * refcount_dec_and_lock - return holding spinlock if able to decrement
175 @@ -344,5 +344,5 @@ bool refcount_dec_and_lock(refcount_t *r, spinlock_t *lock)
176  
177         return true;
178  }
179 -EXPORT_SYMBOL_GPL(refcount_dec_and_lock);
180 +EXPORT_SYMBOL(refcount_dec_and_lock);
181  
182 -- 
183 cgit v1.1
184
This page took 0.037214 seconds and 3 git commands to generate.