diff mbox

[git,pull] Please pull powerpc.git merge branch

Message ID 30983.1290116555@neuling.org (mailing list archive)
State Not Applicable
Headers show

Commit Message

Michael Neuling Nov. 18, 2010, 9:42 p.m. UTC
> Michael Neuling (1):
>       powerpc: Fix call to subpage_protection()

Well that's annoying... 

Looks like the bottom of my commit got chopped as the oops message has a
"---" in it.  We lost the cc: stable@kernel.org :-(

Comparing the original post to the final commit:
  http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-November/087141.html
To the final:
  http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=1c2c25c78740b2796c7c06640784cb6732fa4907

It'd be nice if we had something like this in:



powerpc: fix debug prints to avoid ---

Many commit tools assume anything below a line starting with --- is a
comment. Since the following two prints are often used as debug
outputs and hence in checkin comments avoid using --- in these

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
Let the bike shedding begin!

 arch/powerpc/kernel/process.c |    2 +-
 arch/powerpc/xmon/xmon.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Ellerman Nov. 18, 2010, 10:08 p.m. UTC | #1
On Fri, 2010-11-19 at 08:42 +1100, Michael Neuling wrote:
> > Michael Neuling (1):
> >       powerpc: Fix call to subpage_protection()
> 
> Well that's annoying... 
> 
> Looks like the bottom of my commit got chopped as the oops message has a
> "---" in it.  We lost the cc: stable@kernel.org :-(
> 
> Comparing the original post to the final commit:
>   http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-November/087141.html
> To the final:
>   http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=1c2c25c78740b2796c7c06640784cb6732fa4907

LOL.

> It'd be nice if we had something like this in:

> powerpc: fix debug prints to avoid ---
> 
> Many commit tools assume anything below a line starting with --- is a
> comment. Since the following two prints are often used as debug
> outputs and hence in checkin comments avoid using --- in these
> 
> Signed-off-by: Michael Neuling <mikey@neuling.org>
> ---
> Let the bike shedding begin!

I vote for:

 -> Exception: 401 (Instruction Access) at 00000000f7937794

Because exceptions are like an arrow!
Michael Ellerman Nov. 19, 2010, 5:44 a.m. UTC | #2
On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote:
> On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman <michael@ellerman.id.au> wrote:
> >
> > I vote for:
> > 
> >  -> Exception: 401 (Instruction Access) at 00000000f7937794
> 
> Or:
> 
> ☛ Exception: 401 (Instruction Access) at 00000000f7937794

Let's get serious, it's _really_ like a phone call:

☎ Exception: 401 (Instruction Access) at 00000000f7937794

cheers
Michael Neuling Nov. 19, 2010, 6:02 a.m. UTC | #3
> On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote:
> > On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman <michael@ellerman.id.=
> au> wrote:
> > >
> > > I vote for:
> > >=20
> > >  -> Exception: 401 (Instruction Access) at 00000000f7937794
> >=20
> > Or:
> >=20
> > =E2=98=9B Exception: 401 (Instruction Access) at 00000000f7937794
> 
> Let's get serious, it's _really_ like a phone call:
> 
> =E2=98=8E Exception: 401 (Instruction Access) at 00000000f7937794

We need a dedicated NACK char!

Mikey
Michael Ellerman Nov. 21, 2010, 11:05 p.m. UTC | #4
On Fri, 2010-11-19 at 17:02 +1100, Michael Neuling wrote:
> > On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote:
> > > On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman <michael@ellerman.id.=
> > au> wrote:
> > > >
> > > > I vote for:
> > > >=20
> > > >  -> Exception: 401 (Instruction Access) at 00000000f7937794
> > >=20
> > > Or:
> > >=20
> > > =E2=98=9B Exception: 401 (Instruction Access) at 00000000f7937794
> > 
> > Let's get serious, it's _really_ like a phone call:
> > 
> > =E2=98=8E Exception: 401 (Instruction Access) at 00000000f7937794
> 
> We need a dedicated NACK char!

␕!
Josh Boyer Nov. 22, 2010, 11:25 a.m. UTC | #5
On Sun, Nov 21, 2010 at 6:05 PM, Michael Ellerman
<michael@ellerman.id.au> wrote:
> On Fri, 2010-11-19 at 17:02 +1100, Michael Neuling wrote:
>> > On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote:
>> > > On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman <michael@ellerman.id.=
>> > au> wrote:
>> > > >
>> > > > I vote for:
>> > > >=20
>> > > >  -> Exception: 401 (Instruction Access) at 00000000f7937794
>> > >=20
>> > > Or:
>> > >=20
>> > > =E2=98=9B Exception: 401 (Instruction Access) at 00000000f7937794
>> >
>> > Let's get serious, it's _really_ like a phone call:
>> >
>> > =E2=98=8E Exception: 401 (Instruction Access) at 00000000f7937794
>>
>> We need a dedicated NACK char!
>
> ␕!

Surely it would be: ☣

josh
Scott Wood Nov. 22, 2010, 6:45 p.m. UTC | #6
On Fri, 19 Nov 2010 16:44:18 +1100
Michael Ellerman <michael@ellerman.id.au> wrote:

> On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote:
> > On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman <michael@ellerman.id.au> wrote:
> > >
> > > I vote for:
> > > 
> > >  -> Exception: 401 (Instruction Access) at 00000000f7937794
> > 
> > Or:
> > 
> > ☛ Exception: 401 (Instruction Access) at 00000000f7937794
> 
> Let's get serious, it's _really_ like a phone call:
> 
> ☎ Exception: 401 (Instruction Access) at 00000000f7937794

Sparc got it right:

void die_if_kernel(char *str, struct pt_regs *regs)
{
	static int die_counter;
	int count = 0;
	
	/* Amuse the user. */
	printk(
"              \\|/ ____ \\|/\n"
"              \"@'/ .. \\`@\"\n"
"              /_| \\__/ |_\\\n"
"                 \\__U_/\n");

-Scott
diff mbox

Patch

Index: linux-2.6-ozlabs/arch/powerpc/kernel/process.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/process.c
+++ linux-2.6-ozlabs/arch/powerpc/kernel/process.c
@@ -1167,7 +1167,7 @@ 
 			struct pt_regs *regs = (struct pt_regs *)
 				(sp + STACK_FRAME_OVERHEAD);
 			lr = regs->link;
-			printk("--- Exception: %lx at %pS\n    LR = %pS\n",
+			printk("=== Exception: %lx at %pS\n    LR = %pS\n",
 			       regs->trap, (void *)regs->nip, (void *)lr);
 			firstframe = 1;
 		}
Index: linux-2.6-ozlabs/arch/powerpc/xmon/xmon.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/xmon/xmon.c
+++ linux-2.6-ozlabs/arch/powerpc/xmon/xmon.c
@@ -1363,7 +1363,7 @@ 
 				       sp + REGS_OFFSET);
 				break;
 			}
-                        printf("--- Exception: %lx %s at ", regs.trap,
+                        printf("=== Exception: %lx %s at ", regs.trap,
 			       getvecname(TRAP(&regs)));
 			pc = regs.nip;
 			lr = regs.link;