Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56fb5fe9 authored by Michael Buesch's avatar Michael Buesch Committed by Linus Torvalds
Browse files

[PATCH] Fix HWRNG built-in initcalls priority 

This changes all HWRNG driver initcalls to module_init().  We must probe
the RNGs after the major kernel subsystems are already up and running (like
PCI).

This fixes Bug 7730.
http://bugzilla.kernel.org/show_bug.cgi?id=7730



Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9863be59

drivers/char/hw_random/amd-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void __exit mod_exit(void) 
	hwrng_unregister(&amd_rng);

}



subsys_initcall(mod_init);

module_init(mod_init);

module_exit(mod_exit);



MODULE_AUTHOR("The Linux Kernel team");

drivers/char/hw_random/geode-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void __exit mod_exit(void) 
	iounmap(mem);

}



subsys_initcall(mod_init);

module_init(mod_init);

module_exit(mod_exit);



MODULE_DESCRIPTION("H/W RNG driver for AMD Geode LX CPUs");

drivers/char/hw_random/intel-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static void __exit mod_exit(void) 
	iounmap(mem);

}



subsys_initcall(mod_init);

module_init(mod_init);

module_exit(mod_exit);



MODULE_DESCRIPTION("H/W RNG driver for Intel chipsets");

drivers/char/hw_random/ixp4xx-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void __exit ixp4xx_rng_exit(void) 
	iounmap(rng_base);

}



subsys_initcall(ixp4xx_rng_init);

module_init(ixp4xx_rng_init);

module_exit(ixp4xx_rng_exit);



MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net>");

drivers/char/hw_random/via-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static void __exit mod_exit(void) 
	hwrng_unregister(&via_rng);

}



subsys_initcall(mod_init);

module_init(mod_init);

module_exit(mod_exit);



MODULE_DESCRIPTION("H/W RNG driver for VIA chipsets");