diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 12:49:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 12:49:24 -0400 |
commit | 15ce2658ddbd3db20dfba3622f3d224f01837fdc (patch) | |
tree | c1a62e6d2c0b5942cbb8624e8db9be06e28e04b0 /kernel/params.c | |
parent | f3ca10dde49043fbbb055854278b26954b549b36 (diff) | |
parent | 4a3893d069b788f3570c19c12d9e986e8e15870f (diff) |
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module updates from Rusty Russell:
"Quentin opened a can of worms by adding extable entry checking to
modpost, but most architectures seem fixed now. Thanks to all
involved.
Last minute rebase because I noticed a "[PATCH]" had snuck into a
commit message somehow"
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
modpost: don't emit section mismatch warnings for compiler optimizations
modpost: expand pattern matching to support substring matches
modpost: do not try to match the SHT_NUL section.
modpost: fix extable entry size calculation.
modpost: fix inverted logic in is_extable_fault_address().
modpost: handle -ffunction-sections
modpost: Whitelist .text.fixup and .exception.text
params: handle quotes properly for values not of form foo="bar".
modpost: document the use of struct section_check.
modpost: handle relocations mismatch in __ex_table.
scripts: add check_extable.sh script.
modpost: mismatch_handler: retrieve tosym information only when needed.
modpost: factorize symbol pretty print in get_pretty_name().
modpost: add handler function pointer to sectioncheck.
modpost: add .sched.text and .kprobes.text to the TEXT_SECTIONS list.
modpost: add strict white-listing when referencing sections.
module: do not print allocation-fail warning on bogus user buffer size
kernel/module.c: fix typos in message about unused symbols
Diffstat (limited to 'kernel/params.c')
-rw-r--r-- | kernel/params.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/params.c b/kernel/params.c index 728e05b167de..a22d6a759b1a 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
@@ -173,9 +173,9 @@ static char *next_arg(char *args, char **param, char **val) | |||
173 | if (args[i-1] == '"') | 173 | if (args[i-1] == '"') |
174 | args[i-1] = '\0'; | 174 | args[i-1] = '\0'; |
175 | } | 175 | } |
176 | if (quoted && args[i-1] == '"') | ||
177 | args[i-1] = '\0'; | ||
178 | } | 176 | } |
177 | if (quoted && args[i-1] == '"') | ||
178 | args[i-1] = '\0'; | ||
179 | 179 | ||
180 | if (args[i]) { | 180 | if (args[i]) { |
181 | args[i] = '\0'; | 181 | args[i] = '\0'; |