Commit 76c057c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fixes from Helge Deller:
 "Two small fixes:

   - Fix linking error with 64-bit kernel when modules are disabled,
     reported by kernel test robot

   - Remove leftover reference to power_tasklet, by Davidlohr Bueso"

* 'parisc-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Enable -mlong-calls gcc option by default when !CONFIG_MODULES
  parisc: Remove leftover reference to the power_tasklet
parents 2ab38c17 00e35f2b

arch/parisc/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -202,9 +202,8 @@ config PREFETCH 
	depends on PA8X00 || PA7200



config MLONGCALLS

	bool "Enable the -mlong-calls compiler option for big kernels"

	default y if !MODULES || UBSAN || FTRACE

	default n

	def_bool y if !MODULES || UBSAN || FTRACE

	bool "Enable the -mlong-calls compiler option for big kernels" if MODULES && !UBSAN && !FTRACE

	depends on PA8X00

	help

	  If you configure the kernel to include many drivers built-in instead

arch/parisc/include/asm/irq.h

+0 −3
Original line number Diff line number Diff line
@@ -47,7 +47,4 @@ extern unsigned long txn_affinity_addr(unsigned int irq, int cpu); 
extern int cpu_claim_irq(unsigned int irq, struct irq_chip *, void *);

extern int cpu_check_affinity(struct irq_data *d, const struct cpumask *dest);



/* soft power switch support (power.c) */

extern struct tasklet_struct power_tasklet;



#endif	/* _ASM_PARISC_IRQ_H */

arch/parisc/kernel/entry.S

+10 −3
Original line number Diff line number Diff line
@@ -997,10 +997,17 @@ intr_do_preempt: 
	bb,<,n	%r20, 31 - PSW_SM_I, intr_restore

	nop



	/* ssm PSW_SM_I done later in intr_restore */

#ifdef CONFIG_MLONGCALLS

	ldil	L%intr_restore, %r2

	load32	preempt_schedule_irq, %r1

	bv	%r0(%r1)

	ldo	R%intr_restore(%r2), %r2

#else

	ldil	L%intr_restore, %r1

	BL	preempt_schedule_irq, %r2

	nop



	b,n	intr_restore		/* ssm PSW_SM_I done by intr_restore */

	ldo	R%intr_restore(%r1), %r2

#endif

#endif /* CONFIG_PREEMPTION */



	/*