path: root/arch/arm/mach-ixp23xx/include/mach/time.h
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-31 15:11:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-31 15:11:39 -0700
commitb7ffff4bb3fef527a26144a95d9dfe8c11a6b927 (patch)
treed5788ce86b8f0b2290660e1d7298a564a37f62a9 /arch/arm/mach-ixp23xx/include/mach/time.h
parent8bb1f229527dee95644e0f8496980bb767c6f620 (diff)
parentf878d0be229ab129bc4b224191f217106a4b0bc1 (diff)
Merge branch 's3-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console
Pull virtio S3 support patches from Amit Shah: "Turns out S3 is not different from S4 for virtio devices: the device is assumed to be reset, so the host and guest state are to be assumed to be out of sync upon resume. We handle the S4 case with exactly the same scenario, so just point the suspend/resume routines to the freeze/restore ones. Once that is done, we also use the PM API's macro to initialise the sleep functions. A couple of cleanups are included: there's no need for special thaw processing in the balloon driver, so that's addressed in patches 1 and 2. Testing: both S3 and S4 support have been tested using these patches using a similar method used earlier during S4 patch development: a guest is started with virtio-blk as the only disk, a virtio network card, a virtio-serial port and a virtio balloon device. Ping from guest to host, dd /dev/zero to a file on the disk, and IO from the host on the virtio-serial port, all at once, while exercising S4 and S3 (separately) were tested. They all continue to work fine after resume. virtio balloon values too were tested by inflating and deflating the balloon." Pulling from Amit, since Rusty is off getting married (and presumably shaving people). * 's3-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console: virtio-pci: switch to PM ops macro to initialise PM functions virtio-pci: S3 support virtio-pci: drop restore_common() virtio: drop thaw PM operation virtio: balloon: Allow stats update after restore from S4
Diffstat (limited to 'arch/arm/mach-ixp23xx/include/mach/time.h')
0 files changed, 0 insertions, 0 deletions