[power] Make sure MTRR uses right methods in sysdev_driver.

diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c
index 6f1563f6f78439b3e261f96b669915b993fe4898..73eb9664eedb0c9740d4a7a1b927d1019fbb1373 100644 (file)
--- a/arch/i386/kernel/cpu/mtrr/main.c
+++ b/arch/i386/kernel/cpu/mtrr/main.c
@@ -574,7 +574,7 @@ static int mtrr_save(struct sys_device * sysdev, u32 state)
        int i;
        int size = num_var_ranges * sizeof(struct mtrr_value);
 
-       mtrr_state = kmalloc(size,GFP_KERNEL);
+       mtrr_state = kmalloc(size,GFP_ATOMIC);
        if (mtrr_state)
                memset(mtrr_state,0,size);
        else
@@ -607,8 +607,8 @@ static int mtrr_restore(struct sys_device * sysdev)
 
 
 static struct sysdev_driver mtrr_sysdev_driver = {
-       .save           = mtrr_save,
-       .restore        = mtrr_restore,
+       .suspend        = mtrr_save,
+       .resume         = mtrr_restore,
 };