- do_magic()
  - Rename to swsusp_arch_suspend().
  - Move declaration to swsusp.c

- arch_prepare_suspend()
  - Return an int
  - Fix x86 version to return -EFAULT if cpu does not have pse, instead of 
    calling panic().
  - Call from swsusp_save().

- do_magic_suspend_1()
  - Move body to pm_suspend_disk()
  - Remove.

- do_magic_suspend_2()
  - Rename to swsusp_suspend()
  - Move IRQ fiddling to suspend_save_image(), since that's the only call 
    that needs it. 
  - Return an int.

- do_magic_resume_1()
  - Move body to pm_resume().
  - Remove

- do_magic_resume_2()
  - Rename to swsusp_resume(). 
  - Return an int. 

- swsusp general
  - Remove unnecessary includes.
  - Remove suspend_pagedir_lock, since it was only used to disable IRQs.
  - Change swsusp_{suspend,resume} return an int, so pm_suspend_disk() knows
    if anything failed.