diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-06-02 13:56:35 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-06-02 13:56:35 +0000 |
| commit | b7cd155cf5d5523589ded75302dd640189a855e5 (patch) | |
| tree | 2a1758a2cef2da6a41b9280e575b615918aedd12 | |
| parent | de3ea2577e4b5b74293e197fa494f56735c1e38d (diff) | |
| parent | a6b2e4dcdb74000962237ec1d2640d55b5bd01b1 (diff) | |
| download | xen-b7cd155cf5d5523589ded75302dd640189a855e5.tar.gz xen-b7cd155cf5d5523589ded75302dd640189a855e5.tar.bz2 xen-b7cd155cf5d5523589ded75302dd640189a855e5.zip | |
bitkeeper revision 1.1639 (429f10138AGmYb8WkpDuXWG6NvuSjQ)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c index 62c8274895..572b1a71b3 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6.11-xen-sparse/arch/xen/kernel/reboot.c @@ -103,8 +103,10 @@ static void __do_suspend(void) __cli(); +#ifdef __i386__ mm_pin_all(); kmem_cache_shrink(pgd_cache); +#endif netif_suspend(); |