1.1 --- a/.rootkeys	Tue May 10 10:02:28 2005 +0000
     1.2 +++ b/.rootkeys	Tue May 10 10:52:14 2005 +0000
     1.3 @@ -1376,7 +1376,6 @@ 3ddb79c2wa0dA_LGigxOelSGbJ284Q xen/inclu
     1.4  41aaf567Mi3OishhvrCtET1y-mxQBg xen/include/asm-x86/mtrr.h
     1.5  41a61536MFhNalgbVmYGXAhQsPTZNw xen/include/asm-x86/multicall.h
     1.6  3ddb79c3xjYnrv5t3VqYlR4tNEOl4Q xen/include/asm-x86/page.h
     1.7 -3ddb79c3ysKUbxZuwKBRK3WXU2TlEg xen/include/asm-x86/pci.h
     1.8  42422fb0FVX-TJkSvAXnbfwMf19XFA xen/include/asm-x86/physdev.h
     1.9  3ddb79c2QF5-pZGzuX4QukPCDAl59A xen/include/asm-x86/processor.h
    1.10  40cf1596bim9F9DNdV75klgRSZ6Y2A xen/include/asm-x86/regs.h

     2.1 --- a/xen/arch/x86/setup.c	Tue May 10 10:02:28 2005 +0000
     2.2 +++ b/xen/arch/x86/setup.c	Tue May 10 10:52:14 2005 +0000
     2.3 @@ -341,12 +341,8 @@ static void __init do_initcalls(void)
     2.4          (*call)();
     2.5  }
     2.6  
     2.7 -unsigned long pci_mem_start = 0x10000000;
     2.8 -
     2.9  static void __init start_of_day(void)
    2.10  {
    2.11 -    unsigned long low_mem_size;
    2.12 -    
    2.13  #ifdef MEMORY_GUARD
    2.14      /* Unmap the first page of CPU0's stack. */
    2.15      extern unsigned long cpu0_stack[];
    2.16 @@ -362,10 +358,6 @@ static void __init start_of_day(void)
    2.17  
    2.18      arch_do_createdomain(current);
    2.19  
    2.20 -    /* Tell the PCI layer not to allocate too close to the RAM area.. */
    2.21 -    low_mem_size = ((max_page << PAGE_SHIFT) + 0xfffff) & ~0xfffff;
    2.22 -    if ( low_mem_size > pci_mem_start ) pci_mem_start = low_mem_size;
    2.23 -    
    2.24      identify_cpu(&boot_cpu_data); /* get CPU type info */
    2.25      if ( cpu_has_fxsr ) set_in_cr4(X86_CR4_OSFXSR);
    2.26      if ( cpu_has_xmm )  set_in_cr4(X86_CR4_OSXMMEXCPT);

     3.1 --- a/xen/include/asm-x86/pci.h	Tue May 10 10:02:28 2005 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,35 +0,0 @@
     3.4 -#ifndef __X86_PCI_H
     3.5 -#define __X86_PCI_H
     3.6 -
     3.7 -#include <xen/config.h>
     3.8 -
     3.9 -/* Can be used to override the logic in pci_scan_bus for skipping
    3.10 -   already-configured bus numbers - to be used for buggy BIOSes
    3.11 -   or architectures with incomplete PCI setup by the loader */
    3.12 -
    3.13 -#ifdef CONFIG_PCI
    3.14 -extern unsigned int pcibios_assign_all_busses(void);
    3.15 -#else
    3.16 -#define pcibios_assign_all_busses()	0
    3.17 -#endif
    3.18 -#define pcibios_scan_all_fns(a,b)	0
    3.19 -
    3.20 -extern unsigned long pci_mem_start;
    3.21 -#define PCIBIOS_MIN_IO		0x1000
    3.22 -#define PCIBIOS_MIN_MEM		(pci_mem_start)
    3.23 -
    3.24 -void pcibios_config_init(void);
    3.25 -struct pci_bus * pcibios_scan_root(int bus);
    3.26 -extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value);
    3.27 -extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value);
    3.28 -
    3.29 -void pcibios_set_master(struct pci_dev *dev);
    3.30 -void pcibios_penalize_isa_irq(int irq);
    3.31 -struct irq_routing_table *pcibios_get_irq_routing_table(void);
    3.32 -int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
    3.33 -
    3.34 -#include <xen/types.h>
    3.35 -#include <xen/slab.h>
    3.36 -#include <asm/io.h>
    3.37 -
    3.38 -#endif /* __X86_PCI_H */

     4.1 --- a/xen/include/xen/pci.h	Tue May 10 10:02:28 2005 +0000
     4.2 +++ b/xen/include/xen/pci.h	Tue May 10 10:52:14 2005 +0000
     4.3 @@ -678,10 +678,6 @@ void pci_pool_free (struct pci_pool *poo
     4.4  
     4.5  #endif /* CONFIG_PCI */
     4.6  
     4.7 -/* Include architecture-dependent settings and functions */
     4.8 -
     4.9 -#include <asm/pci.h>
    4.10 -
    4.11  /*
    4.12   *  If the system does not have PCI, clearly these return errors.  Define
    4.13   *  these as simple inline functions to avoid hair in drivers.