aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/scsi/arcmsr_spec.txt2
-rw-r--r--mm/migrate.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/scsi/arcmsr_spec.txt b/Documentation/scsi/arcmsr_spec.txt
index 5e0042340fd3..45d9482c1517 100644
--- a/Documentation/scsi/arcmsr_spec.txt
+++ b/Documentation/scsi/arcmsr_spec.txt
@@ -3,7 +3,7 @@
3******************************************************************************* 3*******************************************************************************
4** Usage of IOP331 adapter 4** Usage of IOP331 adapter
5** (All In/Out is in IOP331's view) 5** (All In/Out is in IOP331's view)
6** 1. Message 0 --> InitThread message and retrun code 6** 1. Message 0 --> InitThread message and return code
7** 2. Doorbell is used for RS-232 emulation 7** 2. Doorbell is used for RS-232 emulation
8** inDoorBell : bit0 -- data in ready 8** inDoorBell : bit0 -- data in ready
9** (DRIVER DATA WRITE OK) 9** (DRIVER DATA WRITE OK)
diff --git a/mm/migrate.c b/mm/migrate.c
index 4d6ee03db946..6a207e8d17ea 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -706,7 +706,7 @@ move_newpage:
706 * The function returns after 10 attempts or if no pages 706 * The function returns after 10 attempts or if no pages
707 * are movable anymore because to has become empty 707 * are movable anymore because to has become empty
708 * or no retryable pages exist anymore. All pages will be 708 * or no retryable pages exist anymore. All pages will be
709 * retruned to the LRU or freed. 709 * returned to the LRU or freed.
710 * 710 *
711 * Return: Number of pages not migrated or error code. 711 * Return: Number of pages not migrated or error code.
712 */ 712 */