A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'linus' into x86/apic

Browse source 
Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2009-02-22 20:05:19 +01:00
commit fc6fc7f1b1
330 changed files with 5041 additions and 1549 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/xen/manage.c
View file

@ -45,6 +45,13 @@ static int xen_suspend(void *data)
err);
return err;
}
err = sysdev_suspend(PMSG_SUSPEND);
if (err) {
printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n",
err);
device_power_up(PMSG_RESUME);
return err;
}
xen_mm_pin_all();
gnttab_suspend();
@ -61,6 +68,7 @@ static int xen_suspend(void *data)
gnttab_resume();
xen_mm_unpin_all();
sysdev_resume();
device_power_up(PMSG_RESUME);
if (!*cancelled) {