git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
sparc64
/
kernel
/
pci_psycho.c
diff --git
a/arch/sparc64/kernel/pci_psycho.c
b/arch/sparc64/kernel/pci_psycho.c
index
41fe099
..
534320e
100644
(file)
--- a/
arch/sparc64/kernel/pci_psycho.c
+++ b/
arch/sparc64/kernel/pci_psycho.c
@@
-1133,7
+1133,7
@@
static void __init psycho_base_address_update(struct pci_dev *pdev, int resource
(((u32)(res->start - root->start)) & ~size));
if (resource == PCI_ROM_RESOURCE) {
reg |= PCI_ROM_ADDRESS_ENABLE;
(((u32)(res->start - root->start)) & ~size));
if (resource == PCI_ROM_RESOURCE) {
reg |= PCI_ROM_ADDRESS_ENABLE;
- res->flags |=
PCI_ROM_ADDRESS
_ENABLE;
+ res->flags |=
IORESOURCE_ROM
_ENABLE;
}
pci_write_config_dword(pdev, where, reg);
}
pci_write_config_dword(pdev, where, reg);
@@
-1212,7
+1212,7
@@
static void __init psycho_iommu_init(struct pci_controller_info *p)
/* Setup initial software IOMMU state. */
spin_lock_init(&iommu->lock);
/* Setup initial software IOMMU state. */
spin_lock_init(&iommu->lock);
- iommu->
iommu_cur_ctx = 0
;
+ iommu->
ctx_lowest_free = 1
;
/* Register addresses. */
iommu->iommu_control = p->pbm_A.controller_regs + PSYCHO_IOMMU_CONTROL;
/* Register addresses. */
iommu->iommu_control = p->pbm_A.controller_regs + PSYCHO_IOMMU_CONTROL;