Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fd5a36a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e5e03ad9 8a922814

arch/parisc/kernel/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/parisc/kernel/smp.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/parisc/ccio-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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);