From: Michael Ellerman <michael@ellerman.id.au>
To: <linuxppc-dev@ozlabs.org>
Cc: Paul Mackerras <paulus@samba.org>, Anton Blanchard <anton@samba.org>
Subject: [PATCH 11/20] powerpc/xmon: Move handle_fault() next to related routines
Date: Wed, 10 Oct 2012 01:20:38 +1100 [thread overview]
Message-ID: <1349792447-15714-11-git-send-email-michael@ellerman.id.au> (raw)
In-Reply-To: <1349792447-15714-1-git-send-email-michael@ellerman.id.au>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
arch/powerpc/xmon/xmon.c | 48 +++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 168c5e7..65c3d22 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -665,6 +665,30 @@ void end_bus_error_jump(void)
catch_memory_errors = 0;
}
+static int fault_type;
+static int fault_except;
+static char *fault_chars[] = { "--", "**", "##" };
+
+static int handle_fault(struct pt_regs *regs)
+{
+ fault_except = TRAP(regs);
+ switch (TRAP(regs)) {
+ case 0x200:
+ fault_type = 0;
+ break;
+ case 0x300:
+ case 0x380:
+ fault_type = 1;
+ break;
+ default:
+ fault_type = 2;
+ }
+
+ longjmp(bus_error_jmp, 1);
+
+ return 0;
+}
+
static int xmon_fault_handler(struct pt_regs *regs)
{
struct bpt *bp;
@@ -1755,30 +1779,6 @@ mwrite(unsigned long adrs, void *buf, int size)
return n;
}
-static int fault_type;
-static int fault_except;
-static char *fault_chars[] = { "--", "**", "##" };
-
-static int handle_fault(struct pt_regs *regs)
-{
- fault_except = TRAP(regs);
- switch (TRAP(regs)) {
- case 0x200:
- fault_type = 0;
- break;
- case 0x300:
- case 0x380:
- fault_type = 1;
- break;
- default:
- fault_type = 2;
- }
-
- longjmp(bus_error_jmp, 1);
-
- return 0;
-}
-
#define SWAP(a, b, t) ((t) = (a), (a) = (b), (b) = (t))
static void
--
1.7.9.5
next prev parent reply other threads:[~2012-10-09 14:20 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 14:20 [PATCH 01/20] powerpc/udbg: Remove unused udbg_read() Michael Ellerman
2012-10-09 14:20 ` [PATCH 02/20] powerpc/xmon: Remove unused xmon_expect() & xmon_read_poll() Michael Ellerman
2012-10-09 14:20 ` [PATCH 03/20] powerpc/xmon: Remove empty xmon_map_scc() Michael Ellerman
2012-10-09 14:20 ` [PATCH 04/20] powerpc/xmon: Make xmon_getchar() static Michael Ellerman
2012-10-09 14:20 ` [PATCH 05/20] powerpc/xmon: Merge start.c into nonstdio.c Michael Ellerman
2012-10-09 14:20 ` [PATCH 06/20] powerpc/xmon: Remove renaming #defines of scanhex() and skipbl() Michael Ellerman
2012-10-09 14:59 ` David Laight
2012-10-09 22:15 ` Paul Mackerras
2012-10-10 1:00 ` Michael Ellerman
2012-10-09 14:20 ` [PATCH 07/20] powerpc/xmon: Remove unused #defines Michael Ellerman
2012-10-09 14:20 ` [PATCH 08/20] powerpc/xmon: Use STACK_FRAME_OVERHEAD in xmon_show_stack() Michael Ellerman
2012-10-09 14:20 ` [PATCH 09/20] powerpc/xmon: Fiddle xmon_depth_to_print logic " Michael Ellerman
2012-10-09 14:20 ` [PATCH 10/20] powerpc/xmon: Factor out the oft-repeated setjmp logic Michael Ellerman
2012-10-09 22:23 ` Paul Mackerras
2012-10-10 0:59 ` Michael Ellerman
2012-10-09 14:20 ` Michael Ellerman [this message]
2012-10-09 14:20 ` [PATCH 12/20] powerpc/xmon: Do so simple conversions to start/end_bus_error_jump() Michael Ellerman
2012-10-09 14:20 ` [PATCH 13/20] powerpc/xmon: Use start/end_bus_error_jump() in more routines Michael Ellerman
2012-10-09 14:20 ` [PATCH 14/20] powerpc/xmon: Convert read/write_spr() to use start_bus_error_jump() Michael Ellerman
2012-10-09 14:20 ` [PATCH 15/20] powerpc/xmon: Deindent stop/restart_spus() Michael Ellerman
2012-10-09 14:20 ` [PATCH 16/20] powerpc/xmon: Use start_bus_error_jump() in spu routines Michael Ellerman
2012-10-09 14:20 ` [PATCH 17/20] powerpc/xmon: Make less variables global Michael Ellerman
2012-10-09 14:20 ` [PATCH 18/20] powerpc/xmon: Use kallsyms_lookup_size_offset() in get_function_bounds() Michael Ellerman
2012-10-09 14:20 ` [PATCH 19/20] powerpc/xmon: Remove externs for non-existant routines Michael Ellerman
2012-10-09 14:20 ` [PATCH 20/20] powerpc/xmon: Fallback to printk() in xmon_printf() if udbg is not setup Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349792447-15714-11-git-send-email-michael@ellerman.id.au \
--to=michael@ellerman.id.au \
--cc=anton@samba.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).