2018-07-24 11:53:55

by Thomas Petazzoni

Subject: [PATCH] mips: use asm-generic version of msi.h

This is necessary to be able to include <linux/msi.h> when
CONFIG_GENERIC_MSI_IRQ_DOMAIN is enabled. Without this, a build with
CONFIG_GENERIC_MSI_IRQ_DOMAIN fails with:

In file included from include/linux/kvm_host.h:20:0,
from arch/mips/kernel/asm-offsets.c:24:
>> include/linux/msi.h:197:10: fatal error: asm/msi.h: No such file or directory
#include <asm/msi.h>
^~~~~~~~~~~
compilation terminated.
make[2]: *** [arch/mips/kernel/asm-offsets.s] Error 1
make[2]: Target '__build' not remade because of errors.
make[1]: *** [prepare0] Error 2
make[1]: Target 'prepare' not remade because of errors.
make: *** [sub-make] Error 2

Signed-off-by: Thomas Petazzoni <[email protected]>
---
arch/mips/include/asm/Kbuild | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index 45d541baf359..58351e48421e 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -8,6 +8,7 @@ generic-y += irq_work.h
generic-y += local64.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
+generic-y += msi.h
generic-y += parport.h
generic-y += percpu.h
generic-y += preempt.h
--
2.14.4

2018-07-24 17:37:52

by Paul Burton

Subject: Re: [PATCH] mips: use asm-generic version of msi.h

Hi Thomas,

On Tue, Jul 24, 2018 at 01:52:08PM +0200, Thomas Petazzoni wrote:
> This is necessary to be able to include <linux/msi.h> when
> CONFIG_GENERIC_MSI_IRQ_DOMAIN is enabled. Without this, a build with
> CONFIG_GENERIC_MSI_IRQ_DOMAIN fails with:
>
> In file included from include/linux/kvm_host.h:20:0,
> from arch/mips/kernel/asm-offsets.c:24:
> >> include/linux/msi.h:197:10: fatal error: asm/msi.h: No such file or directory
> #include <asm/msi.h>
> ^~~~~~~~~~~
> compilation terminated.
> make[2]: *** [arch/mips/kernel/asm-offsets.s] Error 1
> make[2]: Target '__build' not remade because of errors.
> make[1]: *** [prepare0] Error 2
> make[1]: Target 'prepare' not remade because of errors.
> make: *** [sub-make] Error 2
>
> Signed-off-by: Thomas Petazzoni <[email protected]>
> ---
> arch/mips/include/asm/Kbuild | 1 +
> 1 file changed, 1 insertion(+)

Thanks, applied to mips-next for 4.19.

BTW it looks like a bunch of other architectures might need this too - a
grep suggests more architectures lack asm/msi.h (17) than have it.

Paul