[PATCH} h8300 GENERIC_BUG support
CONFIG_GENERIC_BUG support.
Signed-off-by Yoshinori Sato <[email protected]>
arch/h8300/Kconfig | 4 ++++ arch/h8300/kernel/module.c | 3 ++- arch/h8300/kernel/traps.c | 17 +++++++++++------ arch/h8300/mm/fault.c | 5 ++--- include/asm-h8300/bug.h | 4 ++++ include/asm-h8300/system.h | 2 ++ 6 files changed, 25 insertions(+), 10 deletions(-)
arch/h8300/Kconfig +4 -0
@@ -62,6 +62,10 @@ config GENERIC_TIME bool default y +config GENERIC_BUG + bool + depends on BUG + config TIME_LOW_RES bool default y
arch/h8300/kernel/module.c +2 -1
@@ -114,9 +114,10 @@ int module_finalize(const Elf_Ehdr *hdr,const Elf_Shdr *sechdrs, struct module *me) { -return 0 ; + return module_bug_finalize(hdr, sechdrs, me); }void module_arch_cleanup (struct module *mod) { +module_bug_cleanup (mod); }
arch/h8300/kernel/traps.c +11 -6
@@ -20,12 +20,14 @@#include <linux/errno.h> #include <linux/init.h> #include <linux/module.h> +#include <linux/bug.h> #include <asm/system.h> #include <asm/irq.h> #include <asm/traps.h> #include <asm/page.h> -#include <asm/gpio.h> + +static DEFINE_SPINLOCK (die_lock);/* * this must be called very early as the kernel might
@@ -94,16 +96,19 @@ static void dump(struct pt_regs *fp)printk ("\n\n" ); } -void die_if_kernel (char *str,struct pt_regs *fp,int nr) +void die (char *str,struct pt_regs *fp,unsigned long err) { -extern int console_loglevel; +static int diecount =0 ; -if (!(fp->ccr &PS_S )) -return ; +oops_enter (); - console_loglevel =15 ; +console_verbose (); +spin_lock_irq (&die_lock); +report_bug (fp->pc, fp); +printk (KERN_EMERG "%s: %04lx [#%d] " , str, err &0xffff , ++diecount);dump (fp); +spin_unlock_irq (&die_lock);do_exit (SIGSEGV ); }
arch/h8300/mm/fault.c +2 -3
@@ -20,8 +20,6 @@#include <asm/system.h> #include <asm/pgtable.h> -extern void die_if_kernel (char *,struct pt_regs *,long ); -/* * This routine handles page faults. It determines the problem, and * then passes it off to one of the appropriate routines.
@@ -50,7 +48,8 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address, }else printk (KERN_ALERT "Unable to handle kernel access" );printk (" at virtual address %08lx\n" ,address); -die_if_kernel ("Oops" , regs, error_code); +if (!user_mode (regs)) +die ("Oops" , regs, error_code);do_exit (SIGKILL );return 1 ;
include/asm-h8300/bug.h +4 -0
@@ -1,4 +1,8 @@#ifndef _H8300_BUG_H#define _H8300_BUG_H + +/* always true */ +#define is_valid_bugaddr (addr) (1) +#include <asm-generic/bug.h> #endif
include/asm-h8300/system.h +2 -0
@@ -170,4 +170,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz#define arch_align_stack (x) (x) +void die (char *str,struct pt_regs *fp,unsigned long err); +#endif /* _H8300_SYSTEM_H */
Signature · 5 lines
1.5.6.3 -- Yoshinori Sato <[email protected]>