diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-20 12:44:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-20 12:44:07 -0700 |
| commit | 6fd5a36a46c0caf288f3acd90d608ffefa17f234 (patch) | |
| tree | 14b815741e2c944545a62f1aa7d0a2fd4f760c2c /drivers | |
| parent | e5e03ad9e0f04cb3f478b914a3bf9c8f77ee9e94 (diff) | |
| parent | 8a922814ccfed70d35a725f47c0bf12b50fd223c (diff) | |
Merge branch 'parisc-4.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixlets from Helge Deller:
"Three small section mismatch fixes, one of them was found by 0-day
test infrastructure"
* 'parisc-4.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Move ccio_cujo20_fixup() into init section
parisc: Move setup_profiling_timer() out of init section
parisc: Move find_pa_parent_type() out of init section
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/ccio-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 126cf19e869b..297599fcbc32 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c @@ -1195,7 +1195,7 @@ void * ccio_get_iommu(const struct parisc_device *dev) * to/from certain pages. To avoid this happening, we mark these pages * as `used', and ensure that nothing will try to allocate from them. */ -void ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp) +void __init ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp) { unsigned int idx; struct parisc_device *dev = parisc_parent(cujo); |