- In pmdisk, change pm_pagedir_nosave back to pagedir_nosave, and 
  pmdisk_pages back to nr_copy_pages.
- Mark them, and other page count/pagedir variables extern.
- Make sure they're not static in swsusp.
- Remove mention from include/linux/suspend.h, since no one else needs them.