Skip to content

Commit 6fd5a36

Browse files
committed
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
2 parents e5e03ad + 8a92281 commit 6fd5a36

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

arch/parisc/kernel/drivers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ static struct parisc_device *find_device_by_addr(unsigned long hpa)
268268
* Walks up the device tree looking for a device of the specified type.
269269
* If it finds it, it returns it. If not, it returns NULL.
270270
*/
271-
const struct parisc_device * __init
271+
const struct parisc_device *
272272
find_pa_parent_type(const struct parisc_device *padev, int type)
273273
{
274274
const struct device *dev = &padev->dev;

arch/parisc/kernel/smp.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)
423423
}
424424

425425
#ifdef CONFIG_PROC_FS
426-
int __init
427-
setup_profiling_timer(unsigned int multiplier)
426+
int setup_profiling_timer(unsigned int multiplier)
428427
{
429428
return -EINVAL;
430429
}

drivers/parisc/ccio-dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ void * ccio_get_iommu(const struct parisc_device *dev)
11951195
* to/from certain pages. To avoid this happening, we mark these pages
11961196
* as `used', and ensure that nothing will try to allocate from them.
11971197
*/
1198-
void ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp)
1198+
void __init ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp)
11991199
{
12001200
unsigned int idx;
12011201
struct parisc_device *dev = parisc_parent(cujo);

0 commit comments

Comments
 (0)