diff mbox series

[SRU,E] UBUNTU: SAUCE: s390: Mark atomic const ops always inline

Message ID 20191001020605.29910-1-seth.forshee@canonical.com
State New
Headers show
Series [SRU,E] UBUNTU: SAUCE: s390: Mark atomic const ops always inline | expand

Commit Message

Seth Forshee Oct. 1, 2019, 2:06 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1846143

I get the following error building zfs for s390 with debug
symbols enabled:

./arch/s390/include/asm/atomic_ops.h:46:2: error: impossible constraint in ‘asm’

Similar problems have been fixed in the past by using
__always_inline to force inlining, and trying the same here fixes
the build.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 arch/s390/include/asm/atomic_ops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andrea Righi Oct. 1, 2019, 5:37 a.m. UTC | #1
On Mon, Sep 30, 2019 at 09:06:05PM -0500, Seth Forshee wrote:
> BugLink: https://bugs.launchpad.net/bugs/1846143
> 
> I get the following error building zfs for s390 with debug
> symbols enabled:
> 
> ./arch/s390/include/asm/atomic_ops.h:46:2: error: impossible constraint in ‘asm’
> 
> Similar problems have been fixed in the past by using
> __always_inline to force inlining, and trying the same here fixes
> the build.
> 
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

Looks like a mainline bug. Maybe we should also send this to the LKML?
In the meantime:

Acked-by: Andrea Righi <andrea.righi@canonical.com>

> ---
>  arch/s390/include/asm/atomic_ops.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/s390/include/asm/atomic_ops.h b/arch/s390/include/asm/atomic_ops.h
> index d3f09526ee19..61467b9eecc7 100644
> --- a/arch/s390/include/asm/atomic_ops.h
> +++ b/arch/s390/include/asm/atomic_ops.h
> @@ -41,7 +41,7 @@ __ATOMIC_OPS(__atomic64_xor, long, "laxg")
>  #undef __ATOMIC_OP
>  
>  #define __ATOMIC_CONST_OP(op_name, op_type, op_string, op_barrier)	\
> -static inline void op_name(op_type val, op_type *ptr)			\
> +static __always_inline void op_name(op_type val, op_type *ptr)		\
>  {									\
>  	asm volatile(							\
>  		op_string "	%[ptr],%[val]\n"			\
> -- 
> 2.20.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Andy Whitcroft Oct. 1, 2019, 12:32 p.m. UTC | #2
On Mon, Sep 30, 2019 at 09:06:05PM -0500, Seth Forshee wrote:
> BugLink: https://bugs.launchpad.net/bugs/1846143
> 
> I get the following error building zfs for s390 with debug
> symbols enabled:
> 
> ./arch/s390/include/asm/atomic_ops.h:46:2: error: impossible constraint in ‘asm’
> 
> Similar problems have been fixed in the past by using
> __always_inline to force inlining, and trying the same here fixes
> the build.
> 
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> ---
>  arch/s390/include/asm/atomic_ops.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/s390/include/asm/atomic_ops.h b/arch/s390/include/asm/atomic_ops.h
> index d3f09526ee19..61467b9eecc7 100644
> --- a/arch/s390/include/asm/atomic_ops.h
> +++ b/arch/s390/include/asm/atomic_ops.h
> @@ -41,7 +41,7 @@ __ATOMIC_OPS(__atomic64_xor, long, "laxg")
>  #undef __ATOMIC_OP
>  
>  #define __ATOMIC_CONST_OP(op_name, op_type, op_string, op_barrier)	\
> -static inline void op_name(op_type val, op_type *ptr)			\
> +static __always_inline void op_name(op_type val, op_type *ptr)		\
>  {									\
>  	asm volatile(							\
>  		op_string "	%[ptr],%[val]\n"			\
> -- 
> 2.20.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

"Trying the same here ..." wimper.  But if it makes it build I guess:

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw
Marcelo Henrique Cerri Oct. 1, 2019, 12:33 p.m. UTC | #3
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Seth Forshee Oct. 1, 2019, 12:45 p.m. UTC | #4
On Mon, Sep 30, 2019 at 09:06:05PM -0500, Seth Forshee wrote:
> BugLink: https://bugs.launchpad.net/bugs/1846143
> 
> I get the following error building zfs for s390 with debug
> symbols enabled:
> 
> ./arch/s390/include/asm/atomic_ops.h:46:2: error: impossible constraint in ‘asm’
> 
> Similar problems have been fixed in the past by using
> __always_inline to force inlining, and trying the same here fixes
> the build.
> 
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

Applied to eoan/master-next.
diff mbox series

Patch

diff --git a/arch/s390/include/asm/atomic_ops.h b/arch/s390/include/asm/atomic_ops.h
index d3f09526ee19..61467b9eecc7 100644
--- a/arch/s390/include/asm/atomic_ops.h
+++ b/arch/s390/include/asm/atomic_ops.h
@@ -41,7 +41,7 @@  __ATOMIC_OPS(__atomic64_xor, long, "laxg")
 #undef __ATOMIC_OP
 
 #define __ATOMIC_CONST_OP(op_name, op_type, op_string, op_barrier)	\
-static inline void op_name(op_type val, op_type *ptr)			\
+static __always_inline void op_name(op_type val, op_type *ptr)		\
 {									\
 	asm volatile(							\
 		op_string "	%[ptr],%[val]\n"			\