diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:27:54 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:27:54 +0200 |
commit | 48652ced1533c3372f996a0d83b6e73b1f1c9381 (patch) | |
tree | 5e17729cfcdc97bf798a17b57cdb888b4ded65b0 /init | |
parent | sched: Fix select_idle_sibling() logic in select_task_rq_fair() (diff) | |
parent | Linux 2.6.34-rc6 (diff) | |
download | linux-48652ced1533c3372f996a0d83b6e73b1f1c9381.tar.xz linux-48652ced1533c3372f996a0d83b6e73b1f1c9381.zip |
Merge commit 'v2.6.34-rc6' into sched/core
Diffstat (limited to 'init')
-rw-r--r-- | init/initramfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 37d3859b1b32..4b9c20205092 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -457,7 +457,8 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len) compress_name); message = msg_buf; } - } + } else + error("junk in compressed archive"); if (state != Reset) error("junk in compressed archive"); this_header = saved_offset + my_inptr; |