Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

h8300: GENERIC_BUG support

Browse source 
CONFIG_GENERIC_BUG support.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Yoshinori Sato 2008-10-15 22:01:17 -07:00 committed by Linus Torvalds
parent 81d423e280
commit 9791af55b5
6 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/h8300/Kconfig
View file

@ -62,6 +62,10 @@ config GENERIC_TIME
bool bool
default y default y
config GENERIC_BUG
bool
depends on BUG
config TIME_LOW_RES config TIME_LOW_RES
bool bool
default y default y

4
arch/h8300/include/asm/bug.h
View file

@ -1,4 +1,8 @@
#ifndef _H8300_BUG_H #ifndef _H8300_BUG_H
#define _H8300_BUG_H #define _H8300_BUG_H
/* always true */
#define is_valid_bugaddr(addr) (1)
#include <asm-generic/bug.h> #include <asm-generic/bug.h>
#endif #endif

2
arch/h8300/include/asm/system.h
View file

@ -155,4 +155,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
#define arch_align_stack(x) (x) #define arch_align_stack(x) (x)
void die(char *str, struct pt_regs *fp, unsigned long err);
#endif /* _H8300_SYSTEM_H */ #endif /* _H8300_SYSTEM_H */

3
arch/h8300/kernel/module.c
View file

@ -114,9 +114,10 @@ int module_finalize(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs, const Elf_Shdr *sechdrs,
struct module *me) struct module *me)
{ {
return 0; return module_bug_finalize(hdr, sechdrs, me);
} }
void module_arch_cleanup(struct module *mod) void module_arch_cleanup(struct module *mod)
{ {
module_bug_cleanup(mod);
} }

17
arch/h8300/kernel/traps.c
View file

@ -20,12 +20,14 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/bug.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/gpio.h>
static DEFINE_SPINLOCK(die_lock);
/* /*
* this must be called very early as the kernel might * this must be called very early as the kernel might
@ -94,16 +96,19 @@ static void dump(struct pt_regs *fp)
printk("\n\n"); 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;
if (!(fp->ccr & PS_S)) oops_enter();
return;
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); dump(fp);
spin_unlock_irq(&die_lock);
do_exit(SIGSEGV); do_exit(SIGSEGV);
} }

5
arch/h8300/mm/fault.c
View file

@ -20,8 +20,6 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/pgtable.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 * This routine handles page faults. It determines the problem, and
* then passes it off to one of the appropriate routines. * 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 } else
printk(KERN_ALERT "Unable to handle kernel access"); printk(KERN_ALERT "Unable to handle kernel access");
printk(" at virtual address %08lx\n",address); 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); do_exit(SIGKILL);
return 1; return 1;