ia64/xen-unstable

changeset 1854:daba82eeec2a

bitkeeper revision 1.1108.8.1 (40fe880c_hiP01MQUNgjKQOK3pSO0Q)

Merge http://xen.bkbits.net:8080/xeno-unstable.bk
into gandalf.hpl.hp.com:/var/bk/xeno-unstable.bk
author xenbk@gandalf.hpl.hp.com
date Wed Jul 21 15:13:16 2004 +0000 (2004-07-21)
parents f26582ec895e 8f45c4cafc5c
children ba57d25bfe88
files linux-2.4.26-xen-sparse/arch/xen/Makefile linux-2.6.7-xen-sparse/arch/xen/Makefile linux-2.6.7-xen-sparse/arch/xen/i386/kernel/time.c linux-2.6.7-xen-sparse/arch/xen/kernel/process.c linux-2.6.7-xen-sparse/drivers/xen/net/network.c
line diff
     1.1 --- a/linux-2.4.26-xen-sparse/arch/xen/Makefile	Tue Jul 20 14:55:40 2004 +0000
     1.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/Makefile	Wed Jul 21 15:13:16 2004 +0000
     1.3 @@ -114,6 +114,7 @@ install: bzImage
     1.4  	install -m0644 arch/$(ARCH)/boot/bzImage $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
     1.5  	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(INSTALL_NAME)$(INSTALL_SUFFIX)
     1.6  	install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX)
     1.7 +	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(INSTALL_NAME)$(INSTALL_SUFFIX)
     1.8  
     1.9  dist: 
    1.10  	$(MAKE) INSTALL_PATH=../install install
     2.1 --- a/linux-2.6.7-xen-sparse/arch/xen/Makefile	Tue Jul 20 14:55:40 2004 +0000
     2.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/Makefile	Wed Jul 21 15:13:16 2004 +0000
     2.3 @@ -58,8 +58,9 @@ XINSTALL_NAME ?= $(KERNELRELEASE)
     2.4  install: vmlinuz
     2.5  	mkdir -p $(INSTALL_PATH)/boot
     2.6  	install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
     2.7 -	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
     2.8 +	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
     2.9  	install -m0664 .config $(INSTALL_PATH)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    2.10 +	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
    2.11  
    2.12  dist:
    2.13  	$(MAKE) INSTALL_PATH=../install install
     3.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/time.c	Tue Jul 20 14:55:40 2004 +0000
     3.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/time.c	Wed Jul 21 15:13:16 2004 +0000
     3.3 @@ -474,28 +474,23 @@ static inline u64 __jiffies_to_st(unsign
     3.4   * 
     3.5   * It must be called with interrupts disabled.
     3.6   */
     3.7 -extern spinlock_t timerlist_lock;
     3.8  int set_timeout_timer(void)
     3.9  {
    3.10 -    u64 alarm = 0;
    3.11 -    int ret = 0;
    3.12 -    int cpu = smp_processor_id();
    3.13 -
    3.14 -    spin_lock(&timerlist_lock);
    3.15 +	u64 alarm = 0;
    3.16 +	int ret = 0;
    3.17  
    3.18 -    /*
    3.19 -     * This is safe against long blocking (since calculations are not based on 
    3.20 -     * TSC deltas). It is also safe against warped system time since
    3.21 -     * suspend-resume is cooperative and we would first get locked out. It is 
    3.22 -     * safe against normal updates of jiffies since interrupts are off.
    3.23 -     */
    3.24 -    alarm = __jiffies_to_st(next_timer_interrupt());
    3.25 +	/*
    3.26 +	 * This is safe against long blocking (since calculations are
    3.27 +	 * not based on TSC deltas). It is also safe against warped
    3.28 +	 * system time since suspend-resume is cooperative and we
    3.29 +	 * would first get locked out. It is safe against normal
    3.30 +	 * updates of jiffies since interrupts are off.
    3.31 +	 */
    3.32 +	alarm = __jiffies_to_st(next_timer_interrupt());
    3.33  
    3.34 -    /* Failure is pretty bad, but we'd best soldier on. */
    3.35 -    if ( HYPERVISOR_set_timer_op(alarm) != 0 )
    3.36 -        ret = -1;
    3.37 -    
    3.38 -    spin_unlock(&timerlist_lock);
    3.39 +	/* Failure is pretty bad, but we'd best soldier on. */
    3.40 +	if ( HYPERVISOR_set_timer_op(alarm) != 0 )
    3.41 +		ret = -1;
    3.42  
    3.43 -    return ret;
    3.44 +	return ret;
    3.45  }
     4.1 --- a/linux-2.6.7-xen-sparse/arch/xen/kernel/process.c	Tue Jul 20 14:55:40 2004 +0000
     4.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/kernel/process.c	Wed Jul 21 15:13:16 2004 +0000
     4.3 @@ -6,12 +6,16 @@
     4.4  #include <linux/init.h>
     4.5  #include <linux/platform.h>
     4.6  #include <linux/pm.h>
     4.7 +#include <linux/rcupdate.h>
     4.8  
     4.9 +extern int set_timeout_timer(void);
    4.10  
    4.11  void xen_cpu_idle (void)
    4.12  {
    4.13 +	int cpu = smp_processor_id();
    4.14 +
    4.15  	local_irq_disable();
    4.16 -	if (need_resched() || !list_empty(&RCU_curlist(cpu)))
    4.17 +	if (need_resched() || !list_empty(&RCU_curlist(cpu))) {
    4.18  		local_irq_enable();
    4.19  		return;
    4.20  	}
     5.1 --- a/linux-2.6.7-xen-sparse/drivers/xen/net/network.c	Tue Jul 20 14:55:40 2004 +0000
     5.2 +++ b/linux-2.6.7-xen-sparse/drivers/xen/net/network.c	Wed Jul 21 15:13:16 2004 +0000
     5.3 @@ -371,7 +371,7 @@ static int network_start_xmit(struct sk_
     5.4  }
     5.5  
     5.6  
     5.7 -static void netif_int(int irq, void *dev_id, struct pt_regs *ptregs)
     5.8 +static irqreturn_t netif_int(int irq, void *dev_id, struct pt_regs *ptregs)
     5.9  {
    5.10      struct net_device *dev = dev_id;
    5.11      struct net_private *np = dev->priv;
    5.12 @@ -384,6 +384,8 @@ static void netif_int(int irq, void *dev
    5.13      if ( (np->rx_resp_cons != np->rx->resp_prod) &&
    5.14           (np->user_state == UST_OPEN) )
    5.15          netif_rx_schedule(dev);
    5.16 +
    5.17 +    return IRQ_HANDLED;
    5.18  }
    5.19  
    5.20