lkml.org 
[lkml]   [2010]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: build failure after merge of the final tree (tip tree related)
Hi all,

After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:

arch/sparc/kernel/nmi.c:54: error: redefinition of 'touch_nmi_watchdog'
include/linux/nmi.h:21: note: previous definition of 'touch_nmi_watchdog' was here

Caused (or, at least exposed) by commit
5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a ("x86, nmi_watchdog: Remove the
old nmi_watchdog"). Sparc appears to have a touch_nmi_watchdog() and
defines ARCH_HAS_NMI_WATCHDOG but not CONFIG_HARDLOCKUP_DETECTOR.


I have reverted that commit for today (as well as commit
072b198a4ad48bd722ec6d203d65422a4698eae7 "x86, nmi_watchdog: Remove all
stub function calls from old nmi_watchdog" that depends on it).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-11-22 03:43    [W:0.113 / U:5.796 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site