diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-06 18:31:36 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-06 18:31:36 +0300 |
| commit | d2ce98ca0a192e1bcb89068adfe6cb736f5e351c (patch) | |
| tree | 888ccaba7b3e09bf4b81324dff38a65f5667296c /drivers/of/base.c | |
| parent | 85eae57bbb0612387201635659be543aaac2109e (diff) | |
| parent | d72e90f33aa4709ebecc5005562f52335e106a60 (diff) | |
| download | linux-d2ce98ca0a192e1bcb89068adfe6cb736f5e351c.tar.xz | |
Merge tag 'v4.18-rc6' into HEAD
Pull bug fixes into the KVM development tree to avoid nasty conflicts.
Diffstat (limited to 'drivers/of/base.c')
| -rw-r--r-- | drivers/of/base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 848f549164cd..466e3c8582f0 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -102,7 +102,7 @@ static u32 phandle_cache_mask; * - the phandle lookup overhead reduction provided by the cache * will likely be less */ -static void of_populate_phandle_cache(void) +void of_populate_phandle_cache(void) { unsigned long flags; u32 cache_entries; @@ -134,8 +134,7 @@ out: raw_spin_unlock_irqrestore(&devtree_lock, flags); } -#ifndef CONFIG_MODULES -static int __init of_free_phandle_cache(void) +int of_free_phandle_cache(void) { unsigned long flags; @@ -148,6 +147,7 @@ static int __init of_free_phandle_cache(void) return 0; } +#if !defined(CONFIG_MODULES) late_initcall_sync(of_free_phandle_cache); #endif |