diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /fs/buffer.c | |
| parent | b73d884756303316ead4cd7dad51236b2a515a1a (diff) | |
| parent | 86d710146fb9975f04c505ec78caa43d227c1018 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 28f320fac4d4..90a98865b0cc 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -281,7 +281,7 @@ static void free_more_memory(void) | |||
| 281 | struct zone *zone; | 281 | struct zone *zone; |
| 282 | int nid; | 282 | int nid; |
| 283 | 283 | ||
| 284 | wakeup_pdflush(1024); | 284 | wakeup_flusher_threads(1024); |
| 285 | yield(); | 285 | yield(); |
| 286 | 286 | ||
| 287 | for_each_online_node(nid) { | 287 | for_each_online_node(nid) { |