Re: [BK PATCH] PCI reorg changes for 2.5.14

[Ivan Kokshaysky]

On Mon, May 06, 2002 at 03:25:07PM -0700, Greg KH wrote:
> Here is a series of changesets that reorganize the core and i386 PCI
> files.  It splits the current big files up into smaller pieces,
> according to the different function and platform type (removing lots of
> #ifdefs in the process.)  Pat Mochel did 99.9% of this work, and I've
> tested it out and forward ported it to your most recent kernel version.

There are missing #includes which will break compilation on some non-x86
platforms. With following patch this compiles and works on alpha.

Ivan.

--- 2.5.14-reorg/arch/alpha/kernel/pci.c	Tue May  7 18:38:42 2002
+++ linux/arch/alpha/kernel/pci.c	Tue May  7 19:40:04 2002
@@ -193,13 +193,15 @@ pcibios_align_resource(void *data, struc
 #undef MB
 #undef GB
 
-void __init
+static void __init
 pcibios_init(void)
 {
 	if (!alpha_mv.init_pci)
 		return;
 	alpha_mv.init_pci();
 }
+
+subsys_initcall(pcibios_init);
 
 char * __init
 pcibios_setup(char *str)
--- 2.5.14-reorg/drivers/pci/probe.c	Tue May  7 18:15:54 2002
+++ linux/drivers/pci/probe.c	Tue May  7 19:02:38 2002
@@ -2,7 +2,9 @@
  * probe.c - PCI detection and setup code
  */
 
+#include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 
 #undef DEBUG
--- 2.5.14-reorg/drivers/pci/pci.c	Tue May  7 18:15:54 2002
+++ linux/drivers/pci/pci.c	Tue May  7 19:05:28 2002
@@ -9,6 +9,8 @@
  *	Copyright 1997 -- 2000 Martin Mares <[e-mail]>
  */
 
+#include <linux/delay.h>
+#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
--- 2.5.14-reorg/drivers/pci/pool.c	Tue May  7 19:07:51 2002
+++ linux/drivers/pci/pool.c	Tue May  7 19:07:15 2002
@@ -1,4 +1,5 @@
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 
 /*
--- 2.5.14-reorg/drivers/pci/proc.c	Tue May  7 18:15:54 2002
+++ linux/drivers/pci/proc.c	Tue May  7 19:09:13 2002
@@ -6,6 +6,7 @@
  *	Copyright (c) 1997--1999 Martin Mares <[e-mail]>
  */
 
+#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>