linux-mips
[Top] [All Lists]

Re: [PATCH] MIPS: fpu.h: fix build when CONFIG_BUG is not set

To: Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: Re: [PATCH] MIPS: fpu.h: fix build when CONFIG_BUG is not set
From: Paul Burton <paul.burton@imgtec.com>
Date: Thu, 6 Feb 2014 10:35:05 +0000
Cc: Ralf Baechle <ralf@linux-mips.org>, John Crispin <blogic@openwrt.org>, <linux-mips@linux-mips.org>
In-reply-to: <1391630744-32648-1-git-send-email-aaro.koskinen@iki.fi>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1391630744-32648-1-git-send-email-aaro.koskinen@iki.fi>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.22 (2013-10-16)
On Wed, Feb 05, 2014 at 10:05:44PM +0200, Aaro Koskinen wrote:
> __enable_fpu produces a build failure when CONFIG_BUG is not set:
> 
> In file included from arch/mips/kernel/cpu-probe.c:24:0:
> arch/mips/include/asm/fpu.h: In function '__enable_fpu':
> arch/mips/include/asm/fpu.h:77:1: error: control reaches end of non-void 
> function [-Werror=return-type]
> 
> This is regression introduced in 3.14-rc1. Fix that.
> 
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> ---
>  arch/mips/include/asm/fpu.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h
> index cfe092fc720d..6b9749540edf 100644
> --- a/arch/mips/include/asm/fpu.h
> +++ b/arch/mips/include/asm/fpu.h
> @@ -74,6 +74,8 @@ static inline int __enable_fpu(enum fpu_mode mode)
>       default:
>               BUG();
>       }
> +
> +     return SIGFPE;
>  }
>  
>  #define __disable_fpu()                                                      
> \
> -- 
> 1.8.5.3
> 

Looks good to me, thanks for catching that.

Paul


<Prev in Thread] Current Thread [Next in Thread>