[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Mon, 11 Nov 2019 16:40:01 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Guenter Roeck <linux@...ck-us.net>
Cc: devel@...verdev.osuosl.org, Matthew Wilcox <willy@...radead.org>,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] staging/octeon: Fix test build on MIPS
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@...radead.org>
> Fixes: 171a9bae68c7 ("staging/octeon: Allow test build on !MIPS")
> Signed-off-by: Guenter Roeck <linux@...ck-us.net>
> Cc: stable <stable@...r.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
Powered by blists - more mailing lists