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

Commit 8778beb9 authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Linus Torvalds
Browse files

h8300 trival patches 



- warning fix.
- call trace area check fix.
- There is no meaning, ' & ' it deletes

Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5a9a62bb

arch/h8300/kernel/sys_h8300.c

+2 −2
Original line number Diff line number Diff line
@@ -288,9 +288,9 @@ asmlinkage void syscall_print(void *dummy,...) 
int kernel_execve(const char *filename, char *const argv[], char *const envp[])

{

	register long res __asm__("er0");

	register char *const *_c __asm__("er3") = envp;

	register char *const *_b __asm__("er2") = argv;

	register const char * _a __asm__("er1") = filename;

	register void *_b __asm__("er2") = argv;

	register void *_c __asm__("er3") = envp;

	__asm__ __volatile__ ("mov.l %1,er0\n\t"

			"trapa	#0\n\t"

			: "=r" (res)

arch/h8300/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ void show_stack(struct task_struct *task, unsigned long *esp) 
	printk("\nCall Trace:");

	i = 0;

	stack = esp;

	while (((unsigned long)stack & (THREAD_SIZE - 1)) == 0) {

	while (((unsigned long)stack & (THREAD_SIZE - 1)) != 0) {

		addr = *stack++;

		/*

		 * If the address is either in the text segment of the

include/asm-h8300/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct thread_struct { 
do {							        \

	set_fs(USER_DS);           /* reads from user space */  \

  	(_regs)->pc = (_pc);				        \

	(_regs)->ccr &= 0x00;	   /* clear kernel flag */      \

	(_regs)->ccr = 0x00;	   /* clear all flags */        \

	(_regs)->er5 = current->mm->start_data;	/* GOT base */  \

	wrusp((unsigned long)(_usp) - sizeof(unsigned long)*3);	\

} while(0)