diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/mn10300/mm/misalignment.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
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 30016251f65..6dffbf97ac2 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, | |||
| 633 | goto displace_or_inc; | 633 | goto displace_or_inc; |
| 634 | case SD24: | 634 | case SD24: |
| 635 | tmp = disp << 8; | 635 | tmp = disp << 8; |
| 636 | asm("asr 8,%0" : "=r"(tmp) : "0"(tmp)); | 636 | asm("asr 8,%0" : "=r"(tmp) : "0"(tmp) : "cc"); |
| 637 | disp = (long) tmp; | 637 | disp = (long) tmp; |
| 638 | goto displace_or_inc; | 638 | goto displace_or_inc; |
| 639 | case SIMM4_2: | 639 | case SIMM4_2: |
| 640 | tmp = opcode >> 4 & 0x0f; | 640 | tmp = opcode >> 4 & 0x0f; |
| 641 | tmp <<= 28; | 641 | tmp <<= 28; |
| 642 | asm("asr 28,%0" : "=r"(tmp) : "0"(tmp)); | 642 | asm("asr 28,%0" : "=r"(tmp) : "0"(tmp) : "cc"); |
| 643 | disp = (long) tmp; | 643 | disp = (long) tmp; |
| 644 | goto displace_or_inc; | 644 | goto displace_or_inc; |
| 645 | case IMM8: | 645 | case IMM8: |