ia64/xen-unstable

changeset 2492:8c7604b04eea

bitkeeper revision 1.1159.78.1 (4149adf72Gb8APRtx2_hA1cGWLUEOQ)

all build without front end drivers
author shand@spidean.research.intel-research.net
date Thu Sep 16 15:15:03 2004 +0000 (2004-09-16)
parents d8a023aa1466
children 5a20652b7d87
files BitKeeper/etc/logging_ok linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Thu Sep 16 13:11:34 2004 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Thu Sep 16 15:15:03 2004 +0000
     1.3 @@ -39,6 +39,7 @@ rn@wyvis.camb.intel-research.net
     1.4  rn@wyvis.research.intel-research.net
     1.5  rneugeba@wyvis.research
     1.6  rneugeba@wyvis.research.intel-research.net
     1.7 +shand@spidean.research.intel-research.net
     1.8  smh22@boulderdash.cl.cam.ac.uk
     1.9  smh22@labyrinth.cl.cam.ac.uk
    1.10  smh22@tempest.cl.cam.ac.uk
     2.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c	Thu Sep 16 13:11:34 2004 +0000
     2.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c	Thu Sep 16 15:15:03 2004 +0000
     2.3 @@ -60,10 +60,15 @@ static void __do_suspend(void)
     2.4      suspend_record_t *suspend_record;
     2.5  
     2.6      /* Hmmm... a cleaner interface to suspend/resume blkdevs would be nice. */
     2.7 +	/* XXX SMH: yes it would :-( */	
     2.8 +#ifdef CONFIG_XEN_BLKDEV_FRONTEND
     2.9      extern void blkdev_suspend(void);
    2.10      extern void blkdev_resume(void);
    2.11 +#endif
    2.12 +#ifdef CONFIG_XEN_NETIF_FRONTEND
    2.13      extern void netif_suspend(void);
    2.14      extern void netif_resume(void);    
    2.15 +#endif
    2.16      extern void time_suspend(void);
    2.17      extern void time_resume(void);
    2.18      extern unsigned long max_pfn;
    2.19 @@ -77,9 +82,13 @@ static void __do_suspend(void)
    2.20  
    2.21      __cli();
    2.22  
    2.23 +#ifdef CONFIG_XEN_NETIF_FRONTEND
    2.24      netif_suspend();
    2.25 +#endif
    2.26  
    2.27 +#ifdef CONFIG_XEN_BLKDEV_FRONTEND
    2.28      blkdev_suspend();
    2.29 +#endif
    2.30  
    2.31      time_suspend();
    2.32  
    2.33 @@ -130,9 +139,13 @@ static void __do_suspend(void)
    2.34  
    2.35      time_resume();
    2.36  
    2.37 +#ifdef CONFIG_XEN_BLKDEV_FRONTEND
    2.38      blkdev_resume();
    2.39 +#endif
    2.40  
    2.41 +#ifdef CONFIG_XEN_NETIF_FRONTEND
    2.42      netif_resume();
    2.43 +#endif
    2.44  
    2.45      __sti();
    2.46