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 /arch | |
| parent | Merge tag 'for-4.17-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux (diff) | |
| parent | parisc: Move ccio_cujo20_fixup() into init section (diff) | |
| download | linux-dev-6fd5a36a46c0caf288f3acd90d608ffefa17f234.tar.xz linux-dev-6fd5a36a46c0caf288f3acd90d608ffefa17f234.zip | |
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 'arch')
| -rw-r--r-- | arch/parisc/kernel/drivers.c | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/smp.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index ee5a78a151a6..e0e1c9775c32 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c @@ -268,7 +268,7 @@ static struct parisc_device *find_device_by_addr(unsigned long hpa) * Walks up the device tree looking for a device of the specified type. * If it finds it, it returns it. If not, it returns NULL. */ -const struct parisc_device * __init +const struct parisc_device * find_pa_parent_type(const struct parisc_device *padev, int type) { const struct device *dev = &padev->dev; diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 4065b5e48c9d..5e26dbede5fc 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c @@ -423,8 +423,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) } #ifdef CONFIG_PROC_FS -int __init -setup_profiling_timer(unsigned int multiplier) +int setup_profiling_timer(unsigned int multiplier) { return -EINVAL; } |