diff options
| author | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:08 -0500 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:54 -0500 |
| commit | fc582aef7dcc27a7120cf232c1e76c569c7b6eab (patch) | |
| tree | 7d275dd4ceab6067b91e9a25a5f6338b425fbccd /scripts/sortextable.c | |
| parent | 9175c9d2aed528800175ef81c90569d00d23f9be (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Conflicts:
fs/exec.c
Diffstat (limited to 'scripts/sortextable.c')
| -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 |