diff mbox

[v2,08/10] arm64/debug: Add missing #include

Message ID 1436793967-7138-9-git-send-email-Dave.Martin@arm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dave Martin July 13, 2015, 1:25 p.m. UTC
<asm/debug-monitors.h> relies on <asm/ptrace.h>, but doesn't
declare this dependency.  This becomes a problem once
debug-monitors.h starts getting included all over the place to get
the BRK immedates.

This patch adds the missing #include.

Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
 arch/arm64/include/asm/debug-monitors.h |    1 +
 1 file changed, 1 insertion(+)

Comments

Mark Rutland July 13, 2015, 2:34 p.m. UTC | #1
On Mon, Jul 13, 2015 at 02:25:55PM +0100, Dave P Martin wrote:
> <asm/debug-monitors.h> relies on <asm/ptrace.h>, but doesn't
> declare this dependency.  This becomes a problem once
> debug-monitors.h starts getting included all over the place to get
> the BRK immedates.

I take it that's for struct pt_regs down in the ifndef __ASSEMBLY__
portion?

> 
> This patch adds the missing #include.
> 
> Signed-off-by: Dave Martin <Dave.Martin@arm.com>
> ---
>  arch/arm64/include/asm/debug-monitors.h |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
> index 6a17fb8..b5715cb 100644
> --- a/arch/arm64/include/asm/debug-monitors.h
> +++ b/arch/arm64/include/asm/debug-monitors.h
> @@ -20,6 +20,7 @@
>  
>  #include <asm/esr.h>
>  #include <asm/insn.h>
> +#include <asm/ptrace.h>

We're also missing <linux/types.h> (for struct list_head, u8, and u32),
and <linux/errno.h> (for ENODEV in the reinstall_suspended_bps stub).
Would you be able to fold those in?

With those:

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

>  
>  /* Low-level stepping controls. */
>  #define DBG_MDSCR_SS		(1 << 0)
> -- 
> 1.7.10.4
>
Dave Martin July 13, 2015, 2:44 p.m. UTC | #2
On Mon, Jul 13, 2015 at 03:34:36PM +0100, Mark Rutland wrote:
> On Mon, Jul 13, 2015 at 02:25:55PM +0100, Dave P Martin wrote:
> > <asm/debug-monitors.h> relies on <asm/ptrace.h>, but doesn't
> > declare this dependency.  This becomes a problem once
> > debug-monitors.h starts getting included all over the place to get
> > the BRK immedates.
> 
> I take it that's for struct pt_regs down in the ifndef __ASSEMBLY__
> portion?

Yes ... I suppose I could move the #include in there, but it seems
hermless.  I prefer to keep them together.

> 
> > 
> > This patch adds the missing #include.
> > 
> > Signed-off-by: Dave Martin <Dave.Martin@arm.com>
> > ---
> >  arch/arm64/include/asm/debug-monitors.h |    1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
> > index 6a17fb8..b5715cb 100644
> > --- a/arch/arm64/include/asm/debug-monitors.h
> > +++ b/arch/arm64/include/asm/debug-monitors.h
> > @@ -20,6 +20,7 @@
> >  
> >  #include <asm/esr.h>
> >  #include <asm/insn.h>
> > +#include <asm/ptrace.h>
> 
> We're also missing <linux/types.h> (for struct list_head, u8, and u32),
> and <linux/errno.h> (for ENODEV in the reinstall_suspended_bps stub).
> Would you be able to fold those in?

Sure, can do.

> With those:
> 
> Acked-by: Mark Rutland <mark.rutland@arm.com>

Cheers
---Dave

> 
> Mark.
> 
> >  
> >  /* Low-level stepping controls. */
> >  #define DBG_MDSCR_SS		(1 << 0)
> > -- 
> > 1.7.10.4
> > 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Mark Rutland July 13, 2015, 2:45 p.m. UTC | #3
On Mon, Jul 13, 2015 at 03:44:34PM +0100, Dave P Martin wrote:
> On Mon, Jul 13, 2015 at 03:34:36PM +0100, Mark Rutland wrote:
> > On Mon, Jul 13, 2015 at 02:25:55PM +0100, Dave P Martin wrote:
> > > <asm/debug-monitors.h> relies on <asm/ptrace.h>, but doesn't
> > > declare this dependency.  This becomes a problem once
> > > debug-monitors.h starts getting included all over the place to get
> > > the BRK immedates.
> > 
> > I take it that's for struct pt_regs down in the ifndef __ASSEMBLY__
> > portion?
> 
> Yes ... I suppose I could move the #include in there, but it seems
> hermless.  I prefer to keep them together.

I was just checking that I hadn't missed something -- no need to move
it.

Mark.

> 
> > 
> > > 
> > > This patch adds the missing #include.
> > > 
> > > Signed-off-by: Dave Martin <Dave.Martin@arm.com>
> > > ---
> > >  arch/arm64/include/asm/debug-monitors.h |    1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
> > > index 6a17fb8..b5715cb 100644
> > > --- a/arch/arm64/include/asm/debug-monitors.h
> > > +++ b/arch/arm64/include/asm/debug-monitors.h
> > > @@ -20,6 +20,7 @@
> > >  
> > >  #include <asm/esr.h>
> > >  #include <asm/insn.h>
> > > +#include <asm/ptrace.h>
> > 
> > We're also missing <linux/types.h> (for struct list_head, u8, and u32),
> > and <linux/errno.h> (for ENODEV in the reinstall_suspended_bps stub).
> > Would you be able to fold those in?
> 
> Sure, can do.
> 
> > With those:
> > 
> > Acked-by: Mark Rutland <mark.rutland@arm.com>
> 
> Cheers
> ---Dave
> 
> > 
> > Mark.
> > 
> > >  
> > >  /* Low-level stepping controls. */
> > >  #define DBG_MDSCR_SS		(1 << 0)
> > > -- 
> > > 1.7.10.4
> > > 
> > 
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff mbox

Patch

diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
index 6a17fb8..b5715cb 100644
--- a/arch/arm64/include/asm/debug-monitors.h
+++ b/arch/arm64/include/asm/debug-monitors.h
@@ -20,6 +20,7 @@ 
 
 #include <asm/esr.h>
 #include <asm/insn.h>
+#include <asm/ptrace.h>
 
 /* Low-level stepping controls. */
 #define DBG_MDSCR_SS		(1 << 0)