diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 22:46:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 22:46:50 -0400 |
| commit | 1ff5e37e727be2f575d1a672a1bc4c2595b4752e (patch) | |
| tree | 7a64165d7ca0f1dc813d98efcbe4898e28a8cdc1 /scripts | |
| parent | e7d33bb5ea82922e6ddcfc6b28a630b1a4ced071 (diff) | |
| parent | 0d0e7718a9da789dec7932b7411ab16047540c4f (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild update from Michal Marek:
"Only these two commits are in the kbuild branch this time:
- Using filechk for include/config/kernel.release
- Cleanup in scripts/sortextable.c"
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: Do not overwrite include/config/kernel.release needlessly
scripts: remove unused function in sortextable.c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/sortextable.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/scripts/sortextable.c b/scripts/sortextable.c index f9ce1160419b..7c2310c5b996 100644 --- a/scripts/sortextable.c +++ b/scripts/sortextable.c | |||
| @@ -64,14 +64,6 @@ fail_file(void) | |||
| 64 | longjmp(jmpenv, SJ_FAIL); | 64 | longjmp(jmpenv, SJ_FAIL); |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | static void __attribute__((noreturn)) | ||
| 68 | succeed_file(void) | ||
| 69 | { | ||
| 70 | cleanup(); | ||
| 71 | longjmp(jmpenv, SJ_SUCCEED); | ||
| 72 | } | ||
| 73 | |||
| 74 | |||
| 75 | /* | 67 | /* |
| 76 | * Get the whole file as a programming convenience in order to avoid | 68 | * Get the whole file as a programming convenience in order to avoid |
| 77 | * malloc+lseek+read+free of many pieces. If successful, then mmap | 69 | * malloc+lseek+read+free of many pieces. If successful, then mmap |
