2.4.13-pre3

 mm

diff -u --recursive --new-file v2.4.12/linux/mm/shmem.c linux/mm/shmem.c
--- v2.4.12/linux/mm/shmem.c   Thu Oct 11 08:02:26 2001
+++ linux/mm/shmem.c   Mon Oct 15 12:09:50 2001
@@ -386,10 +386,10 @@
    spin_unlock (&info->lock);
    return 0;
 found:
+   delete_from_swap_cache(page);
    add_to_page_cache(page, info->inode->i_mapping, offset + idx);
    SetPageDirty(page);
    SetPageUptodate(page);
-   UnlockPage(page);
    info->swapped--;
    spin_unlock(&info->lock);
    return 1;
@@ -531,10 +531,8 @@
       if (!page) {
          swp_entry_t swap = *entry;
          spin_unlock (&info->lock);
-         lock_kernel();
          swapin_readahead(*entry);
          page = read_swap_cache_async(*entry);
-         unlock_kernel();
          if (!page) {
             if (entry->val != swap.val)
                goto repeat;