diff options
Diffstat (limited to 'arch/alpha/kernel')
-rw-r--r-- | arch/alpha/kernel/pci.c | 16 | ||||
-rw-r--r-- | arch/alpha/kernel/systbls.S | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 1f36bbd0ed5d..2a8b364c822e 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c | |||
@@ -350,8 +350,24 @@ pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, | |||
350 | region->end = res->end - offset; | 350 | region->end = res->end - offset; |
351 | } | 351 | } |
352 | 352 | ||
353 | void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | ||
354 | struct pci_bus_region *region) | ||
355 | { | ||
356 | struct pci_controller *hose = (struct pci_controller *)dev->sysdata; | ||
357 | unsigned long offset = 0; | ||
358 | |||
359 | if (res->flags & IORESOURCE_IO) | ||
360 | offset = hose->io_space->start; | ||
361 | else if (res->flags & IORESOURCE_MEM) | ||
362 | offset = hose->mem_space->start; | ||
363 | |||
364 | res->start = region->start + offset; | ||
365 | res->end = region->end + offset; | ||
366 | } | ||
367 | |||
353 | #ifdef CONFIG_HOTPLUG | 368 | #ifdef CONFIG_HOTPLUG |
354 | EXPORT_SYMBOL(pcibios_resource_to_bus); | 369 | EXPORT_SYMBOL(pcibios_resource_to_bus); |
370 | EXPORT_SYMBOL(pcibios_bus_to_resource); | ||
355 | #endif | 371 | #endif |
356 | 372 | ||
357 | int | 373 | int |
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index 052120882876..4342cea1a926 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S | |||
@@ -461,6 +461,11 @@ sys_call_table: | |||
461 | .quad sys_add_key | 461 | .quad sys_add_key |
462 | .quad sys_request_key /* 440 */ | 462 | .quad sys_request_key /* 440 */ |
463 | .quad sys_keyctl | 463 | .quad sys_keyctl |
464 | .quad sys_ioprio_set | ||
465 | .quad sys_ioprio_get | ||
466 | .quad sys_inotify_init | ||
467 | .quad sys_inotify_add_watch /* 445 */ | ||
468 | .quad sys_inotify_rm_watch | ||
464 | 469 | ||
465 | .size sys_call_table, . - sys_call_table | 470 | .size sys_call_table, . - sys_call_table |
466 | .type sys_call_table, @object | 471 | .type sys_call_table, @object |