From c85d0214e5cba9fb12dd37e11c91b2a6f6da45fa Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Thu, 3 Feb 2011 15:48:34 -0800 Subject: [PATCH] --- yaml --- r: 235515 b: refs/heads/master c: a99632014631409483a481a6a0d77d09ded47239 h: refs/heads/master i: 235513: f5bc8e62e15c34fb361f9ddbe5e8310654eb160b 235511: 9bdc4d6764c478891c8190033a41bf26f0467b68 v: v3 --- [refs] | 2 +- trunk/drivers/tty/hvc/hvc_dcc.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 19504ca4856e..ae242d730ac7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 380042f2db653b324ae756d102d872c1ecd412c5 +refs/heads/master: a99632014631409483a481a6a0d77d09ded47239 diff --git a/trunk/drivers/tty/hvc/hvc_dcc.c b/trunk/drivers/tty/hvc/hvc_dcc.c index 6470f63deb4b..155ec105e1c8 100644 --- a/trunk/drivers/tty/hvc/hvc_dcc.c +++ b/trunk/drivers/tty/hvc/hvc_dcc.c @@ -33,8 +33,7 @@ static inline u32 __dcc_getstatus(void) { u32 __ret; - - asm("mrc p14, 0, %0, c0, c1, 0 @ read comms ctrl reg" + asm volatile("mrc p14, 0, %0, c0, c1, 0 @ read comms ctrl reg" : "=r" (__ret) : : "cc"); return __ret; @@ -46,7 +45,7 @@ static inline char __dcc_getchar(void) { char __c; - asm("get_wait: mrc p14, 0, pc, c0, c1, 0 \n\ + asm volatile("get_wait: mrc p14, 0, pc, c0, c1, 0 \n\ bne get_wait \n\ mrc p14, 0, %0, c0, c5, 0 @ read comms data reg" : "=r" (__c) : : "cc"); @@ -58,7 +57,7 @@ static inline char __dcc_getchar(void) { char __c; - asm("mrc p14, 0, %0, c0, c5, 0 @ read comms data reg" + asm volatile("mrc p14, 0, %0, c0, c5, 0 @ read comms data reg" : "=r" (__c)); return __c; @@ -68,7 +67,7 @@ static inline char __dcc_getchar(void) #if defined(CONFIG_CPU_V7) static inline void __dcc_putchar(char c) { - asm("put_wait: mrc p14, 0, pc, c0, c1, 0 \n\ + asm volatile("put_wait: mrc p14, 0, pc, c0, c1, 0 \n\ bcs put_wait \n\ mcr p14, 0, %0, c0, c5, 0 " : : "r" (c) : "cc"); @@ -76,7 +75,7 @@ static inline void __dcc_putchar(char c) #else static inline void __dcc_putchar(char c) { - asm("mcr p14, 0, %0, c0, c5, 0 @ write a char" + asm volatile("mcr p14, 0, %0, c0, c5, 0 @ write a char" : /* no output register */ : "r" (c)); }