* [PATCH] staging/octeon: Fix test build on MIPS
@ 2019-11-10 17:56 Guenter Roeck
2019-11-11 15:40 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Guenter Roeck @ 2019-11-10 17:56 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: devel, linux-kernel, Guenter Roeck, Matthew Wilcox
mips:allmodconfig fails to build.
drivers/staging/octeon/ethernet-rx.c: In function 'cvm_oct_poll':
drivers/staging/octeon/ethernet-defines.h:30:38: error:
'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclared
Octeon defines are only available if CONFIG_CPU_CAVIUM_OCTEON
is enabled. Since the driver uses those defines, we have to use
the dummy defines if this flag is not enabled.
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Fixes: 171a9bae68c7 ("staging/octeon: Allow test build on !MIPS")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/staging/octeon/octeon-ethernet.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h
index a8a864b40913..70848c6c86ec 100644
--- a/drivers/staging/octeon/octeon-ethernet.h
+++ b/drivers/staging/octeon/octeon-ethernet.h
@@ -14,7 +14,7 @@
#include <linux/of.h>
#include <linux/phy.h>
-#ifdef CONFIG_MIPS
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
#include <asm/octeon/octeon.h>
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] staging/octeon: Fix test build on MIPS
2019-11-10 17:56 [PATCH] staging/octeon: Fix test build on MIPS Guenter Roeck
@ 2019-11-11 15:40 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2019-11-11 15:40 UTC (permalink / raw)
To: Guenter Roeck; +Cc: devel, Matthew Wilcox, linux-kernel
On Sun, Nov 10, 2019 at 09:56:20AM -0800, Guenter Roeck wrote:
> mips:allmodconfig fails to build.
>
> drivers/staging/octeon/ethernet-rx.c: In function 'cvm_oct_poll':
> drivers/staging/octeon/ethernet-defines.h:30:38: error:
> 'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclared
>
> Octeon defines are only available if CONFIG_CPU_CAVIUM_OCTEON
> is enabled. Since the driver uses those defines, we have to use
> the dummy defines if this flag is not enabled.
>
> Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
> Fixes: 171a9bae68c7 ("staging/octeon: Allow test build on !MIPS")
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> Cc: stable <stable@vger.kernel.org>
> ---
> drivers/staging/octeon/octeon-ethernet.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h
> index a8a864b40913..70848c6c86ec 100644
> --- a/drivers/staging/octeon/octeon-ethernet.h
> +++ b/drivers/staging/octeon/octeon-ethernet.h
> @@ -14,7 +14,7 @@
> #include <linux/of.h>
> #include <linux/phy.h>
>
> -#ifdef CONFIG_MIPS
> +#ifdef CONFIG_CPU_CAVIUM_OCTEON
>
> #include <asm/octeon/octeon.h>
>
Already in my tree, sorry for the delay, will show up in 5.5-rc1 and get
backported to 5.4.y
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-11 15:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-10 17:56 [PATCH] staging/octeon: Fix test build on MIPS Guenter Roeck
2019-11-11 15:40 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).