diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
| commit | 5e34437840d33554f69380584311743b39e8fbeb (patch) | |
| tree | e081135619ee146af5efb9ee883afca950df5757 /include/linux/writeback.h | |
| parent | 77d05632baee21b1cef8730d7c06aa69601e4dca (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
Diffstat (limited to 'include/linux/writeback.h')
| -rw-r--r-- | include/linux/writeback.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 7300ecdc480c..93445477f86a 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
| @@ -109,8 +109,8 @@ extern int dirty_background_ratio; | |||
| 109 | extern unsigned long dirty_background_bytes; | 109 | extern unsigned long dirty_background_bytes; |
| 110 | extern int vm_dirty_ratio; | 110 | extern int vm_dirty_ratio; |
| 111 | extern unsigned long vm_dirty_bytes; | 111 | extern unsigned long vm_dirty_bytes; |
| 112 | extern int dirty_writeback_interval; | 112 | extern unsigned int dirty_writeback_interval; |
| 113 | extern int dirty_expire_interval; | 113 | extern unsigned int dirty_expire_interval; |
| 114 | extern int vm_highmem_is_dirtyable; | 114 | extern int vm_highmem_is_dirtyable; |
| 115 | extern int block_dump; | 115 | extern int block_dump; |
| 116 | extern int laptop_mode; | 116 | extern int laptop_mode; |