Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+3 -4
+1 -1
arch/parisc/kernel/drivers.c
··· 268 268 * Walks up the device tree looking for a device of the specified type. 269 269 * If it finds it, it returns it. If not, it returns NULL. 270 270 */ 271 - const struct parisc_device * __init 271 + const struct parisc_device * 272 272 find_pa_parent_type(const struct parisc_device *padev, int type) 273 273 { 274 274 const struct device *dev = &padev->dev;
+1 -2
arch/parisc/kernel/smp.c
··· 423 423 } 424 424 425 425 #ifdef CONFIG_PROC_FS 426 - int __init 427 - setup_profiling_timer(unsigned int multiplier) 426 + int setup_profiling_timer(unsigned int multiplier) 428 427 { 429 428 return -EINVAL; 430 429 }
+1 -1
drivers/parisc/ccio-dma.c
··· 1195 1195 * to/from certain pages. To avoid this happening, we mark these pages 1196 1196 * as `used', and ensure that nothing will try to allocate from them. 1197 1197 */ 1198 - void ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp) 1198 + void __init ccio_cujo20_fixup(struct parisc_device *cujo, u32 iovp) 1199 1199 { 1200 1200 unsigned int idx; 1201 1201 struct parisc_device *dev = parisc_parent(cujo);