diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /fs/file_table.c | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'fs/file_table.c')
| -rw-r--r-- | fs/file_table.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index bcea1998b4de..0131ba06e1ee 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 5 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/config.h> | ||
| 9 | #include <linux/string.h> | 8 | #include <linux/string.h> |
| 10 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
| 11 | #include <linux/file.h> | 10 | #include <linux/file.h> |
| @@ -300,5 +299,5 @@ void __init files_init(unsigned long mempages) | |||
| 300 | if (files_stat.max_files < NR_FILE) | 299 | if (files_stat.max_files < NR_FILE) |
| 301 | files_stat.max_files = NR_FILE; | 300 | files_stat.max_files = NR_FILE; |
| 302 | files_defer_init(); | 301 | files_defer_init(); |
| 303 | percpu_counter_init(&nr_files); | 302 | percpu_counter_init(&nr_files, 0); |
| 304 | } | 303 | } |