diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 00:29:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 00:29:20 -0400 |
commit | c1fdb2d3389c5a1e7c559a37a4967c1d2580e75c (patch) | |
tree | e4ed8dd46b9f6fbb6c715e66630e7bdaf71c86ab /scripts/mod/sumversion.c | |
parent | 1700ff823b27b6572cf4c3cec66d279baa1a5d30 (diff) | |
parent | 7fa0e6db3cedc9b70d68a4170f1352e2b1aa0f90 (diff) |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild misc updates from Michal Marek:
"This is the non-critical part of kbuild for v3.16-rc1:
- make deb-pkg can do s390x and arm64
- new patterns in scripts/tags.sh
- scripts/tags.sh skips userspace tools' sources (which sometimes
have copies of kernel structures) and symlinks
- improvements to the objdiff tool
- two new coccinelle patches
- other minor fixes"
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scripts: objdiff: support directories for the augument of record command
scripts: objdiff: fix a comment
scripts: objdiff: change the extension of disassembly from .o to .dis
scripts: objdiff: improve path flexibility for record command
scripts: objdiff: remove unnecessary code
scripts: objdiff: direct error messages to stderr
scripts: objdiff: get the path to .tmp_objdiff more simply
deb-pkg: Add automatic support for s390x architecture
coccicheck: Add unneeded return variable test
kbuild: Fix a typo in documentation
kbuild: trivial - use tabs for code indent where possible
kbuild: trivial - remove trailing empty lines
coccinelle: Check for missing NULL terminators in of_device_id tables
scripts/tags.sh: ignore symlink'ed source files
scripts/tags.sh: add regular expression replacement pattern for memcg
builddeb: add arm64 in the supported architectures
builddeb: use $OBJCOPY variable instead of objcopy
scripts/tags.sh: ignore code of user space tools
scripts/tags.sh: add pattern for DEFINE_HASHTABLE
.gitignore: ignore Module.symvers in all directories
Diffstat (limited to 'scripts/mod/sumversion.c')
-rw-r--r-- | scripts/mod/sumversion.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index deb2994b04c4..944418da9fe3 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c | |||
@@ -214,7 +214,7 @@ static void md4_final_ascii(struct md4_ctx *mctx, char *out, unsigned int len) | |||
214 | mctx->block[14] = mctx->byte_count << 3; | 214 | mctx->block[14] = mctx->byte_count << 3; |
215 | mctx->block[15] = mctx->byte_count >> 29; | 215 | mctx->block[15] = mctx->byte_count >> 29; |
216 | le32_to_cpu_array(mctx->block, (sizeof(mctx->block) - | 216 | le32_to_cpu_array(mctx->block, (sizeof(mctx->block) - |
217 | sizeof(uint64_t)) / sizeof(uint32_t)); | 217 | sizeof(uint64_t)) / sizeof(uint32_t)); |
218 | md4_transform(mctx->hash, mctx->block); | 218 | md4_transform(mctx->hash, mctx->block); |
219 | cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(uint32_t)); | 219 | cpu_to_le32_array(mctx->hash, sizeof(mctx->hash) / sizeof(uint32_t)); |
220 | 220 | ||
@@ -367,7 +367,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md) | |||
367 | break; | 367 | break; |
368 | /* Terminate line at first space, to get rid of final ' \' */ | 368 | /* Terminate line at first space, to get rid of final ' \' */ |
369 | while (*p) { | 369 | while (*p) { |
370 | if (isspace(*p)) { | 370 | if (isspace(*p)) { |
371 | *p = '\0'; | 371 | *p = '\0'; |
372 | break; | 372 | break; |
373 | } | 373 | } |