diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /arch/arm/kernel/swp_emulate.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'arch/arm/kernel/swp_emulate.c')
| -rw-r--r-- | arch/arm/kernel/swp_emulate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c index 7a5760922914..40ee7e5045e4 100644 --- a/arch/arm/kernel/swp_emulate.c +++ b/arch/arm/kernel/swp_emulate.c | |||
| @@ -158,7 +158,7 @@ static int emulate_swpX(unsigned int address, unsigned int *data, | |||
| 158 | 158 | ||
| 159 | if (res == 0) { | 159 | if (res == 0) { |
| 160 | /* | 160 | /* |
| 161 | * Barrier also required between aquiring a lock for a | 161 | * Barrier also required between acquiring a lock for a |
| 162 | * protected resource and accessing the resource. Inserted for | 162 | * protected resource and accessing the resource. Inserted for |
| 163 | * same reason as above. | 163 | * same reason as above. |
| 164 | */ | 164 | */ |