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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
pci
/
bios.c
diff --git
a/arch/cris/arch-v32/drivers/pci/bios.c
b/arch/cris/arch-v32/drivers/pci/bios.c
index
24bc149
..
a2b9c60
100644
(file)
--- a/
arch/cris/arch-v32/drivers/pci/bios.c
+++ b/
arch/cris/arch-v32/drivers/pci/bios.c
@@
-27,8
+27,6
@@
int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
/* Leave vm_pgoff as-is, the PCI space address is the physical
* address on this platform.
*/
/* Leave vm_pgoff as-is, the PCI space address is the physical
* address on this platform.
*/
- vma->vm_flags |= (VM_SHM | VM_LOCKED | VM_IO);
-
prot = pgprot_val(vma->vm_page_prot);
vma->vm_page_prot = __pgprot(prot);
prot = pgprot_val(vma->vm_page_prot);
vma->vm_page_prot = __pgprot(prot);
@@
-45,10
+43,10
@@
int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
void
pcibios_align_resource(void *data, struct resource *res,
void
pcibios_align_resource(void *data, struct resource *res,
-
unsigned long size, unsigned long
align)
+
resource_size_t size, resource_size_t
align)
{
if (res->flags & IORESOURCE_IO) {
{
if (res->flags & IORESOURCE_IO) {
-
unsigned long
start = res->start;
+
resource_size_t
start = res->start;
if (start & 0x300) {
start = (start + 0x3ff) & ~0x3ff;
if (start & 0x300) {
start = (start + 0x3ff) & ~0x3ff;