Merge branch 'master' into percpu

Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h

1 files changed, 4 insertions, 1 deletions

diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index 83b3dde1a83b..b2b3c2d1cf8b 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -354,7 +354,10 @@ static int cpio_mkfile(const char *name, const char *location,
                 push_pad();
 
                 if (size) {
-                        fwrite(filebuf, size, 1, stdout);
+                        if (fwrite(filebuf, size, 1, stdout) != 1) {
+                                fprintf(stderr, "writing filebuf failed\n");
+                                goto error;
+                        }
                         offset += size;
                         push_pad();
                 }