[Xen-changelog] Remove asm/pci.h.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1464.1.1, 2005/05/10 11:52:14+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Remove asm/pci.h.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 b/xen/arch/x86/setup.c    |    8 --------
 b/xen/include/xen/pci.h   |    4 ----
 xen/include/asm-x86/pci.h |   35 -----------------------------------
 3 files changed, 47 deletions(-)


diff -Nru a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      2005-05-10 07:04:55 -04:00
+++ b/xen/arch/x86/setup.c      2005-05-10 07:04:55 -04:00
@@ -341,12 +341,8 @@
         (*call)();
 }
 
-unsigned long pci_mem_start = 0x10000000;
-
 static void __init start_of_day(void)
 {
-    unsigned long low_mem_size;
-    
 #ifdef MEMORY_GUARD
     /* Unmap the first page of CPU0's stack. */
     extern unsigned long cpu0_stack[];
@@ -362,10 +358,6 @@
 
     arch_do_createdomain(current);
 
-    /* Tell the PCI layer not to allocate too close to the RAM area.. */
-    low_mem_size = ((max_page << PAGE_SHIFT) + 0xfffff) & ~0xfffff;
-    if ( low_mem_size > pci_mem_start ) pci_mem_start = low_mem_size;
-    
     identify_cpu(&boot_cpu_data); /* get CPU type info */
     if ( cpu_has_fxsr ) set_in_cr4(X86_CR4_OSFXSR);
     if ( cpu_has_xmm )  set_in_cr4(X86_CR4_OSXMMEXCPT);
diff -Nru a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h
--- a/xen/include/asm-x86/pci.h 2005-05-10 07:04:55 -04:00
+++ /dev/null   Wed Dec 31 16:00:00 196900
@@ -1,35 +0,0 @@
-#ifndef __X86_PCI_H
-#define __X86_PCI_H
-
-#include <xen/config.h>
-
-/* Can be used to override the logic in pci_scan_bus for skipping
-   already-configured bus numbers - to be used for buggy BIOSes
-   or architectures with incomplete PCI setup by the loader */
-
-#ifdef CONFIG_PCI
-extern unsigned int pcibios_assign_all_busses(void);
-#else
-#define pcibios_assign_all_busses()    0
-#endif
-#define pcibios_scan_all_fns(a,b)      0
-
-extern unsigned long pci_mem_start;
-#define PCIBIOS_MIN_IO         0x1000
-#define PCIBIOS_MIN_MEM                (pci_mem_start)
-
-void pcibios_config_init(void);
-struct pci_bus * pcibios_scan_root(int bus);
-extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int 
len, u32 *value);
-extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int 
len, u32 value);
-
-void pcibios_set_master(struct pci_dev *dev);
-void pcibios_penalize_isa_irq(int irq);
-struct irq_routing_table *pcibios_get_irq_routing_table(void);
-int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);
-
-#include <xen/types.h>
-#include <xen/slab.h>
-#include <asm/io.h>
-
-#endif /* __X86_PCI_H */
diff -Nru a/xen/include/xen/pci.h b/xen/include/xen/pci.h
--- a/xen/include/xen/pci.h     2005-05-10 07:04:55 -04:00
+++ b/xen/include/xen/pci.h     2005-05-10 07:04:55 -04:00
@@ -678,10 +678,6 @@
 
 #endif /* CONFIG_PCI */
 
-/* Include architecture-dependent settings and functions */
-
-#include <asm/pci.h>
-
 /*
  *  If the system does not have PCI, clearly these return errors.  Define
  *  these as simple inline functions to avoid hair in drivers.

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog