aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/coccinelle/iterators/use_after_iter.cocci147
-rw-r--r--scripts/coccinelle/misc/irqf_oneshot.cocci65
-rwxr-xr-xscripts/config62
-rwxr-xr-xscripts/get_maintainer.pl3
-rwxr-xr-x[-rw-r--r--]scripts/gfp-translate0
-rw-r--r--scripts/kconfig/.gitignore1
-rw-r--r--scripts/kconfig/Makefile41
-rw-r--r--scripts/kconfig/confdata.c61
-rw-r--r--scripts/kconfig/lxdialog/check-lxdialog.sh8
-rw-r--r--scripts/kconfig/lxdialog/textbox.c3
-rw-r--r--scripts/kconfig/mconf.c6
-rw-r--r--scripts/kconfig/nconf.c10
-rw-r--r--scripts/kconfig/nconf.gui.c8
-rw-r--r--scripts/link-vmlinux.sh4
-rw-r--r--scripts/mksysmap2
-rw-r--r--scripts/mod/file2alias.c5
-rw-r--r--scripts/mod/modpost.c11
-rw-r--r--scripts/package/builddeb7
-rwxr-xr-xscripts/tags.sh6
19 files changed, 388 insertions, 62 deletions
diff --git a/scripts/coccinelle/iterators/use_after_iter.cocci b/scripts/coccinelle/iterators/use_after_iter.cocci
new file mode 100644
index 000000000000..06284c57a951
--- /dev/null
+++ b/scripts/coccinelle/iterators/use_after_iter.cocci
@@ -0,0 +1,147 @@
1/// If list_for_each_entry, etc complete a traversal of the list, the iterator
2/// variable ends up pointing to an address at an offset from the list head,
3/// and not a meaningful structure. Thus this value should not be used after
4/// the end of the iterator.
5//#False positives arise when there is a goto in the iterator and the
6//#reported reference is at the label of this goto. Some flag tests
7//#may also cause a report to be a false positive.
8///
9// Confidence: Moderate
10// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6. GPLv2.
11// Copyright: (C) 2012 Gilles Muller, INRIA/LIP6. GPLv2.
12// URL: http://coccinelle.lip6.fr/
13// Comments:
14// Options: -no_includes -include_headers
15
16virtual context
17virtual org
18virtual report
19
20@r exists@
21identifier c,member;
22expression E,x;
23iterator name list_for_each_entry;
24iterator name list_for_each_entry_reverse;
25iterator name list_for_each_entry_continue;
26iterator name list_for_each_entry_continue_reverse;
27iterator name list_for_each_entry_from;
28iterator name list_for_each_entry_safe;
29iterator name list_for_each_entry_safe_continue;
30iterator name list_for_each_entry_safe_from;
31iterator name list_for_each_entry_safe_reverse;
32iterator name hlist_for_each_entry;
33iterator name hlist_for_each_entry_continue;
34iterator name hlist_for_each_entry_from;
35iterator name hlist_for_each_entry_safe;
36statement S;
37position p1,p2;
38@@
39
40(
41list_for_each_entry@p1(c,...,member) { ... when != break;
42 when forall
43 when strict
44}
45|
46list_for_each_entry_reverse@p1(c,...,member) { ... when != break;
47 when forall
48 when strict
49}
50|
51list_for_each_entry_continue@p1(c,...,member) { ... when != break;
52 when forall
53 when strict
54}
55|
56list_for_each_entry_continue_reverse@p1(c,...,member) { ... when != break;
57 when forall
58 when strict
59}
60|
61list_for_each_entry_from@p1(c,...,member) { ... when != break;
62 when forall
63 when strict
64}
65|
66list_for_each_entry_safe@p1(c,...,member) { ... when != break;
67 when forall
68 when strict
69}
70|
71list_for_each_entry_safe_continue@p1(c,...,member) { ... when != break;
72 when forall
73 when strict
74}
75|
76list_for_each_entry_safe_from@p1(c,...,member) { ... when != break;
77 when forall
78 when strict
79}
80|
81list_for_each_entry_safe_reverse@p1(c,...,member) { ... when != break;
82 when forall
83 when strict
84}
85)
86...
87(
88list_for_each_entry(c,...) S
89|
90list_for_each_entry_reverse(c,...) S
91|
92list_for_each_entry_continue(c,...) S
93|
94list_for_each_entry_continue_reverse(c,...) S
95|
96list_for_each_entry_from(c,...) S
97|
98list_for_each_entry_safe(c,...) S
99|
100list_for_each_entry_safe(x,c,...) S
101|
102list_for_each_entry_safe_continue(c,...) S
103|
104list_for_each_entry_safe_continue(x,c,...) S
105|
106list_for_each_entry_safe_from(c,...) S
107|
108list_for_each_entry_safe_from(x,c,...) S
109|
110list_for_each_entry_safe_reverse(c,...) S
111|
112list_for_each_entry_safe_reverse(x,c,...) S
113|
114hlist_for_each_entry(c,...) S
115|
116hlist_for_each_entry_continue(c,...) S
117|
118hlist_for_each_entry_from(c,...) S
119|
120hlist_for_each_entry_safe(c,...) S
121|
122list_remove_head(x,c,...)
123|
124sizeof(<+...c...+>)
125|
126&c->member
127|
128c = E
129|
130*c@p2
131)
132
133@script:python depends on org@
134p1 << r.p1;
135p2 << r.p2;
136@@
137
138cocci.print_main("invalid iterator index reference",p2)
139cocci.print_secs("iterator",p1)
140
141@script:python depends on report@
142p1 << r.p1;
143p2 << r.p2;
144@@
145
146msg = "ERROR: invalid reference to the index variable of the iterator on line %s" % (p1[0].line)
147coccilib.report.print_report(p2[0], msg)
diff --git a/scripts/coccinelle/misc/irqf_oneshot.cocci b/scripts/coccinelle/misc/irqf_oneshot.cocci
new file mode 100644
index 000000000000..6cfde94be0ef
--- /dev/null
+++ b/scripts/coccinelle/misc/irqf_oneshot.cocci
@@ -0,0 +1,65 @@
1/// Make sure threaded IRQs without a primary handler are always request with
2/// IRQF_ONESHOT
3///
4//
5// Confidence: Good
6// Comments:
7// Options: --no-includes
8
9virtual patch
10virtual context
11virtual org
12virtual report
13
14@r1@
15expression irq;
16expression thread_fn;
17expression flags;
18position p;
19@@
20request_threaded_irq@p(irq, NULL, thread_fn,
21(
22flags | IRQF_ONESHOT
23|
24IRQF_ONESHOT
25)
26, ...)
27
28@depends on patch@
29expression irq;
30expression thread_fn;
31expression flags;
32position p != r1.p;
33@@
34request_threaded_irq@p(irq, NULL, thread_fn,
35(
36-0
37+IRQF_ONESHOT
38|
39-flags
40+flags | IRQF_ONESHOT
41)
42, ...)
43
44@depends on context@
45position p != r1.p;
46@@
47*request_threaded_irq@p(...)
48
49@match depends on report || org@
50expression irq;
51position p != r1.p;
52@@
53request_threaded_irq@p(irq, NULL, ...)
54
55@script:python depends on org@
56p << match.p;
57@@
58msg = "ERROR: Threaded IRQ with no primary handler requested without IRQF_ONESHOT"
59coccilib.org.print_todo(p[0],msg)
60
61@script:python depends on report@
62p << match.p;
63@@
64msg = "ERROR: Threaded IRQ with no primary handler requested without IRQF_ONESHOT"
65coccilib.report.print_report(p[0],msg)
diff --git a/scripts/config b/scripts/config
index ed6653ef9702..ee355394f4ef 100755
--- a/scripts/config
+++ b/scripts/config
@@ -1,6 +1,9 @@
1#!/bin/bash 1#!/bin/bash
2# Manipulate options in a .config file from the command line 2# Manipulate options in a .config file from the command line
3 3
4# If no prefix forced, use the default CONFIG_
5CONFIG_="${CONFIG_-CONFIG_}"
6
4usage() { 7usage() {
5 cat >&2 <<EOL 8 cat >&2 <<EOL
6Manipulate options in a .config file from the command line. 9Manipulate options in a .config file from the command line.
@@ -14,6 +17,7 @@ commands:
14 Set option to "string" 17 Set option to "string"
15 --set-val option value 18 --set-val option value
16 Set option to value 19 Set option to value
20 --undefine|-u option Undefine option
17 --state|-s option Print state of option (n,y,m,undef) 21 --state|-s option Print state of option (n,y,m,undef)
18 22
19 --enable-after|-E beforeopt option 23 --enable-after|-E beforeopt option
@@ -26,10 +30,17 @@ commands:
26 commands can be repeated multiple times 30 commands can be repeated multiple times
27 31
28options: 32options:
29 --file .config file to change (default .config) 33 --file config-file .config file to change (default .config)
34 --keep-case|-k Keep next symbols' case (dont' upper-case it)
30 35
31config doesn't check the validity of the .config file. This is done at next 36config doesn't check the validity of the .config file. This is done at next
32 make time. 37make time.
38
39By default, config will upper-case the given symbol. Use --keep-case to keep
40the case of all following symbols unchanged.
41
42config uses 'CONFIG_' as the default symbol prefix. Set the environment
43variable CONFIG_ to the prefix to use. Eg.: CONFIG_="FOO_" config ...
33EOL 44EOL
34 exit 1 45 exit 1
35} 46}
@@ -40,11 +51,13 @@ checkarg() {
40 usage 51 usage
41 fi 52 fi
42 case "$ARG" in 53 case "$ARG" in
43 CONFIG_*) 54 ${CONFIG_}*)
44 ARG="${ARG/CONFIG_/}" 55 ARG="${ARG/${CONFIG_}/}"
45 ;; 56 ;;
46 esac 57 esac
47 ARG="`echo $ARG | tr a-z A-Z`" 58 if [ "$MUNGE_CASE" = "yes" ] ; then
59 ARG="`echo $ARG | tr a-z A-Z`"
60 fi
48} 61}
49 62
50set_var() { 63set_var() {
@@ -61,6 +74,12 @@ set_var() {
61 fi 74 fi
62} 75}
63 76
77undef_var() {
78 local name=$1
79
80 sed -ri "/^($name=|# $name is not set)/d" "$FN"
81}
82
64if [ "$1" = "--file" ]; then 83if [ "$1" = "--file" ]; then
65 FN="$2" 84 FN="$2"
66 if [ "$FN" = "" ] ; then 85 if [ "$FN" = "" ] ; then
@@ -75,10 +94,16 @@ if [ "$1" = "" ] ; then
75 usage 94 usage
76fi 95fi
77 96
97MUNGE_CASE=yes
78while [ "$1" != "" ] ; do 98while [ "$1" != "" ] ; do
79 CMD="$1" 99 CMD="$1"
80 shift 100 shift
81 case "$CMD" in 101 case "$CMD" in
102 --keep-case|-k)
103 MUNGE_CASE=no
104 shift
105 continue
106 ;;
82 --refresh) 107 --refresh)
83 ;; 108 ;;
84 --*-after) 109 --*-after)
@@ -95,55 +120,58 @@ while [ "$1" != "" ] ; do
95 esac 120 esac
96 case "$CMD" in 121 case "$CMD" in
97 --enable|-e) 122 --enable|-e)
98 set_var "CONFIG_$ARG" "CONFIG_$ARG=y" 123 set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=y"
99 ;; 124 ;;
100 125
101 --disable|-d) 126 --disable|-d)
102 set_var "CONFIG_$ARG" "# CONFIG_$ARG is not set" 127 set_var "${CONFIG_}$ARG" "# ${CONFIG_}$ARG is not set"
103 ;; 128 ;;
104 129
105 --module|-m) 130 --module|-m)
106 set_var "CONFIG_$ARG" "CONFIG_$ARG=m" 131 set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=m"
107 ;; 132 ;;
108 133
109 --set-str) 134 --set-str)
110 # sed swallows one level of escaping, so we need double-escaping 135 # sed swallows one level of escaping, so we need double-escaping
111 set_var "CONFIG_$ARG" "CONFIG_$ARG=\"${1//\"/\\\\\"}\"" 136 set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=\"${1//\"/\\\\\"}\""
112 shift 137 shift
113 ;; 138 ;;
114 139
115 --set-val) 140 --set-val)
116 set_var "CONFIG_$ARG" "CONFIG_$ARG=$1" 141 set_var "${CONFIG_}$ARG" "${CONFIG_}$ARG=$1"
117 shift 142 shift
118 ;; 143 ;;
144 --undefine|-u)
145 undef_var "${CONFIG_}$ARG"
146 ;;
119 147
120 --state|-s) 148 --state|-s)
121 if grep -q "# CONFIG_$ARG is not set" $FN ; then 149 if grep -q "# ${CONFIG_}$ARG is not set" $FN ; then
122 echo n 150 echo n
123 else 151 else
124 V="$(grep "^CONFIG_$ARG=" $FN)" 152 V="$(grep "^${CONFIG_}$ARG=" $FN)"
125 if [ $? != 0 ] ; then 153 if [ $? != 0 ] ; then
126 echo undef 154 echo undef
127 else 155 else
128 V="${V/#CONFIG_$ARG=/}" 156 V="${V/#${CONFIG_}$ARG=/}"
129 V="${V/#\"/}" 157 V="${V/#\"/}"
130 V="${V/%\"/}" 158 V="${V/%\"/}"
131 V="${V/\\\"/\"}" 159 V="${V//\\\"/\"}"
132 echo "${V}" 160 echo "${V}"
133 fi 161 fi
134 fi 162 fi
135 ;; 163 ;;
136 164
137 --enable-after|-E) 165 --enable-after|-E)
138 set_var "CONFIG_$B" "CONFIG_$B=y" "CONFIG_$A" 166 set_var "${CONFIG_}$B" "${CONFIG_}$B=y" "${CONFIG_}$A"
139 ;; 167 ;;
140 168
141 --disable-after|-D) 169 --disable-after|-D)
142 set_var "CONFIG_$B" "# CONFIG_$B is not set" "CONFIG_$A" 170 set_var "${CONFIG_}$B" "# ${CONFIG_}$B is not set" "${CONFIG_}$A"
143 ;; 171 ;;
144 172
145 --module-after|-M) 173 --module-after|-M)
146 set_var "CONFIG_$B" "CONFIG_$B=m" "CONFIG_$A" 174 set_var "${CONFIG_}$B" "${CONFIG_}$B=m" "${CONFIG_}$A"
147 ;; 175 ;;
148 176
149 # undocumented because it ignores --file (fixme) 177 # undocumented because it ignores --file (fixme)
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 0948c6b5a321..8b673dd4627f 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -83,6 +83,8 @@ push(@signature_tags, "Signed-off-by:");
83push(@signature_tags, "Reviewed-by:"); 83push(@signature_tags, "Reviewed-by:");
84push(@signature_tags, "Acked-by:"); 84push(@signature_tags, "Acked-by:");
85 85
86my $signature_pattern = "\(" . join("|", @signature_tags) . "\)";
87
86# rfc822 email address - preloaded methods go here. 88# rfc822 email address - preloaded methods go here.
87my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; 89my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])";
88my $rfc822_char = '[\\000-\\377]'; 90my $rfc822_char = '[\\000-\\377]';
@@ -473,7 +475,6 @@ my @subsystem = ();
473my @status = (); 475my @status = ();
474my %deduplicate_name_hash = (); 476my %deduplicate_name_hash = ();
475my %deduplicate_address_hash = (); 477my %deduplicate_address_hash = ();
476my $signature_pattern;
477 478
478my @maintainers = get_maintainers(); 479my @maintainers = get_maintainers();
479 480
diff --git a/scripts/gfp-translate b/scripts/gfp-translate
index c9230e158a8f..c9230e158a8f 100644..100755
--- a/scripts/gfp-translate
+++ b/scripts/gfp-translate
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index ee120d441565..be603c4fef62 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -7,7 +7,6 @@ config*
7*.tab.h 7*.tab.h
8zconf.hash.c 8zconf.hash.c
9*.moc 9*.moc
10lkc_defs.h
11gconf.glade.h 10gconf.glade.h
12*.pot 11*.pot
13*.mo 12*.mo
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 79662658fb91..77d53999ffb9 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -114,7 +114,7 @@ help:
114 @echo ' alldefconfig - New config with all symbols set to default' 114 @echo ' alldefconfig - New config with all symbols set to default'
115 @echo ' randconfig - New config with random answer to all options' 115 @echo ' randconfig - New config with random answer to all options'
116 @echo ' listnewconfig - List new options' 116 @echo ' listnewconfig - List new options'
117 @echo ' oldnoconfig - Same as silentoldconfig but set new symbols to n (unset)' 117 @echo ' oldnoconfig - Same as silentoldconfig but sets new symbols to their default value'
118 118
119# lxdialog stuff 119# lxdialog stuff
120check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh 120check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
@@ -234,12 +234,12 @@ $(obj)/.tmp_qtcheck:
234 if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \ 234 if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
235 done; \ 235 done; \
236 if [ -z "$$dir" ]; then \ 236 if [ -z "$$dir" ]; then \
237 echo "*"; \ 237 echo >&2 "*"; \
238 echo "* Unable to find any QT installation. Please make sure that"; \ 238 echo >&2 "* Unable to find any QT installation. Please make sure that"; \
239 echo "* the QT4 or QT3 development package is correctly installed and"; \ 239 echo >&2 "* the QT4 or QT3 development package is correctly installed and"; \
240 echo "* either qmake can be found or install pkg-config or set"; \ 240 echo >&2 "* either qmake can be found or install pkg-config or set"; \
241 echo "* the QTDIR environment variable to the correct location."; \ 241 echo >&2 "* the QTDIR environment variable to the correct location."; \
242 echo "*"; \ 242 echo >&2 "*"; \
243 false; \ 243 false; \
244 fi; \ 244 fi; \
245 libpath=$$dir/lib; lib=qt; osdir=""; \ 245 libpath=$$dir/lib; lib=qt; osdir=""; \
@@ -260,8 +260,8 @@ $(obj)/.tmp_qtcheck:
260 else \ 260 else \
261 cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \ 261 cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
262 libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \ 262 libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
263 binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \ 263 moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
264 moc="$$binpath/bin/moc"; \ 264 [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \
265 fi; \ 265 fi; \
266 echo "KC_QT_CFLAGS=$$cflags" > $@; \ 266 echo "KC_QT_CFLAGS=$$cflags" > $@; \
267 echo "KC_QT_LIBS=$$libs" >> $@; \ 267 echo "KC_QT_LIBS=$$libs" >> $@; \
@@ -279,17 +279,17 @@ $(obj)/.tmp_gtkcheck:
279 if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \ 279 if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \
280 touch $@; \ 280 touch $@; \
281 else \ 281 else \
282 echo "*"; \ 282 echo >&2 "*"; \
283 echo "* GTK+ is present but version >= 2.0.0 is required."; \ 283 echo >&2 "* GTK+ is present but version >= 2.0.0 is required."; \
284 echo "*"; \ 284 echo >&2 "*"; \
285 false; \ 285 false; \
286 fi \ 286 fi \
287 else \ 287 else \
288 echo "*"; \ 288 echo >&2 "*"; \
289 echo "* Unable to find the GTK+ installation. Please make sure that"; \ 289 echo >&2 "* Unable to find the GTK+ installation. Please make sure that"; \
290 echo "* the GTK+ 2.0 development package is correctly installed..."; \ 290 echo >&2 "* the GTK+ 2.0 development package is correctly installed..."; \
291 echo "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; \ 291 echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; \
292 echo "*"; \ 292 echo >&2 "*"; \
293 false; \ 293 false; \
294 fi 294 fi
295endif 295endif
@@ -298,8 +298,11 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c
298 298
299$(obj)/qconf.o: $(obj)/qconf.moc 299$(obj)/qconf.o: $(obj)/qconf.moc
300 300
301$(obj)/%.moc: $(src)/%.h 301quiet_cmd_moc = MOC $@
302 $(KC_QT_MOC) -i $< -o $@ 302 cmd_moc = $(KC_QT_MOC) -i $< -o $@
303
304$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
305 $(call cmd,moc)
303 306
304# Extract gconf menu items for I18N support 307# Extract gconf menu items for I18N support
305$(obj)/gconf.glade.h: $(obj)/gconf.glade 308$(obj)/gconf.glade.h: $(obj)/gconf.glade
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 52577f052bc1..13ddf1126c2a 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -182,10 +182,66 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
182 return 0; 182 return 0;
183} 183}
184 184
185#define LINE_GROWTH 16
186static int add_byte(int c, char **lineptr, size_t slen, size_t *n)
187{
188 char *nline;
189 size_t new_size = slen + 1;
190 if (new_size > *n) {
191 new_size += LINE_GROWTH - 1;
192 new_size *= 2;
193 nline = realloc(*lineptr, new_size);
194 if (!nline)
195 return -1;
196
197 *lineptr = nline;
198 *n = new_size;
199 }
200
201 (*lineptr)[slen] = c;
202
203 return 0;
204}
205
206static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream)
207{
208 char *line = *lineptr;
209 size_t slen = 0;
210
211 for (;;) {
212 int c = getc(stream);
213
214 switch (c) {
215 case '\n':
216 if (add_byte(c, &line, slen, n) < 0)
217 goto e_out;
218 slen++;
219 /* fall through */
220 case EOF:
221 if (add_byte('\0', &line, slen, n) < 0)
222 goto e_out;
223 *lineptr = line;
224 if (slen == 0)
225 return -1;
226 return slen;
227 default:
228 if (add_byte(c, &line, slen, n) < 0)
229 goto e_out;
230 slen++;
231 }
232 }
233
234e_out:
235 line[slen-1] = '\0';
236 *lineptr = line;
237 return -1;
238}
239
185int conf_read_simple(const char *name, int def) 240int conf_read_simple(const char *name, int def)
186{ 241{
187 FILE *in = NULL; 242 FILE *in = NULL;
188 char line[1024]; 243 char *line = NULL;
244 size_t line_asize = 0;
189 char *p, *p2; 245 char *p, *p2;
190 struct symbol *sym; 246 struct symbol *sym;
191 int i, def_flags; 247 int i, def_flags;
@@ -247,7 +303,7 @@ load:
247 } 303 }
248 } 304 }
249 305
250 while (fgets(line, sizeof(line), in)) { 306 while (compat_getline(&line, &line_asize, in) != -1) {
251 conf_lineno++; 307 conf_lineno++;
252 sym = NULL; 308 sym = NULL;
253 if (line[0] == '#') { 309 if (line[0] == '#') {
@@ -335,6 +391,7 @@ setsym:
335 cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri); 391 cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
336 } 392 }
337 } 393 }
394 free(line);
338 fclose(in); 395 fclose(in);
339 396
340 if (modules_sym) 397 if (modules_sym)
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 82cc3a85e7f8..e3b12c010417 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,7 +4,7 @@
4# What library to link 4# What library to link
5ldflags() 5ldflags()
6{ 6{
7 for ext in so a dylib ; do 7 for ext in so a dll.a dylib ; do
8 for lib in ncursesw ncurses curses ; do 8 for lib in ncursesw ncurses curses ; do
9 $cc -print-file-name=lib${lib}.${ext} | grep -q / 9 $cc -print-file-name=lib${lib}.${ext} | grep -q /
10 if [ $? -eq 0 ]; then 10 if [ $? -eq 0 ]; then
@@ -19,12 +19,12 @@ ldflags()
19# Where is ncurses.h? 19# Where is ncurses.h?
20ccflags() 20ccflags()
21{ 21{
22 if [ -f /usr/include/ncurses/ncurses.h ]; then 22 if [ -f /usr/include/ncursesw/curses.h ]; then
23 echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
24 elif [ -f /usr/include/ncurses/ncurses.h ]; then
23 echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"' 25 echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
24 elif [ -f /usr/include/ncurses/curses.h ]; then 26 elif [ -f /usr/include/ncurses/curses.h ]; then
25 echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"' 27 echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
26 elif [ -f /usr/include/ncursesw/curses.h ]; then
27 echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
28 elif [ -f /usr/include/ncurses.h ]; then 28 elif [ -f /usr/include/ncurses.h ]; then
29 echo '-DCURSES_LOC="<ncurses.h>"' 29 echo '-DCURSES_LOC="<ncurses.h>"'
30 else 30 else
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index 154c2dd245b7..4e5de60a0c0d 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -129,6 +129,7 @@ do_resize:
129 case 'e': 129 case 'e':
130 case 'X': 130 case 'X':
131 case 'x': 131 case 'x':
132 case 'q':
132 delwin(box); 133 delwin(box);
133 delwin(dialog); 134 delwin(dialog);
134 return 0; 135 return 0;
@@ -190,6 +191,7 @@ do_resize:
190 break; 191 break;
191 case 'B': /* Previous page */ 192 case 'B': /* Previous page */
192 case 'b': 193 case 'b':
194 case 'u':
193 case KEY_PPAGE: 195 case KEY_PPAGE:
194 if (begin_reached) 196 if (begin_reached)
195 break; 197 break;
@@ -214,6 +216,7 @@ do_resize:
214 break; 216 break;
215 case KEY_NPAGE: /* Next page */ 217 case KEY_NPAGE: /* Next page */
216 case ' ': 218 case ' ':
219 case 'd':
217 if (end_reached) 220 if (end_reached)
218 break; 221 break;
219 222
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index f606738d421d..f584a281bb4c 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -105,10 +105,10 @@ static const char mconf_readme[] = N_(
105"Text Box (Help Window)\n" 105"Text Box (Help Window)\n"
106"--------\n" 106"--------\n"
107"o Use the cursor keys to scroll up/down/left/right. The VI editor\n" 107"o Use the cursor keys to scroll up/down/left/right. The VI editor\n"
108" keys h,j,k,l function here as do <SPACE BAR> and <B> for those\n" 108" keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for \n"
109" who are familiar with less and lynx.\n" 109" those who are familiar with less and lynx.\n"
110"\n" 110"\n"
111"o Press <E>, <X>, <Enter> or <Esc><Esc> to exit.\n" 111"o Press <E>, <X>, <q>, <Enter> or <Esc><Esc> to exit.\n"
112"\n" 112"\n"
113"\n" 113"\n"
114"Alternate Configuration Files\n" 114"Alternate Configuration Files\n"
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 8c0eb65978c9..1704a8562a5d 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -83,10 +83,10 @@ static const char nconf_readme[] = N_(
83"Text Box (Help Window)\n" 83"Text Box (Help Window)\n"
84"--------\n" 84"--------\n"
85"o Use the cursor keys to scroll up/down/left/right. The VI editor\n" 85"o Use the cursor keys to scroll up/down/left/right. The VI editor\n"
86" keys h,j,k,l function here as do <SPACE BAR> for those\n" 86" keys h,j,k,l function here as do <u>, <d> and <SPACE BAR> for\n"
87" who are familiar with less and lynx.\n" 87" those who are familiar with less and lynx.\n"
88"\n" 88"\n"
89"o Press <Enter>, <F1>, <F5>, <F7> or <Esc> to exit.\n" 89"o Press <Enter>, <F1>, <F5>, <F9>, <q> or <Esc> to exit.\n"
90"\n" 90"\n"
91"\n" 91"\n"
92"Alternate Configuration Files\n" 92"Alternate Configuration Files\n"
@@ -1503,7 +1503,11 @@ int main(int ac, char **av)
1503 } 1503 }
1504 1504
1505 notimeout(stdscr, FALSE); 1505 notimeout(stdscr, FALSE);
1506#if NCURSES_REENTRANT
1507 set_escdelay(1);
1508#else
1506 ESCDELAY = 1; 1509 ESCDELAY = 1;
1510#endif
1507 1511
1508 /* set btns menu */ 1512 /* set btns menu */
1509 curses_menu = new_menu(curses_menu_items); 1513 curses_menu = new_menu(curses_menu_items);
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index 3b18dd839668..379003c7a2b4 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -604,9 +604,11 @@ void show_scroll_win(WINDOW *main_window,
604 switch (res) { 604 switch (res) {
605 case KEY_NPAGE: 605 case KEY_NPAGE:
606 case ' ': 606 case ' ':
607 case 'd':
607 start_y += text_lines-2; 608 start_y += text_lines-2;
608 break; 609 break;
609 case KEY_PPAGE: 610 case KEY_PPAGE:
611 case 'u':
610 start_y -= text_lines+2; 612 start_y -= text_lines+2;
611 break; 613 break;
612 case KEY_HOME: 614 case KEY_HOME:
@@ -632,10 +634,10 @@ void show_scroll_win(WINDOW *main_window,
632 start_x++; 634 start_x++;
633 break; 635 break;
634 } 636 }
635 if (res == 10 || res == 27 || res == 'q' 637 if (res == 10 || res == 27 || res == 'q' ||
636 || res == KEY_F(F_BACK) || res == KEY_F(F_EXIT)) { 638 res == KEY_F(F_HELP) || res == KEY_F(F_BACK) ||
639 res == KEY_F(F_EXIT))
637 break; 640 break;
638 }
639 if (start_y < 0) 641 if (start_y < 0)
640 start_y = 0; 642 start_y = 0;
641 if (start_y >= total_lines-text_lines) 643 if (start_y >= total_lines-text_lines)
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index cd9c6c6bb4c9..4629038c9e5a 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -210,8 +210,8 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
210 mksysmap ${kallsyms_vmlinux} .tmp_System.map 210 mksysmap ${kallsyms_vmlinux} .tmp_System.map
211 211
212 if ! cmp -s System.map .tmp_System.map; then 212 if ! cmp -s System.map .tmp_System.map; then
213 echo Inconsistent kallsyms data 213 echo >&2 Inconsistent kallsyms data
214 echo echo Try "make KALLSYMS_EXTRA_PASS=1" as a workaround 214 echo >&2 echo Try "make KALLSYMS_EXTRA_PASS=1" as a workaround
215 cleanup 215 cleanup
216 exit 1 216 exit 1
217 fi 217 fi
diff --git a/scripts/mksysmap b/scripts/mksysmap
index 6e133a0bae7a..c1b6191ef879 100644
--- a/scripts/mksysmap
+++ b/scripts/mksysmap
@@ -16,7 +16,7 @@
16# The second row specify the type of the symbol: 16# The second row specify the type of the symbol:
17# A = Absolute 17# A = Absolute
18# B = Uninitialised data (.bss) 18# B = Uninitialised data (.bss)
19# C = Comon symbol 19# C = Common symbol
20# D = Initialised data 20# D = Initialised data
21# G = Initialised data for small objects 21# G = Initialised data for small objects
22# I = Indirect reference to another symbol 22# I = Indirect reference to another symbol
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 5759751a1f61..7ed6864ef65b 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -156,7 +156,7 @@ static void device_id_check(const char *modname, const char *device_id,
156} 156}
157 157
158/* USB is special because the bcdDevice can be matched against a numeric range */ 158/* USB is special because the bcdDevice can be matched against a numeric range */
159/* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */ 159/* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
160static void do_usb_entry(struct usb_device_id *id, 160static void do_usb_entry(struct usb_device_id *id,
161 unsigned int bcdDevice_initial, int bcdDevice_initial_digits, 161 unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
162 unsigned char range_lo, unsigned char range_hi, 162 unsigned char range_lo, unsigned char range_hi,
@@ -210,6 +210,9 @@ static void do_usb_entry(struct usb_device_id *id,
210 ADD(alias, "ip", 210 ADD(alias, "ip",
211 id->match_flags&USB_DEVICE_ID_MATCH_INT_PROTOCOL, 211 id->match_flags&USB_DEVICE_ID_MATCH_INT_PROTOCOL,
212 id->bInterfaceProtocol); 212 id->bInterfaceProtocol);
213 ADD(alias, "in",
214 id->match_flags&USB_DEVICE_ID_MATCH_INT_NUMBER,
215 id->bInterfaceNumber);
213 216
214 add_wildcard(alias); 217 add_wildcard(alias);
215 buf_printf(&mod->dev_table_buf, 218 buf_printf(&mod->dev_table_buf,
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 0f84bb38eb0d..68e9f5ed0a6f 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -865,6 +865,11 @@ static void check_section(const char *modname, struct elf_info *elf,
865#define ALL_EXIT_TEXT_SECTIONS \ 865#define ALL_EXIT_TEXT_SECTIONS \
866 ".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$" 866 ".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$"
867 867
868#define ALL_PCI_INIT_SECTIONS \
869 ".pci_fixup_early$", ".pci_fixup_header$", ".pci_fixup_final$", \
870 ".pci_fixup_enable$", ".pci_fixup_resume$", \
871 ".pci_fixup_resume_early$", ".pci_fixup_suspend$"
872
868#define ALL_XXXINIT_SECTIONS DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, \ 873#define ALL_XXXINIT_SECTIONS DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, \
869 MEM_INIT_SECTIONS 874 MEM_INIT_SECTIONS
870#define ALL_XXXEXIT_SECTIONS DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, \ 875#define ALL_XXXEXIT_SECTIONS DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, \
@@ -1027,6 +1032,12 @@ const struct sectioncheck sectioncheck[] = {
1027 .mismatch = ANY_EXIT_TO_ANY_INIT, 1032 .mismatch = ANY_EXIT_TO_ANY_INIT,
1028 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, 1033 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
1029}, 1034},
1035{
1036 .fromsec = { ALL_PCI_INIT_SECTIONS, NULL },
1037 .tosec = { INIT_SECTIONS, NULL },
1038 .mismatch = ANY_INIT_TO_ANY_EXIT,
1039 .symbol_white_list = { NULL },
1040},
1030/* Do not export init/exit functions or data */ 1041/* Do not export init/exit functions or data */
1031{ 1042{
1032 .fromsec = { "__ksymtab*", NULL }, 1043 .fromsec = { "__ksymtab*", NULL },
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index c95fdda58414..acb86507828a 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -92,7 +92,7 @@ rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
92mkdir -m 755 -p "$tmpdir/DEBIAN" 92mkdir -m 755 -p "$tmpdir/DEBIAN"
93mkdir -p "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename" 93mkdir -p "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
94mkdir -m 755 -p "$fwdir/DEBIAN" 94mkdir -m 755 -p "$fwdir/DEBIAN"
95mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename" 95mkdir -p "$fwdir/lib/firmware/$version/" "$fwdir/usr/share/doc/$fwpackagename"
96mkdir -m 755 -p "$libc_headers_dir/DEBIAN" 96mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
97mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename" 97mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"
98mkdir -m 755 -p "$kernel_headers_dir/DEBIAN" 98mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
@@ -243,7 +243,7 @@ EOF
243fi 243fi
244 244
245# Build header package 245# Build header package
246(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles") 246(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
247(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles") 247(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
248(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles") 248(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
249destdir=$kernel_headers_dir/usr/src/linux-headers-$version 249destdir=$kernel_headers_dir/usr/src/linux-headers-$version
@@ -267,7 +267,8 @@ EOF
267 267
268# Do we have firmware? Move it out of the way and build it into a package. 268# Do we have firmware? Move it out of the way and build it into a package.
269if [ -e "$tmpdir/lib/firmware" ]; then 269if [ -e "$tmpdir/lib/firmware" ]; then
270 mv "$tmpdir/lib/firmware" "$fwdir/lib/" 270 mv "$tmpdir/lib/firmware"/* "$fwdir/lib/firmware/$version/"
271 rmdir "$tmpdir/lib/firmware"
271 272
272 cat <<EOF >> debian/control 273 cat <<EOF >> debian/control
273 274
diff --git a/scripts/tags.sh b/scripts/tags.sh
index cf7b12fee573..cff8faad73d1 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -153,7 +153,8 @@ exuberant()
153 --regex-c++='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/' \ 153 --regex-c++='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/' \
154 --regex-c++='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \ 154 --regex-c++='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \
155 --regex-c++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \ 155 --regex-c++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
156 --regex-c++='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' 156 --regex-c++='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
157 --regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'
157 158
158 all_kconfigs | xargs $1 -a \ 159 all_kconfigs | xargs $1 -a \
159 --langdef=kconfig --language-force=kconfig \ 160 --langdef=kconfig --language-force=kconfig \
@@ -195,7 +196,8 @@ emacs()
195 --regex='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/' \ 196 --regex='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/' \
196 --regex='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \ 197 --regex='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/' \
197 --regex='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \ 198 --regex='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
198 --regex='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' 199 --regex='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
200 --regex='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'
199 201
200 all_kconfigs | xargs $1 -a \ 202 all_kconfigs | xargs $1 -a \
201 --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/' 203 --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-05 12:54:06 -0400