[PATCH] Atari ST-RAM swap update

Jeff removed the swap_device member from struct swap_info_struct
(http://www.uwsg.iu.edu/hypermail/linux/kernel/0202.1/0258.html)
but it is still used in the m68k arch for the ST-RAM. The below
should remove it.

Frankly, I didn't try compiling... My original intent was to move the
swap_list definition from swap.h to mm/swapfile.c, but m68k still
uses it here :( so perhaps this isn't possible. And I just happened to
stumble upon this.

(from Marcus Alanen <maalanen@ra.abo.fi> through Rusty Trivial Russell)

diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c
index cc1586d8784593716e19b7b5cf63eccfbc0cd34a..0e73a2738505028cdba6c14f96b79d2168145a89 100644 (file)
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -540,7 +540,6 @@ static int __init swap_init(void *start_mem, void *swap_data)
        p->flags        = SWP_USED;
        p->swap_file    = &fake_dentry;
        p->swap_vfsmnt  = &fake_vfsmnt;
-       p->swap_device  = 0;
        p->swap_map     = swap_data;
        p->cluster_nr   = 0;
        p->next         = -1;
@@ -549,8 +548,7 @@ static int __init swap_init(void *start_mem, void *swap_data)
 
        /* call stram_open() directly, avoids at least the overhead in
         * constructing a dummy file structure... */
-       p->swap_device = MKDEV( STRAM_MAJOR, STRAM_MINOR );
-       swap_inode.i_rdev = p->swap_device;
+       swap_inode.i_rdev = MKDEV( STRAM_MAJOR, STRAM_MINOR );
        stram_open( &swap_inode, MAGIC_FILE_P );
        p->max = SWAP_NR(swap_end);