Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235515
b: refs/heads/master
c: a996320
h: refs/heads/master
i:
  235513: f5bc8e6
  235511: 9bdc4d6
v: v3
  • Loading branch information
Stephen Boyd authored and Greg Kroah-Hartman committed Feb 4, 2011
1 parent 667bdd7 commit c85d021
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 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: 380042f2db653b324ae756d102d872c1ecd412c5
refs/heads/master: a99632014631409483a481a6a0d77d09ded47239
11 changes: 5 additions & 6 deletions trunk/drivers/tty/hvc/hvc_dcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");
Expand All @@ -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;
Expand All @@ -68,15 +67,15 @@ 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");
}
#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));
}
Expand Down

0 comments on commit c85d021

Please sign in to comment.