diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.modpost | 4 | ||||
-rwxr-xr-x | scripts/checkpatch.pl | 6 | ||||
-rw-r--r-- | scripts/dtc/libfdt/libfdt.h | 2 | ||||
-rw-r--r-- | scripts/dtc/livetree.c | 2 | ||||
-rw-r--r-- | scripts/gen_initramfs_list.sh | 2 | ||||
-rwxr-xr-x | scripts/kernel-doc | 2 | ||||
-rw-r--r-- | scripts/package/buildtar | 2 | ||||
-rw-r--r-- | scripts/rt-tester/rt-tester.py | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 7d22056582c1..56dfafc73c1a 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost | |||
@@ -35,14 +35,14 @@ | |||
35 | # KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined | 35 | # KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined |
36 | # symbols in the final module linking stage | 36 | # symbols in the final module linking stage |
37 | # KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules. | 37 | # KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules. |
38 | # This is solely usefull to speed up test compiles | 38 | # This is solely useful to speed up test compiles |
39 | PHONY := _modpost | 39 | PHONY := _modpost |
40 | _modpost: __modpost | 40 | _modpost: __modpost |
41 | 41 | ||
42 | include include/config/auto.conf | 42 | include include/config/auto.conf |
43 | include scripts/Kbuild.include | 43 | include scripts/Kbuild.include |
44 | 44 | ||
45 | # When building external modules load the Kbuild file to retreive EXTRA_SYMBOLS info | 45 | # When building external modules load the Kbuild file to retrieve EXTRA_SYMBOLS info |
46 | ifneq ($(KBUILD_EXTMOD),) | 46 | ifneq ($(KBUILD_EXTMOD),) |
47 | 47 | ||
48 | # set src + obj - they may be used when building the .mod.c file | 48 | # set src + obj - they may be used when building the .mod.c file |
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 8f9e394298cd..d8670810db65 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
@@ -1946,13 +1946,13 @@ sub process { | |||
1946 | # printk should use KERN_* levels. Note that follow on printk's on the | 1946 | # printk should use KERN_* levels. Note that follow on printk's on the |
1947 | # same line do not need a level, so we use the current block context | 1947 | # same line do not need a level, so we use the current block context |
1948 | # to try and find and validate the current printk. In summary the current | 1948 | # to try and find and validate the current printk. In summary the current |
1949 | # printk includes all preceeding printk's which have no newline on the end. | 1949 | # printk includes all preceding printk's which have no newline on the end. |
1950 | # we assume the first bad printk is the one to report. | 1950 | # we assume the first bad printk is the one to report. |
1951 | if ($line =~ /\bprintk\((?!KERN_)\s*"/) { | 1951 | if ($line =~ /\bprintk\((?!KERN_)\s*"/) { |
1952 | my $ok = 0; | 1952 | my $ok = 0; |
1953 | for (my $ln = $linenr - 1; $ln >= $first_line; $ln--) { | 1953 | for (my $ln = $linenr - 1; $ln >= $first_line; $ln--) { |
1954 | #print "CHECK<$lines[$ln - 1]\n"; | 1954 | #print "CHECK<$lines[$ln - 1]\n"; |
1955 | # we have a preceeding printk if it ends | 1955 | # we have a preceding printk if it ends |
1956 | # with "\n" ignore it, else it is to blame | 1956 | # with "\n" ignore it, else it is to blame |
1957 | if ($lines[$ln - 1] =~ m{\bprintk\(}) { | 1957 | if ($lines[$ln - 1] =~ m{\bprintk\(}) { |
1958 | if ($rawlines[$ln - 1] !~ m{\\n"}) { | 1958 | if ($rawlines[$ln - 1] !~ m{\\n"}) { |
@@ -2044,7 +2044,7 @@ sub process { | |||
2044 | for (my $n = 0; $n < $#elements; $n += 2) { | 2044 | for (my $n = 0; $n < $#elements; $n += 2) { |
2045 | $off += length($elements[$n]); | 2045 | $off += length($elements[$n]); |
2046 | 2046 | ||
2047 | # Pick up the preceeding and succeeding characters. | 2047 | # Pick up the preceding and succeeding characters. |
2048 | my $ca = substr($opline, 0, $off); | 2048 | my $ca = substr($opline, 0, $off); |
2049 | my $cc = ''; | 2049 | my $cc = ''; |
2050 | if (length($opline) >= ($off + length($elements[$n + 1]))) { | 2050 | if (length($opline) >= ($off + length($elements[$n + 1]))) { |
diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h index ce80e4fb41b2..ff6246f000ce 100644 --- a/scripts/dtc/libfdt/libfdt.h +++ b/scripts/dtc/libfdt/libfdt.h | |||
@@ -61,7 +61,7 @@ | |||
61 | #define FDT_ERR_NOTFOUND 1 | 61 | #define FDT_ERR_NOTFOUND 1 |
62 | /* FDT_ERR_NOTFOUND: The requested node or property does not exist */ | 62 | /* FDT_ERR_NOTFOUND: The requested node or property does not exist */ |
63 | #define FDT_ERR_EXISTS 2 | 63 | #define FDT_ERR_EXISTS 2 |
64 | /* FDT_ERR_EXISTS: Attemped to create a node or property which | 64 | /* FDT_ERR_EXISTS: Attempted to create a node or property which |
65 | * already exists */ | 65 | * already exists */ |
66 | #define FDT_ERR_NOSPACE 3 | 66 | #define FDT_ERR_NOSPACE 3 |
67 | /* FDT_ERR_NOSPACE: Operation needed to expand the device | 67 | /* FDT_ERR_NOSPACE: Operation needed to expand the device |
diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c index c9209d5c999e..26d0e1e60c0c 100644 --- a/scripts/dtc/livetree.c +++ b/scripts/dtc/livetree.c | |||
@@ -155,7 +155,7 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node) | |||
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||
158 | /* if no collision occured, add child to the old node. */ | 158 | /* if no collision occurred, add child to the old node. */ |
159 | if (new_child) | 159 | if (new_child) |
160 | add_child(old_node, new_child); | 160 | add_child(old_node, new_child); |
161 | } | 161 | } |
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh index 55caecdad995..e12b1a7525cf 100644 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh | |||
@@ -284,7 +284,7 @@ while [ $# -gt 0 ]; do | |||
284 | done | 284 | done |
285 | 285 | ||
286 | # If output_file is set we will generate cpio archive and compress it | 286 | # If output_file is set we will generate cpio archive and compress it |
287 | # we are carefull to delete tmp files | 287 | # we are careful to delete tmp files |
288 | if [ ! -z ${output_file} ]; then | 288 | if [ ! -z ${output_file} ]; then |
289 | if [ -z ${cpio_file} ]; then | 289 | if [ -z ${cpio_file} ]; then |
290 | cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)" | 290 | cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)" |
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 9f85012acf0d..d793001929cf 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
@@ -1705,7 +1705,7 @@ sub push_parameter($$$) { | |||
1705 | 1705 | ||
1706 | $param = xml_escape($param); | 1706 | $param = xml_escape($param); |
1707 | 1707 | ||
1708 | # strip spaces from $param so that it is one continous string | 1708 | # strip spaces from $param so that it is one continuous string |
1709 | # on @parameterlist; | 1709 | # on @parameterlist; |
1710 | # this fixes a problem where check_sections() cannot find | 1710 | # this fixes a problem where check_sections() cannot find |
1711 | # a parameter like "addr[6 + 2]" because it actually appears | 1711 | # a parameter like "addr[6 + 2]" because it actually appears |
diff --git a/scripts/package/buildtar b/scripts/package/buildtar index 83c9c04102f2..8a7b15598ea9 100644 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar | |||
@@ -92,7 +92,7 @@ case "${ARCH}" in | |||
92 | echo "" >&2 | 92 | echo "" >&2 |
93 | echo '** ** ** WARNING ** ** **' >&2 | 93 | echo '** ** ** WARNING ** ** **' >&2 |
94 | echo "" >&2 | 94 | echo "" >&2 |
95 | echo "Your architecture did not define any architecture-dependant files" >&2 | 95 | echo "Your architecture did not define any architecture-dependent files" >&2 |
96 | echo "to be placed into the tarball. Please add those to ${0} ..." >&2 | 96 | echo "to be placed into the tarball. Please add those to ${0} ..." >&2 |
97 | echo "" >&2 | 97 | echo "" >&2 |
98 | sleep 5 | 98 | sleep 5 |
diff --git a/scripts/rt-tester/rt-tester.py b/scripts/rt-tester/rt-tester.py index 8c81d76959ee..34186cac1d2f 100644 --- a/scripts/rt-tester/rt-tester.py +++ b/scripts/rt-tester/rt-tester.py | |||
@@ -180,7 +180,7 @@ while 1: | |||
180 | for s in stat: | 180 | for s in stat: |
181 | s = s.strip() | 181 | s = s.strip() |
182 | if s.startswith(testop[0]): | 182 | if s.startswith(testop[0]): |
183 | # Seperate status value | 183 | # Separate status value |
184 | val = s[2:].strip() | 184 | val = s[2:].strip() |
185 | query = analyse(val, testop, dat) | 185 | query = analyse(val, testop, dat) |
186 | break | 186 | break |