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

Commit ac3efab5 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: Rename kernel_mode to pt_mode in pt_regs 



Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent ceb8944b

arch/microblaze/include/asm/processor.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ static inline void start_thread(struct pt_regs *regs, 
{

{

	regs->pc = pc;

	regs->pc = pc;

	regs->r1 = usp;

	regs->r1 = usp;

	regs->kernel_mode = 0;

	regs->pt_mode = 0;

}

}





/* Free all resources held by a thread. */

/* Free all resources held by a thread. */

arch/microblaze/include/asm/ptrace.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -52,10 +52,10 @@ struct pt_regs { 
	microblaze_reg_t ear;

	microblaze_reg_t ear;

	microblaze_reg_t esr;

	microblaze_reg_t esr;

	microblaze_reg_t fsr;

	microblaze_reg_t fsr;

	int kernel_mode;

	int pt_mode;

};

};





#define kernel_mode(regs)		((regs)->kernel_mode)

#define kernel_mode(regs)		((regs)->pt_mode)

#define user_mode(regs)			(!kernel_mode(regs))

#define user_mode(regs)			(!kernel_mode(regs))





#define instruction_pointer(regs)	((regs)->pc)

#define instruction_pointer(regs)	((regs)->pc)

arch/microblaze/kernel/asm-offsets.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ int main(int argc, char *argv[]) 
	DEFINE(PT_R29, offsetof(struct pt_regs, r29));

	DEFINE(PT_R29, offsetof(struct pt_regs, r29));

	DEFINE(PT_R30, offsetof(struct pt_regs, r30));

	DEFINE(PT_R30, offsetof(struct pt_regs, r30));

	DEFINE(PT_R31, offsetof(struct pt_regs, r31));

	DEFINE(PT_R31, offsetof(struct pt_regs, r31));

	DEFINE(PT_MODE, offsetof(struct pt_regs, kernel_mode));

	DEFINE(PT_MODE, offsetof(struct pt_regs, pt_mode));

	BLANK();

	BLANK();





	/* Magic offsets for PTRACE PEEK/POKE etc */

	/* Magic offsets for PTRACE PEEK/POKE etc */

arch/microblaze/kernel/process.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 




void show_regs(struct pt_regs *regs)

void show_regs(struct pt_regs *regs)

{

{

	printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->kernel_mode);

	printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->pt_mode);

	printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n",

	printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n",

				regs->r1, regs->r2, regs->r3, regs->r4);

				regs->r1, regs->r2, regs->r3, regs->r4);

	printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n",

	printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n",
@@ -169,7 +169,7 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) 
	regs.r6 = (unsigned long)arg;

	regs.r6 = (unsigned long)arg;

	local_save_flags(regs.msr);

	local_save_flags(regs.msr);

	regs.pc = (unsigned long)kernel_thread_helper;

	regs.pc = (unsigned long)kernel_thread_helper;

	regs.kernel_mode = 1;

	regs.pt_mode = 1;





	ret = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,

	ret = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,

			&regs, 0, NULL, NULL);

			&regs, 0, NULL, NULL);