diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 11:05:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 11:05:37 -0400 |
| commit | c6538499814d8112c5d4d08570a7cf0758e5f8f5 (patch) | |
| tree | 3c3574d8aea838d91372765847577772092f09bc /include/linux | |
| parent | 662f11cf2aaedd3d5fe6afbec78ba3288fd0c4ca (diff) | |
| parent | cd17cbfda004fe5f406c01b318c6378d9895896f (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "mm: add /proc controls for pdflush threads"
viocd: needs to depend on BLOCK
block: fix the bio_vec array index out-of-bounds test
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/writeback.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 9c1ed1fb6ddb..93445477f86a 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
| @@ -168,8 +168,6 @@ void writeback_set_ratelimit(void); | |||
| 168 | /* pdflush.c */ | 168 | /* pdflush.c */ |
| 169 | extern int nr_pdflush_threads; /* Global so it can be exported to sysctl | 169 | extern int nr_pdflush_threads; /* Global so it can be exported to sysctl |
| 170 | read-only. */ | 170 | read-only. */ |
| 171 | extern int nr_pdflush_threads_max; /* Global so it can be exported to sysctl */ | ||
| 172 | extern int nr_pdflush_threads_min; /* Global so it can be exported to sysctl */ | ||
| 173 | 171 | ||
| 174 | 172 | ||
| 175 | #endif /* WRITEBACK_H */ | 173 | #endif /* WRITEBACK_H */ |