diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
| commit | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (patch) | |
| tree | 693061ebde2abc35ecc846e5084630d7225aaaff /mm/pdflush.c | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'mm/pdflush.c')
| -rw-r--r-- | mm/pdflush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/pdflush.c b/mm/pdflush.c index 15de509b68fd..118905e3d788 100644 --- a/mm/pdflush.c +++ b/mm/pdflush.c | |||
| @@ -191,7 +191,7 @@ static int pdflush(void *dummy) | |||
| 191 | 191 | ||
| 192 | /* | 192 | /* |
| 193 | * Some configs put our parent kthread in a limited cpuset, | 193 | * Some configs put our parent kthread in a limited cpuset, |
| 194 | * which kthread() overrides, forcing cpus_allowed == CPU_MASK_ALL. | 194 | * which kthread() overrides, forcing cpus_allowed == cpu_all_mask. |
| 195 | * Our needs are more modest - cut back to our cpusets cpus_allowed. | 195 | * Our needs are more modest - cut back to our cpusets cpus_allowed. |
| 196 | * This is needed as pdflush's are dynamically created and destroyed. | 196 | * This is needed as pdflush's are dynamically created and destroyed. |
| 197 | * The boottime pdflush's are easily placed w/o these 2 lines. | 197 | * The boottime pdflush's are easily placed w/o these 2 lines. |