diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
| commit | 9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch) | |
| tree | b19e6acb5a67af31a4e7742e05c2166dc3f1444c /mm/swap_state.c | |
| parent | 72919904796333a20c6a5d5c380091b42e407aa9 (diff) | |
Merge with Linux 2.3.22.
Diffstat (limited to 'mm/swap_state.c')
| -rw-r--r-- | mm/swap_state.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c index 5cfc686dd..3b3a65a71 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -13,6 +13,7 @@ #include <linux/swapctl.h> #include <linux/init.h> #include <linux/pagemap.h> +#include <linux/smp_lock.h> #include <asm/pgtable.h> @@ -234,7 +235,9 @@ void __delete_from_swap_cache(struct page *page) page_address(page), page_count(page), entry); #endif remove_from_swap_cache (page); + lock_kernel(); swap_free (entry); + unlock_kernel(); } static void delete_from_swap_cache_nolock(struct page *page) |