lkml.org 
[lkml]   [2011]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH][RFC] Sparc: Remove trigraph in die_if_kernel() message.
    In arch/sparc/kernel/traps_32.c::do_priv_instruction() we have this:

    die_if_kernel("Penguin instruction from Penguin mode??!?!", regs);

    If I'm not mistaken, that "??!" will be taken as a trigraph for "|" by the
    preprocessor, so the final string will end up either as
    "Penguin instruction from Penguin mode|?!"
    which I assume is not what we want, or as the correct string but with a
    warning about an ignored trigraph which I assume we don't want either. So,
    in order to elliminate the trigraph but keep the original string intact I
    changed it to

    die_if_kernel("Penguin instruction from Penguin mode?""?!?!", regs);

    I've tested with a small test program on my x86-64 host and it behaves as
    I would expect, but I've not tested the actual code in
    arch/sparc/kernel/traps_32.c since I have no way to compile for sparc
    (which is why I submit this as a [RFC] patch).

    Please take a look and apply if you agree :-)

    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    ---
    traps_32.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
    index c0490c7..d99ca40 100644
    --- a/arch/sparc/kernel/traps_32.c
    +++ b/arch/sparc/kernel/traps_32.c
    @@ -137,7 +137,7 @@ void do_priv_instruction(struct pt_regs *regs, unsigned long pc, unsigned long n
    siginfo_t info;

    if(psr & PSR_PS)
    - die_if_kernel("Penguin instruction from Penguin mode??!?!", regs);
    + die_if_kernel("Penguin instruction from Penguin mode?""?!?!", regs);
    info.si_signo = SIGILL;
    info.si_errno = 0;
    info.si_code = ILL_PRVOPC;

    --
    Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
    Don't top-post http://www.catb.org/jargon/html/T/top-post.html
    Plain text mails only, please.



    \
     
     \ /
      Last update: 2011-06-07 16:49    [W:0.020 / U:62.196 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site