From b1e1b48194b5b799c1cdb3a6d201b6b0a3c4461a Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 15 Mar 2012 18:19:08 +0000 Subject: [PATCH] --- yaml --- r: 292600 b: refs/heads/master c: bc58450b023c5815e5bc54e6d43edbd1e3576fe6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/init/do_mounts_rd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f3c18043cf8c..58bb31576cd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5339277eb8d3aed37f12a27988366f68ab68930 +refs/heads/master: bc58450b023c5815e5bc54e6d43edbd1e3576fe6 diff --git a/trunk/init/do_mounts_rd.c b/trunk/init/do_mounts_rd.c index 887629e24c54..01f1306aa26e 100644 --- a/trunk/init/do_mounts_rd.c +++ b/trunk/init/do_mounts_rd.c @@ -178,7 +178,7 @@ int __init rd_load_image(char *from) char *buf = NULL; unsigned short rotate = 0; decompress_fn decompressor = NULL; -#if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES) +#if !defined(CONFIG_S390) char rotator[4] = { '|' , '/' , '-' , '\\' }; #endif @@ -264,7 +264,7 @@ int __init rd_load_image(char *from) } sys_read(in_fd, buf, BLOCK_SIZE); sys_write(out_fd, buf, BLOCK_SIZE); -#if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES) +#if !defined(CONFIG_S390) if (!(i % 16)) { printk("%c\b", rotator[rotate & 0x3]); rotate++;