mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Peter Mamonov <pmamonov@gmail.com>
Cc: o.rempel@pengutronix.de, barebox@lists.infradead.org
Subject: Re: [PATCH] MIPS: use anonymous labels in ENTRY_FUNCTION_END and STOP_WITH_DEBUG_EVENT macros
Date: Fri, 7 Jun 2019 08:29:31 +0200	[thread overview]
Message-ID: <20190607062930.hx64ikj5xw7c2t62@pengutronix.de> (raw)
In-Reply-To: <20190604105552.20619-1-pmamonov@gmail.com>

On Tue, Jun 04, 2019 at 01:55:52PM +0300, Peter Mamonov wrote:
> Use of global labels of the same name inside ENTRY_FUNCTION_END and
> STOP_WITH_DEBUG_EVENT prevents simultaneous use of both macros. It also
> prevents multiple use of one of them.
> 
> Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
> ---
>  arch/mips/include/asm/asm.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h
> index 019be4843b..be3a1bcdbc 100644
> --- a/arch/mips/include/asm/asm.h
> +++ b/arch/mips/include/asm/asm.h
> @@ -100,8 +100,8 @@ EXPORT(symbol)
>  	 nop;						\
>  							\
>  	/* No return */					\
> -__error:						\
> -	b	__error;				\
> +1:							\
> +	b	1b;					\
>  	 nop;
>  
>  /*
> @@ -114,8 +114,8 @@ __error:						\
>  	/* trigger a soft breakpoint for OpenOCD */	\
>  	SDBBP;						\
>  	/* position independent variant of dead loop */	\
> -	__error:					\
> -	b	__error;				\
> +1:							\
> +	b	1b;					\
>  	 nop;						\
>  	/* Call some code from .text section.		\
>  	 * It is needed to keep same linker script for	\
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2019-06-07  6:29 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-04 10:55 Peter Mamonov
2019-06-04 12:44 ` Oleksij Rempel
2019-06-04 16:43   ` Peter Mamonov
2019-06-05  5:17     ` Oleksij Rempel
2019-06-05 18:38       ` Peter Mamonov
2019-06-06  4:29         ` Oleksij Rempel
2019-06-06 19:22           ` Peter Mamonov
2019-06-07  6:29 ` Sascha Hauer [this message]

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=20190607062930.hx64ikj5xw7c2t62@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=o.rempel@pengutronix.de \
    --cc=pmamonov@gmail.com \
    /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