ia64/xen-unstable

changeset 2036:474a697fef95

bitkeeper revision 1.1108.33.34 (410e8c8d9bg1RHJ13Fqr_i-Yov0kRg)

fix merge botch
author cl349@freefall.cl.cam.ac.uk
date Mon Aug 02 18:48:45 2004 +0000 (2004-08-02)
parents 0a0752383e51
children 803c7064587a
files linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c	Mon Aug 02 18:38:42 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c	Mon Aug 02 18:48:45 2004 +0000
     1.3 @@ -122,10 +122,9 @@ static void __ctrl_if_tx_tasklet(unsigne
     1.4  
     1.5      if ( was_full && !TX_FULL(ctrl_if) )
     1.6      {
     1.7 +        wake_up(&ctrl_if_tx_wait);
     1.8  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
     1.9          run_task_queue(&ctrl_if_tx_tq);
    1.10 -#else
    1.11 -        wake_up(&ctrl_if_tx_wait);
    1.12  #endif
    1.13      }
    1.14  }