Commit d1143c12 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[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)
parent 8d8bb7ce
...@@ -540,7 +540,6 @@ static int __init swap_init(void *start_mem, void *swap_data) ...@@ -540,7 +540,6 @@ static int __init swap_init(void *start_mem, void *swap_data)
p->flags = SWP_USED; p->flags = SWP_USED;
p->swap_file = &fake_dentry; p->swap_file = &fake_dentry;
p->swap_vfsmnt = &fake_vfsmnt; p->swap_vfsmnt = &fake_vfsmnt;
p->swap_device = 0;
p->swap_map = swap_data; p->swap_map = swap_data;
p->cluster_nr = 0; p->cluster_nr = 0;
p->next = -1; p->next = -1;
...@@ -549,8 +548,7 @@ static int __init swap_init(void *start_mem, void *swap_data) ...@@ -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 /* call stram_open() directly, avoids at least the overhead in
* constructing a dummy file structure... */ * constructing a dummy file structure... */
p->swap_device = MKDEV( STRAM_MAJOR, STRAM_MINOR ); swap_inode.i_rdev = MKDEV( STRAM_MAJOR, STRAM_MINOR );
swap_inode.i_rdev = p->swap_device;
stram_open( &swap_inode, MAGIC_FILE_P ); stram_open( &swap_inode, MAGIC_FILE_P );
p->max = SWAP_NR(swap_end); p->max = SWAP_NR(swap_end);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment