Merge commit 'v2.6.34-rc6' into sched/core
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user