diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /include/asm-m32r/system.h | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-m32r/system.h')
| -rw-r--r-- | include/asm-m32r/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h index 06cdece35865..f62f5c9abba6 100644 --- a/include/asm-m32r/system.h +++ b/include/asm-m32r/system.h | |||
| @@ -136,7 +136,7 @@ extern void __xchg_called_with_bad_pointer(void); | |||
| 136 | "add3 "reg0", "addr", #0x2000; \n\t" \ | 136 | "add3 "reg0", "addr", #0x2000; \n\t" \ |
| 137 | "ld "reg0", @"reg0"; \n\t" \ | 137 | "ld "reg0", @"reg0"; \n\t" \ |
| 138 | "unlock "reg0", @"reg1"; \n\t" | 138 | "unlock "reg0", @"reg1"; \n\t" |
| 139 | /* FIXME: This workaround code cannot handle kenrel modules | 139 | /* FIXME: This workaround code cannot handle kernel modules |
| 140 | * correctly under SMP environment. | 140 | * correctly under SMP environment. |
| 141 | */ | 141 | */ |
| 142 | #else /* CONFIG_CHIP_M32700_TS1 */ | 142 | #else /* CONFIG_CHIP_M32700_TS1 */ |