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

Commit ad5e427e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull parisc fixes from Helge Deller:

 - Fix build issues when kprobes are enabled

 - Speed up ITLB/DTLB cache flushes when running on machines with
   combined TLBs

* 'parisc-5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Flush ITLB in flush_tlb_all_local() only on split TLB machines
  parisc: add kprobe_fault_handler()
parents 7b5cf701 69245c97

arch/parisc/include/asm/kprobes.h

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ struct kprobe_ctlblk { 


int __kprobes parisc_kprobe_break_handler(struct pt_regs *regs);

int __kprobes parisc_kprobe_ss_handler(struct pt_regs *regs);

static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)

{

	return 0;

}



#endif /* CONFIG_KPROBES */

#endif /* _PARISC_KPROBES_H */

arch/parisc/kernel/pacache.S

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ ENTRY_CFI(flush_tlb_all_local) 


	/* Flush Instruction Tlb */



	LDREG		ITLB_SID_BASE(%r1), %r20

88:	LDREG		ITLB_SID_BASE(%r1), %r20

	LDREG		ITLB_SID_STRIDE(%r1), %r21

	LDREG		ITLB_SID_COUNT(%r1), %r22

	LDREG		ITLB_OFF_BASE(%r1), %arg0
@@ -103,6 +103,7 @@ fitonemiddle: /* Loop if LOOP = 1 */ 
	add		%r21, %r20, %r20		/* increment space */



fitdone:

	ALTERNATIVE(88b, fitdone, ALT_COND_NO_SPLIT_TLB, INSN_NOP)



	/* Flush Data Tlb */