Re: [WATCHDOG] v2.6.27-rc patches

[Dave Jones]

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@xxxxxxxxxxxxx>
 > 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/