[PATCH v4 4/9] staging:lustre: merge socklnd_lib-linux.h into socklnd.h

Simmons, James A. simmonsja at ornl.gov
Thu Jun 25 15:02:34 UTC 2015


>On Thu, Jun 25, 2015 at 3:33 AM, Guenter Roeck <linux at 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.

Hi Geert

      Long time. I agree the above is not the best approach. Lets fix lustre instead.



More information about the devel mailing list