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/include/asm/system.h | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/mn10300/include/asm/system.h')
| -rw-r--r-- | arch/mn10300/include/asm/system.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mn10300/include/asm/system.h b/arch/mn10300/include/asm/system.h index 8214fb7e7fe..3636c054dcd 100644 --- a/arch/mn10300/include/asm/system.h +++ b/arch/mn10300/include/asm/system.h | |||
| @@ -143,6 +143,7 @@ do { \ | |||
| 143 | " mov %0,epsw \n" \ | 143 | " mov %0,epsw \n" \ |
| 144 | : "=&d"(tmp) \ | 144 | : "=&d"(tmp) \ |
| 145 | : "i"(~EPSW_IM), "r"(__mn10300_irq_enabled_epsw) \ | 145 | : "i"(~EPSW_IM), "r"(__mn10300_irq_enabled_epsw) \ |
| 146 | : "cc" \ | ||
| 146 | ); \ | 147 | ); \ |
| 147 | } while (0) | 148 | } while (0) |
| 148 | 149 | ||