korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 02:34:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: mvebu: coherency: fix registration of PCI bus notifier when !PCI

Browse Source 
Commit b0063aad5d ("ARM: mvebu: use hardware I/O coherency also for
PCI devices") added a reference to the pci_bus_type variable, but this
variable is only available when CONFIG_PCI is enabled. Therefore,
there is now a build failure in !CONFIG_PCI situations.

This commit fixes that by enclosing the entire initcall into a
IS_ENABLED(CONFIG_PCI) condition.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1400598783-706-1-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Thomas Petazzoni 2014-05-20 17:13:03 +02:00 committed by Jason Cooper
parent 497a92308a
commit 8828ccc3f2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-mvebu/coherency.c
View File

@ -422,6 +422,7 @@ static int __init coherency_late_init(void)
postcore_initcall(coherency_late_init); postcore_initcall(coherency_late_init);
#if IS_ENABLED(CONFIG_PCI)
static int __init coherency_pci_init(void) static int __init coherency_pci_init(void)
{ {
if (coherency_available()) if (coherency_available())
@ -431,3 +432,4 @@ static int __init coherency_pci_init(void)
} }
arch_initcall(coherency_pci_init); arch_initcall(coherency_pci_init);
#endif