Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292600
b: refs/heads/master
c: bc58450
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Rothwell authored and Benjamin Herrenschmidt committed Mar 21, 2012
1 parent f8efbb5 commit b1e1b48
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f5339277eb8d3aed37f12a27988366f68ab68930
refs/heads/master: bc58450b023c5815e5bc54e6d43edbd1e3576fe6
4 changes: 2 additions & 2 deletions trunk/init/do_mounts_rd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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++;
Expand Down

0 comments on commit b1e1b48

Please sign in to comment.