diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-06 13:49:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-06 13:49:25 -0700 |
commit | 311da4975894aab7a4bb94aa83f38f052d7ffda4 (patch) | |
tree | 4de18b9cbeac4f21ed2aa7c8ec0ae515a56f368c /drivers/amba/bus.c | |
parent | ca95bf62fcf528a0d8069731d39303ba43fb9af4 (diff) | |
parent | 0ac000e86703dedea1000513dbb8a64d02930668 (diff) | |
download | linux-311da4975894aab7a4bb94aa83f38f052d7ffda4.tar.gz |
Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM updates from Russell King: - Initial round of Spectre variant 1 and variant 2 fixes for 32-bit ARM - Clang support improvements - nommu updates for v8 MPU - enable ARM_MODULE_PLTS by default to avoid problems loading modules with larger kernels - vmlinux.lds and dma-mapping cleanups * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (31 commits) ARM: spectre-v1: fix syscall entry ARM: spectre-v1: add array_index_mask_nospec() implementation ARM: spectre-v1: add speculation barrier (csdb) macros ARM: KVM: report support for SMCCC_ARCH_WORKAROUND_1 ARM: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling ARM: spectre-v2: KVM: invalidate icache on guest exit for Brahma B15 ARM: KVM: invalidate icache on guest exit for Cortex-A15 ARM: KVM: invalidate BTB on guest exit for Cortex-A12/A17 ARM: spectre-v2: warn about incorrect context switching functions ARM: spectre-v2: add firmware based hardening ARM: spectre-v2: harden user aborts in kernel space ARM: spectre-v2: add Cortex A8 and A15 validation of the IBE bit ARM: spectre-v2: harden branch predictor on context switches ARM: spectre: add Kconfig symbol for CPUs vulnerable to Spectre ARM: bugs: add support for per-processor bug checking ARM: bugs: hook processor bug checking into SMP and suspend paths ARM: bugs: prepare processor bug infrastructure ARM: add more CPU part numbers for Cortex and Brahma B15 CPUs ARM: 8774/1: remove no-op macro VMLINUX_SYMBOL() ARM: 8773/1: amba: Export amba_bustype ...
Diffstat (limited to 'drivers/amba/bus.c')
-rw-r--r-- | drivers/amba/bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 3ece711a6a17..41b706403ef7 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -205,6 +205,7 @@ struct bus_type amba_bustype = { .dma_configure = platform_dma_configure, .pm = &amba_pm, }; +EXPORT_SYMBOL_GPL(amba_bustype); static int __init amba_init(void) { |