diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 16:20:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 16:20:14 -0800 |
| commit | 8c2fcadc933f713d51f46ec4dcd9b12830e0df84 (patch) | |
| tree | e0797b2db664d702f9d02dd0f45efddb2f0d7fe9 /arch/mn10300/mm/misalignment.c | |
| parent | 232486e1e9f34889424b68ee6270440b554479a2 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
| download | talos-obmc-linux-8c2fcadc933f713d51f46ec4dcd9b12830e0df84.tar.gz talos-obmc-linux-8c2fcadc933f713d51f46ec4dcd9b12830e0df84.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/mn10300/mm/misalignment.c')
| -rw-r--r-- | arch/mn10300/mm/misalignment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c index 30016251f658..6dffbf97ac26 100644 --- a/arch/mn10300/mm/misalignment.c +++ b/arch/mn10300/mm/misalignment.c @@ -633,13 +633,13 @@ static int misalignment_addr(unsigned long *registers, unsigned long sp, goto displace_or_inc; case SD24: tmp = disp << 8; - asm("asr 8,%0" : "=r"(tmp) : "0"(tmp)); + asm("asr 8,%0" : "=r"(tmp) : "0"(tmp) : "cc"); disp = (long) tmp; goto displace_or_inc; case SIMM4_2: tmp = opcode >> 4 & 0x0f; tmp <<= 28; - asm("asr 28,%0" : "=r"(tmp) : "0"(tmp)); + asm("asr 28,%0" : "=r"(tmp) : "0"(tmp) : "cc"); disp = (long) tmp; goto displace_or_inc; case IMM8: |
