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

Commit cfa0f29b authored Jan 12, 2006 by Al Viro Committed by Linus Torvalds Jan 12, 2006

[PATCH] cris: fix KSTK_EIP



cris KSTK_EIP looked for pt_regs at the right offset but from the wrong
place - forgotten ->thread_info

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 95ca0dc6

include/asm-cris/arch-v10/processor.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ struct thread_struct {
	#define KSTK_EIP(tsk) \		#define KSTK_EIP(tsk) \
	({ \		({ \
	unsigned long eip = 0; \		unsigned long eip = 0; \
	unsigned long regs = (unsigned long)user_regs(tsk); \		unsigned long regs = (unsigned long)task_pt_regs(tsk); \
	if (regs > PAGE_SIZE && \		if (regs > PAGE_SIZE && \
	virt_addr_valid(regs)) \		virt_addr_valid(regs)) \
	eip = ((struct pt_regs *)regs)->irp; \		eip = ((struct pt_regs *)regs)->irp; \

include/asm-cris/arch-v32/processor.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@ struct thread_struct {
	#define KSTK_EIP(tsk) \		#define KSTK_EIP(tsk) \
	({ \		({ \
	unsigned long eip = 0; \		unsigned long eip = 0; \
	unsigned long regs = (unsigned long)user_regs(tsk); \		unsigned long regs = (unsigned long)task_pt_regs(tsk); \
	if (regs > PAGE_SIZE && virt_addr_valid(regs)) \		if (regs > PAGE_SIZE && virt_addr_valid(regs)) \
	eip = ((struct pt_regs *)regs)->erp; \		eip = ((struct pt_regs *)regs)->erp; \
	eip; \		eip; \