From 14e7dc1b2f2244a34b65fcaa5fb82d494bb18a4d Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 26 Oct 2005 09:55:41 -0500 Subject: [PATCH] --- yaml --- r: 11675 b: refs/heads/master c: cffb09ce6ba7706c89c6df9ca8e72c81adda13f0 h: refs/heads/master i: 11673: f2700a5fffb7fd80c0e3e8e7aa2775ebada6a646 11671: 469e8a6d62b7a5b021dd1369dd3e01d464b116e6 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/fault.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f36d0feb67f3..f4b9cb867a47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 328985b2c69d2592edd7f181a6b7360e51b08515 +refs/heads/master: cffb09ce6ba7706c89c6df9ca8e72c81adda13f0 diff --git a/trunk/arch/powerpc/mm/fault.c b/trunk/arch/powerpc/mm/fault.c index 3df641fa789d..841d8b6323a8 100644 --- a/trunk/arch/powerpc/mm/fault.c +++ b/trunk/arch/powerpc/mm/fault.c @@ -80,6 +80,7 @@ static int store_updates_sp(struct pt_regs *regs) return 0; } +#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE)) static void do_dabr(struct pt_regs *regs, unsigned long error_code) { siginfo_t info; @@ -101,6 +102,7 @@ static void do_dabr(struct pt_regs *regs, unsigned long error_code) info.si_addr = (void __user *)regs->nip; force_sig_info(SIGTRAP, &info, current); } +#endif /* !(CONFIG_4xx || CONFIG_BOOKE)*/ /* * For 600- and 800-family processors, the error_code parameter is DSISR