ia64/xen-unstable

changeset 3683:eb32083c83ab

bitkeeper revision 1.1159.212.103 (420609f1fbTBjl9ynLuVLkWWeqTOag)

Merge viper.(none):/home/kaf24/xen-2.0-testing.bk
into viper.(none):/home/kaf24/xen-unstable.bk
author kaf24@viper.(none)
date Sun Feb 06 12:13:37 2005 +0000 (2005-02-06)
parents 176610077cd4 6bc867ecf95b
children f4eb69e2ad9e
files xen/Makefile xen/arch/x86/Makefile xen/arch/x86/pci-pc.c
line diff
     1.1 --- a/xen/Makefile	Sun Feb 06 09:39:57 2005 +0000
     1.2 +++ b/xen/Makefile	Sun Feb 06 12:13:37 2005 +0000
     1.3 @@ -54,8 +54,9 @@ clean:
     1.4  	$(MAKE) -C drivers
     1.5  	$(MAKE) -C arch/$(TARGET_ARCH)
     1.6  
     1.7 +# drivers/char/console.o may contain static banner/compile info. Blow it away.
     1.8  delete-unfresh-files:
     1.9 -	rm -f include/xen/banner.h include/xen/compile.h
    1.10 +	rm -f include/xen/banner.h include/xen/compile.h drivers/char/console.o
    1.11  	$(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
    1.12  
    1.13  # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
     2.1 --- a/xen/arch/x86/Makefile	Sun Feb 06 09:39:57 2005 +0000
     2.2 +++ b/xen/arch/x86/Makefile	Sun Feb 06 12:13:37 2005 +0000
     2.3 @@ -38,8 +38,7 @@ clean:
     2.4  	rm -f x86_64/*.o x86_64/*~ x86_64/core
     2.5  	rm -f mtrr/*.o mtrr/*~ mtrr/core
     2.6  
     2.7 -# setup.o contains bits of compile.h so it must be blown away
     2.8  delete-unfresh-files:
     2.9 -	rm -f setup.o
    2.10 +	# nothing
    2.11  
    2.12  .PHONY: default clean delete-unfresh-files
     3.1 --- a/xen/arch/x86/pci-pc.c	Sun Feb 06 09:39:57 2005 +0000
     3.2 +++ b/xen/arch/x86/pci-pc.c	Sun Feb 06 12:13:37 2005 +0000
     3.3 @@ -1,3 +1,4 @@
     3.4 +/* -*-  Mode:C; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
     3.5  /*
     3.6   *	Low-Level PCI Support for PC
     3.7   *
     3.8 @@ -445,8 +446,9 @@ static struct pci_ops pci_direct_conf2 =
     3.9  static int __devinit pci_sanity_check(struct pci_ops *o)
    3.10  {
    3.11  	u16 x;
    3.12 -	struct pci_bus bus;		/* Fake bus and device */
    3.13 -	struct pci_dev dev;
    3.14 +	/* XEN: static is important to prevent stack overflow! */
    3.15 +	static struct pci_bus bus;		/* Fake bus and device */
    3.16 +	static struct pci_dev dev;
    3.17  
    3.18  	if (pci_probe & PCI_NO_CHECKS)
    3.19  		return 1;
    3.20 @@ -1131,8 +1133,9 @@ static void __devinit pcibios_fixup_ghos
    3.21  static void __devinit pcibios_fixup_peer_bridges(void)
    3.22  {
    3.23  	int n;
    3.24 -	struct pci_bus bus;
    3.25 -	struct pci_dev dev;
    3.26 +	/* XEN: static is important to prevent stack overflow! */
    3.27 +	static struct pci_bus bus;
    3.28 +	static struct pci_dev dev;
    3.29  	u16 l;
    3.30  
    3.31  	if (pcibios_last_bus <= 0 || pcibios_last_bus >= 0xff)