Pull from:  http://gkernel.bkbits.net/vm-2.5


---------------------------------------------------------------------------
ChangeSet@1.230, 2002-02-08 18:11:31-05:00, jgarzik@rum.normnet.org
  After Al Viro's recent swapfile cleanup, the swap_device member of
  swap_info_struct became pretty much superfluous.  As we are minimizing
  kdev_t usage anyway, I took the opportunity to remove swap_device
  member, and replace the remaining usages with SWP_BLOCKDEV bit flag.
  
  Adding SWP_BLOCKDEV in turn motivated a small cleanup of the
  SWP_xxx bit flags and their usage.
  
  Patch has been in light testing for a couple weeks, and
  has been glanced at by Al.  "looks sane"

 include/linux/swap.h |    9 ++++++---
 mm/swapfile.c        |   33 ++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 18 deletions(-)

---------------------------------------------------------------------------