diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /mm/swapfile.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index 8970c0b74194..edafeace301f 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
| @@ -36,8 +36,6 @@ unsigned int nr_swapfiles; | |||
| 36 | long total_swap_pages; | 36 | long total_swap_pages; |
| 37 | static int swap_overflow; | 37 | static int swap_overflow; |
| 38 | 38 | ||
| 39 | EXPORT_SYMBOL(total_swap_pages); | ||
| 40 | |||
| 41 | static const char Bad_file[] = "Bad swap file entry "; | 39 | static const char Bad_file[] = "Bad swap file entry "; |
| 42 | static const char Unused_file[] = "Unused swap file entry "; | 40 | static const char Unused_file[] = "Unused swap file entry "; |
| 43 | static const char Bad_offset[] = "Bad swap offset entry "; | 41 | static const char Bad_offset[] = "Bad swap offset entry "; |