diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 19:19:38 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 19:19:38 +0300 |
| commit | 36b150bbcc1125abaad89963420a37ff70686d5a (patch) | |
| tree | b18a23f7914e7b9de696ed869edfee3b596ce7b8 /arch/microblaze/pci/pci-common.c | |
| parent | 84787c572d402644dca4874aba73324d9f8e3948 (diff) | |
| parent | 52e9e6e05617264e6e609a8699098380d6b7a6aa (diff) | |
| download | linux-36b150bbcc1125abaad89963420a37ff70686d5a.tar.xz | |
Merge tag 'microblaze-4.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull Microblaze updates from Michal Simek:
- Wire-up new syscalls
- Fix link error
* tag 'microblaze-4.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: pci: export isa_io_base to fix link errors
microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls
Diffstat (limited to 'arch/microblaze/pci/pci-common.c')
| -rw-r--r-- | arch/microblaze/pci/pci-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 35654be3f1c0..14cba600da7a 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -48,6 +48,8 @@ static int global_phb_number; /* Global phb counter */ resource_size_t isa_mem_base; unsigned long isa_io_base; +EXPORT_SYMBOL(isa_io_base); + static int pci_bus_count; struct pci_controller *pcibios_alloc_controller(struct device_node *dev) |