lkml.org 
[lkml]   [2008]   [Aug]   [12]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
/
DateTue, 12 Aug 2008 23:10:44 -0400
FromDave Jones <>
SubjectRe: [WATCHDOG] v2.6.27-rc patches
On Wed, Aug 06, 2008 at 10:29:18PM +0200, Wim Van Sebroeck wrote:
 > Hi Linus,
 > 
 > Please pull from 'master' branch of
 > 	git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
 > or if master.kernel.org hasn't synced up yet:
 > 	master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
 > 
 > This will update the following files:
 > 
 > Author: Anton Vorontsov <avorontsov@ru.mvista.com>
 > Date:   Thu Jul 3 23:51:36 2008 -0700
 > 
 >     [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs

This is broken when built modular because this...

 > +}
 > +module_init(mpc8xxx_wdt_init_late);

and this ..

 > +arch_initcall(mpc8xxx_wdt_init);

Can't be mixed.  You end up with two init_module invocations

drivers/watchdog/mpc8xxx_wdt.c:304: error: redefinition of '__inittest'
drivers/watchdog/mpc8xxx_wdt.c:298: error: previous definition of '__inittest' was here
drivers/watchdog/mpc8xxx_wdt.c:304: error: redefinition of 'init_module'
drivers/watchdog/mpc8xxx_wdt.c:298: error: previous definition of 'init_module' was here

Given they both call different routines though, I'm not sure the right fix here.

	Dave


-- 
http://www.codemonkey.org.uk


\
 
 \ /
  Last update: 2008-08-13 05:17    [from the cache]
©2003-2008