diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
| commit | 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 (patch) | |
| tree | bedfff6f96118771b809de30e559cc370f94c7be /arch/arm/boot/compressed/misc.c | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
| parent | 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/arm/boot/compressed/misc.c')
| -rw-r--r-- | arch/arm/boot/compressed/misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 0af3772efcb7..ace3fb5835d9 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c | |||
| @@ -38,10 +38,10 @@ static void icedcc_putc(int ch) | |||
| 38 | if (--i < 0) | 38 | if (--i < 0) |
| 39 | return; | 39 | return; |
| 40 | 40 | ||
| 41 | asm("mrc p14, 0, %0, c0, c0, 0" : "=r" (status)); | 41 | asm volatile ("mrc p14, 0, %0, c0, c0, 0" : "=r" (status)); |
| 42 | } while (status & 2); | 42 | } while (status & 2); |
| 43 | 43 | ||
| 44 | asm("mcr p15, 0, %0, c1, c0, 0" : : "r" (ch)); | 44 | asm("mcr p14, 0, %0, c1, c0, 0" : : "r" (ch)); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | #define putc(ch) icedcc_putc(ch) | 47 | #define putc(ch) icedcc_putc(ch) |