patch-2.1.37 linux/drivers/pci/pci.c

• Lines: 52
• Date: Mon May 12 10:35:42 1997
• Orig file: v2.1.36/linux/drivers/pci/pci.c
• Orig date: Wed Apr 23 19:01:21 1997

diff -u --recursive --new-file v2.1.36/linux/drivers/pci/pci.c linux/drivers/pci/pci.c
@@ -13,6 +13,7 @@
 #include <linux/bios32.h>
 #include <linux/pci.h>
 #include <linux/string.h>
+#include <linux/init.h>
 
 #include <asm/page.h>
 
@@ -576,8 +577,8 @@
 /*
  * Turn on/off PCI bridge optimization. This should allow benchmarking.
  */
-static void burst_bridge(unsigned char bus, unsigned char devfn,
-			 unsigned char pos, int turn_on)
+__initfunc(static void burst_bridge(unsigned char bus, unsigned char devfn,
+				    unsigned char pos, int turn_on))
 {
 #ifdef CONFIG_PCI_OPTIMIZE
 	struct bridge_mapping_type *bmap;
@@ -791,7 +792,7 @@
  * pci_malloc() returns initialized memory of size SIZE.  Can be
  * used only while pci_init() is active.
  */
-static void *pci_malloc(long size, unsigned long *mem_startp)
+__initfunc(static void *pci_malloc(long size, unsigned long *mem_startp))
 {
 	void *mem;
 
@@ -805,7 +806,7 @@
 }
 
 
-static unsigned int scan_bus(struct pci_bus *bus, unsigned long *mem_startp)
+__initfunc(static unsigned int scan_bus(struct pci_bus *bus, unsigned long *mem_startp))
 {
 	unsigned int devfn, l, max;
 	unsigned char cmd, tmp, hdr_type = 0;
@@ -980,12 +981,12 @@
 }
 
 
-unsigned long pci_init (unsigned long mem_start, unsigned long mem_end)
+__initfunc(unsigned long pci_init (unsigned long mem_start, unsigned long mem_end))
 {
 	mem_start = pcibios_init(mem_start, mem_end);
 
 	if (!pcibios_present()) {
-		printk("pci_init: no BIOS32 detected\n");
+		printk("pci_init: no PCI BIOS detected\n");
 		return mem_start;
 	}