lkml.org 
[lkml]   [2015]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v4 4/9] staging:lustre: merge socklnd_lib-linux.h into socklnd.h
From
On Thu, Jun 25, 2015 at 3:33 AM, Guenter Roeck <linux@roeck-us.net> wrote:
> I have not tested it, but I think the following may fix the problem
> while avoiding any include problems. Since pt_regs is used in the file,
> one could argue that it should be declared.

Indeed. I tried that, but...

> --
> diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
> index 81ca118d58af..28ffa8d59cf0 100644
> --- a/arch/m68k/include/asm/irq.h
> +++ b/arch/m68k/include/asm/irq.h
> @@ -74,6 +74,8 @@ extern unsigned int irq_canonicalize(unsigned int irq);
> #define irq_canonicalize(irq) (irq)
> #endif /* !(CONFIG_M68020 || CONFIG_M68030 || CONFIG_M68040 || CONFIG_M68060) */
>
> +struct pt_regs;
> +
> asmlinkage void do_IRQ(int irq, struct pt_regs *regs);
> extern atomic_t irq_err_count;

... asmlinkage and atomic_t are also needed.

I didn't want to risk introducing more breakage by adding (at least) three
more includes.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds


\
 
 \ /
  Last update: 2015-06-25 09:01    [W:0.070 / U:0.360 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site