Fix TuxOnIce shmem modifications.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Merge tag 'v3.13' into tuxonice-head

Linux 3.13

# gpg: Signature made Mon 20 Jan 2014 13:40:23 EST using RSA key ID 00411886
# gpg: Can't check signature: public key not found
Revert "toi-3.13: mm: fix shmem functions calls"

This reverts commit bd11ea681ec682d56dc49f2898a5dd210964183f.
Merge remote-tracking branch 'tuxonice-kernel/tuxonice-3.13' into pf-3.13
Revert "Fix TuxOnIce shmem modifications."

This reverts commit d6df70517526fff022e9259fa240e4c2cf38bc30.
Revert "Revert "toi-3.13: mm: fix shmem functions calls""

This reverts commit e356a32ab67dc60cd6149a7030d4d016e98cd185.