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

Commit db55947d authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/uprobes: fix compile for !KPROBES 



Fix the following compile error(s) if CONFIG_KPROBES is disabled:

arch/s390/kernel/uprobes.c:79:14:
 error: implicit declaration of function 'probe_get_fixup_type'
arch/s390/kernel/uprobes.c:87:14:
 error: 'FIXUP_PSW_NORMAL' undeclared (first use in this function)

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 085b6ba0

arch/s390/include/asm/dis.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ static inline int insn_length(unsigned char code) 
	return ((((int) code + 64) >> 7) + 1) << 1;

}



struct pt_regs;



void show_code(struct pt_regs *regs);

void print_fn_code(unsigned char *code, unsigned long len);

int insn_to_mnemonic(unsigned char *instruction, char *buf, unsigned int len);

arch/s390/include/asm/kprobes.h

+10 −10
Original line number Diff line number Diff line
@@ -27,12 +27,21 @@ 
 * 2005-Dec	Used as a template for s390 by Mike Grundy

 *		<grundym@us.ibm.com>

 */

#include <linux/types.h>

#include <asm-generic/kprobes.h>



#define BREAKPOINT_INSTRUCTION	0x0002



#define FIXUP_PSW_NORMAL	0x08

#define FIXUP_BRANCH_NOT_TAKEN	0x04

#define FIXUP_RETURN_REGISTER	0x02

#define FIXUP_NOT_REQUIRED	0x01



int probe_is_prohibited_opcode(u16 *insn);

int probe_get_fixup_type(u16 *insn);

int probe_is_insn_relative_long(u16 *insn);



#ifdef CONFIG_KPROBES

#include <linux/types.h>

#include <linux/ptrace.h>

#include <linux/percpu.h>

#include <linux/sched/task_stack.h>
@@ -56,11 +65,6 @@ typedef u16 kprobe_opcode_t; 


#define KPROBE_SWAP_INST	0x10



#define FIXUP_PSW_NORMAL	0x08

#define FIXUP_BRANCH_NOT_TAKEN	0x04

#define FIXUP_RETURN_REGISTER	0x02

#define FIXUP_NOT_REQUIRED	0x01



/* Architecture specific copy of original instruction */

struct arch_specific_insn {

	/* copy of original instruction */
@@ -90,10 +94,6 @@ int kprobe_fault_handler(struct pt_regs *regs, int trapnr); 
int kprobe_exceptions_notify(struct notifier_block *self,

	unsigned long val, void *data);



int probe_is_prohibited_opcode(u16 *insn);

int probe_get_fixup_type(u16 *insn);

int probe_is_insn_relative_long(u16 *insn);



#define flush_insn_slot(p)	do { } while (0)



#endif /* CONFIG_KPROBES */

arch/s390/lib/probes.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *    Copyright IBM Corp. 2014

 */



#include <linux/errno.h>

#include <asm/kprobes.h>

#include <asm/dis.h>