git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
pci.c
diff --git
a/arch/parisc/kernel/pci.c
b/arch/parisc/kernel/pci.c
index
88cba49
..
563df00
100644
(file)
--- a/
arch/parisc/kernel/pci.c
+++ b/
arch/parisc/kernel/pci.c
@@
-9,7
+9,6
@@
* Copyright (C) 1999-2001 Hewlett-Packard Company
* Copyright (C) 1999-2001 Grant Grundler
*/
* Copyright (C) 1999-2001 Hewlett-Packard Company
* Copyright (C) 1999-2001 Grant Grundler
*/
-#include <linux/config.h>
#include <linux/eisa.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/eisa.h>
#include <linux/init.h>
#include <linux/module.h>
@@
-47,18
+46,17
@@
* this makes the boot time much longer than necessary.
* 20ms seems to work for all the HP PCI implementations to date.
*
* this makes the boot time much longer than necessary.
* 20ms seems to work for all the HP PCI implementations to date.
*
- *
XXX: turn into a #defined constant in <asm/pci.h> ?
+ *
#define pci_post_reset_delay 50
*/
*/
-int pci_post_reset_delay = 50;
-struct pci_port_ops *pci_port;
-struct pci_bios_ops *pci_bios;
+struct pci_port_ops *pci_port
__read_mostly
;
+struct pci_bios_ops *pci_bios
__read_mostly
;
-
int pci_hba_count = 0
;
+
static int pci_hba_count __read_mostly
;
/* parisc_pci_hba used by pci_port->in/out() ops to lookup bus data. */
#define PCI_HBA_MAX 32
/* parisc_pci_hba used by pci_port->in/out() ops to lookup bus data. */
#define PCI_HBA_MAX 32
-st
ruct pci_hba_data *parisc_pci_hba[PCI_HBA_MAX]
;
+st
atic struct pci_hba_data *parisc_pci_hba[PCI_HBA_MAX] __read_mostly
;
/********************************************************************
/********************************************************************
@@
-202,8
+200,8
@@
static void
pcibios_link_hba_resources( struct resource *hba_res, struct resource *r)
{
if (!r->parent) {
pcibios_link_hba_resources( struct resource *hba_res, struct resource *r)
{
if (!r->parent) {
- printk(KERN_EMERG "PCI: resource not parented! [%
lx-%lx
]\n",
-
r->start,
r->end);
+ printk(KERN_EMERG "PCI: resource not parented! [%
p-%p
]\n",
+
(void*) r->start, (void*)
r->end);
r->parent = hba_res;
/* reverse link is harder *sigh* */
r->parent = hba_res;
/* reverse link is harder *sigh* */
@@
-259,8
+257,10
@@
void __devinit pcibios_resource_to_bus(struct pci_dev *dev,
void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
struct pci_bus_region *region)
{
void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
struct pci_bus_region *region)
{
+#ifdef CONFIG_64BIT
struct pci_bus *bus = dev->bus;
struct pci_hba_data *hba = HBA_DATA(bus->bridge->platform_data);
struct pci_bus *bus = dev->bus;
struct pci_hba_data *hba = HBA_DATA(bus->bridge->platform_data);
+#endif
if (res->flags & IORESOURCE_MEM) {
res->start = PCI_HOST_ADDR(hba, region->start);
if (res->flags & IORESOURCE_MEM) {
res->start = PCI_HOST_ADDR(hba, region->start);
@@
-288,9
+288,9
@@
EXPORT_SYMBOL(pcibios_bus_to_resource);
* than res->start.
*/
void pcibios_align_resource(void *data, struct resource *res,
* than res->start.
*/
void pcibios_align_resource(void *data, struct resource *res,
-
unsigned long size, unsigned long
alignment)
+
resource_size_t size, resource_size_t
alignment)
{
{
-
unsigned long
mask, align;
+
resource_size_t
mask, align;
DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n",
pci_name(((struct pci_dev *) data)),
DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n",
pci_name(((struct pci_dev *) data)),