linux-next: build failure after merge of the parisc-hd tree

[Stephen Rothwell]

Hi all,

After merging the parisc-hd tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/kernel.h:10:0,
                 from include/linux/list.h:9,
                 from include/linux/preempt.h:11,
                 from include/linux/spinlock.h:51,
                 from include/linux/seqlock.h:36,
                 from include/linux/time.h:6,
                 from include/linux/stat.h:19,
                 from include/linux/compat.h:13,
                 from arch/x86/kernel/signal_compat.c:2:
In function 'signal_compat_build_tests',
    inlined from 'sigaction_compat_abi' at arch/x86/kernel/signal_compat.c:166:2:
include/linux/compiler.h:339:38: error: call to '__compiletime_assert_29' declared with attribute error: BUILD_BUG_ON failed: NSIGFPE != 14
  _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
                                      ^
include/linux/compiler.h:319:4: note: in definition of macro '__compiletime_assert'
    prefix ## suffix();    \
    ^~~~~~
include/linux/compiler.h:339:2: note: in expansion of macro '_compiletime_assert'
  _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
  ^~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert'
 #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
                                     ^~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:69:2: note: in expansion of macro 'BUILD_BUG_ON_MSG'
  BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
  ^~~~~~~~~~~~~~~~
arch/x86/kernel/signal_compat.c:29:2: note: in expansion of macro 'BUILD_BUG_ON'
  BUILD_BUG_ON(NSIGFPE  != 14);
  ^~~~~~~~~~~~

Caused by commit

  186536608fd1 ("parisc/signal: Add FPE_CONDTRAP for conditional trap handling")

I applied the following patch for today:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 6 Apr 2018 10:10:26 +1000
Subject: [PATCH] parisc/signal: Add FPE_CONDTRAP for conditional trap handling
 fix

Update the X86 NSIGFPE check as well.  There are no new fields associated
with this change, so this should be fine.

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/x86/kernel/signal_compat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c
index df92605d8724..14c057f29979 100644
--- a/arch/x86/kernel/signal_compat.c
+++ b/arch/x86/kernel/signal_compat.c
@@ -26,7 +26,7 @@ static inline void signal_compat_build_tests(void)
 	 * new fields are handled in copy_siginfo_to_user32()!
 	 */
 	BUILD_BUG_ON(NSIGILL  != 11);
-	BUILD_BUG_ON(NSIGFPE  != 14);
+	BUILD_BUG_ON(NSIGFPE  != 15);
 	BUILD_BUG_ON(NSIGSEGV != 7);
 	BUILD_BUG_ON(NSIGBUS  != 5);
 	BUILD_BUG_ON(NSIGTRAP != 4);
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgp8oflXFwJQF.pgp
Description: OpenPGP digital signature