diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /arch/arm/mm/ioremap.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/arm/mm/ioremap.c')
| -rw-r--r-- | arch/arm/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index d6167ad4e011..f3ade18862aa 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c | |||
| @@ -346,7 +346,7 @@ void __iounmap(volatile void __iomem *addr) | |||
| 346 | #ifndef CONFIG_SMP | 346 | #ifndef CONFIG_SMP |
| 347 | /* | 347 | /* |
| 348 | * If this is a section based mapping we need to handle it | 348 | * If this is a section based mapping we need to handle it |
| 349 | * specially as the VM subysystem does not know how to handle | 349 | * specially as the VM subsystem does not know how to handle |
| 350 | * such a beast. We need the lock here b/c we need to clear | 350 | * such a beast. We need the lock here b/c we need to clear |
| 351 | * all the mappings before the area can be reclaimed | 351 | * all the mappings before the area can be reclaimed |
| 352 | * by someone else. | 352 | * by someone else. |