@@ -734,7 +734,7 @@ printk(KERN_INFO "my ip: %pI4\n", &ipaddress);
</sect1>
<sect1 id="routines-init-again">
- <title><function>__initcall()</function>/<function>module_init()</function>
+ <title><function>device_initcall()</function>/<function>module_init()</function>
<filename class="headerfile">include/linux/init.h</filename></title>
<para>
Many parts of the kernel are well served as a module
@@ -750,7 +750,7 @@ printk(KERN_INFO "my ip: %pI4\n", &ipaddress);
function is to be called at module insertion time (if the file is
compiled as a module), or at boot time: if the file is not
compiled as a module the <function>module_init()</function> macro
- becomes equivalent to <function>__initcall()</function>, which
+ becomes equivalent to <function>device_initcall()</function>, which
through linker magic ensures that the function is called on boot.
</para>
@@ -41,7 +41,7 @@ on what is necessary:
1.1 Initialization
------------------
-First of all, in an __initcall level 7 (module_init()) or later
+First of all, in an device_initcall level 7 (module_init()) or later
function check whether this kernel runs on the right CPU and the right
chipset. If so, register a struct cpufreq_driver with the CPUfreq core
using cpufreq_register_driver()
@@ -159,7 +159,7 @@ more details, with real examples.
built-in.o and succeeding instances will be ignored.
Link order is significant, because certain functions
- (module_init() / __initcall) will be called during boot in the
+ (module_init() / device_initcall) will be called during boot in the
order they appear. So keep in mind that changing the link
order may e.g. change the order in which your SCSI
controllers are detected, and thus your disks are renumbered.
@@ -179,7 +179,7 @@ static int __init leds_init(void)
return 0;
}
-__initcall(leds_init);
+device_initcall(leds_init);
void __init at91_init_leds(u8 cpu_led, u8 timer_led)
@@ -121,5 +121,5 @@ static int p720t_hw_init(void)
return 0;
}
-__initcall(p720t_hw_init);
+device_initcall(p720t_hw_init);
@@ -48,4 +48,4 @@ static int __init leds_init(void)
return 0;
}
-__initcall(leds_init);
+device_initcall(leds_init);
@@ -69,7 +69,7 @@ static int __init cats_hw_init(void)
return 0;
}
-__initcall(cats_hw_init);
+device_initcall(cats_hw_init);
/*
* CATS uses soft-reboot by default, since
@@ -136,4 +136,4 @@ static int __init leds_init(void)
return 0;
}
-__initcall(leds_init);
+device_initcall(leds_init);
@@ -623,7 +623,7 @@ static int __init nw_hw_init(void)
return 0;
}
-__initcall(nw_hw_init);
+device_initcall(nw_hw_init);
/*
* Older NeTTroms either do not provide a parameters
@@ -136,4 +136,4 @@ static int __init leds_init(void)
return 0;
}
-__initcall(leds_init);
+device_initcall(leds_init);
@@ -90,4 +90,4 @@ static int __init leds_init(void)
return 0;
}
-__initcall(leds_init);
+device_initcall(leds_init);
@@ -63,4 +63,4 @@ omap_leds_init(void)
return 0;
}
-__initcall(omap_leds_init);
+device_initcall(omap_leds_init);
@@ -724,4 +724,4 @@ static int __init omap_pm_init(void)
return 0;
}
-__initcall(omap_pm_init);
+device_initcall(omap_pm_init);
@@ -197,7 +197,7 @@ static int __init db88f5281_7seg_init(void)
return 0;
}
-__initcall(db88f5281_7seg_init);
+device_initcall(db88f5281_7seg_init);
/*****************************************************************************
* PCI
@@ -130,7 +130,7 @@ static int __init rd88f5182_dbgled_init(void)
return 0;
}
-__initcall(rd88f5182_dbgled_init);
+device_initcall(rd88f5182_dbgled_init);
#endif
@@ -12,7 +12,7 @@
* published by the Free Software Foundation.
*
* Since this file should be linked before any other machine specific file,
- * the __initcall() here will be executed first. This serves as default
+ * the device_initcall() here will be executed first. This serves as default
* initialization stuff for PXA machines which can be overridden later if
* need be.
*/
@@ -12,7 +12,7 @@
* published by the Free Software Foundation.
*
* Since this file should be linked before any other machine specific file,
- * the __initcall() here will be executed first. This serves as default
+ * the device_initcall() here will be executed first. This serves as default
* initialization stuff for PXA machines which can be overridden later if
* need be.
*/
@@ -163,4 +163,4 @@ static int __init leds_init(void)
return 0;
}
-__initcall(leds_init);
+device_initcall(leds_init);
@@ -1285,7 +1285,7 @@ static __init int gpio_register_proc(void)
proc_gpio->read_proc = gpio_proc_read;
return proc_gpio != NULL;
}
-__initcall(gpio_register_proc);
+device_initcall(gpio_register_proc);
#endif
#ifdef CONFIG_GPIOLIB
@@ -266,4 +266,4 @@ static int __init bfin_pm_init(void)
return 0;
}
-__initcall(bfin_pm_init);
+device_initcall(bfin_pm_init);
@@ -564,4 +564,4 @@ init_etrax_debug(void)
#endif
return 0;
}
-__initcall(init_etrax_debug);
+device_initcall(init_etrax_debug);
@@ -879,4 +879,4 @@ int fast_timer_init(void)
}
return 0;
}
-__initcall(fast_timer_init);
+device_initcall(fast_timer_init);
@@ -217,7 +217,7 @@ __init init_ioremap(void)
return 0;
}
-__initcall(init_ioremap);
+device_initcall(init_ioremap);
/* Helper function for the two below */
@@ -833,4 +833,4 @@ int fast_timer_init(void)
}
return 0;
}
-__initcall(fast_timer_init);
+device_initcall(fast_timer_init);
@@ -226,4 +226,4 @@ crisv32_pinmux_dump(void)
}
}
-__initcall(crisv32_pinmux_init);
+device_initcall(crisv32_pinmux_init);
@@ -672,4 +672,4 @@ cris_init_signal(void)
return 0;
}
-__initcall(cris_init_signal);
+device_initcall(cris_init_signal);
@@ -95,7 +95,7 @@ static int __init crisv32_io_init(void)
return ret;
}
-__initcall(crisv32_io_init);
+device_initcall(crisv32_io_init);
int crisv32_io_get(struct crisv32_iopin *iopin,
unsigned int port, unsigned int pin)
@@ -383,4 +383,4 @@ crisv32_pinmux_dump(void)
}
}
-__initcall(crisv32_pinmux_init);
+device_initcall(crisv32_pinmux_init);
@@ -128,7 +128,7 @@ static int __init crisv32_io_init(void)
return ret;
}
-__initcall(crisv32_io_init);
+device_initcall(crisv32_io_init);
int crisv32_io_get(struct crisv32_iopin *iopin,
unsigned int port, unsigned int pin)
@@ -306,4 +306,4 @@ void crisv32_pinmux_dump(void)
}
}
-__initcall(crisv32_pinmux_init);
+device_initcall(crisv32_pinmux_init);
@@ -82,4 +82,4 @@ __init init_cris_profile(void)
return 0;
}
-__initcall(init_cris_profile);
+device_initcall(init_cris_profile);
@@ -160,4 +160,4 @@ __init init_udelay(void)
return 0;
}
-__initcall(init_udelay);
+device_initcall(init_udelay);
@@ -177,7 +177,7 @@ oops_nmi_register(void)
return 0;
}
-__initcall(oops_nmi_register);
+device_initcall(oops_nmi_register);
#endif
@@ -2017,7 +2017,7 @@ static int __init gdbstub_postinit(void)
return 0;
} /* end gdbstub_postinit() */
-__initcall(gdbstub_postinit);
+device_initcall(gdbstub_postinit);
#endif
/*****************************************************************************/
@@ -61,5 +61,5 @@ static int __init mb93093_pm_init(void)
return 0;
}
-__initcall(mb93093_pm_init);
+device_initcall(mb93093_pm_init);
@@ -348,6 +348,6 @@ static int __init pm_init(void)
return 0;
}
-__initcall(pm_init);
+device_initcall(pm_init);
#endif
@@ -217,4 +217,4 @@ static int __init frv_sysctl_init(void)
return 0;
}
-__initcall(frv_sysctl_init);
+device_initcall(frv_sysctl_init);
@@ -164,7 +164,7 @@ static __init int register_proc(void)
return proc_gpio != NULL;
}
-__initcall(register_proc);
+device_initcall(register_proc);
#endif
void __init h8300_gpio_init(void)
@@ -524,4 +524,4 @@ set_multicast_list(struct net_device *dev)
printk(KERN_WARNING "%s: set_multicast_list called\n", dev->name);
}
-__initcall(simeth_probe);
+device_initcall(simeth_probe);
@@ -980,5 +980,5 @@ simrs_init (void)
}
#ifndef MODULE
-__initcall(simrs_init);
+device_initcall(simrs_init);
#endif
@@ -57,4 +57,4 @@ static int __init audit_classes_init(void)
return 0;
}
-__initcall(audit_classes_init);
+device_initcall(audit_classes_init);
@@ -282,5 +282,5 @@ machine_crash_setup(void)
return 0;
}
-__initcall(machine_crash_setup);
+device_initcall(machine_crash_setup);
@@ -125,4 +125,4 @@ int __init init_cyclone_clock(void)
return 0;
}
-__initcall(init_cyclone_clock);
+device_initcall(init_cyclone_clock);
@@ -6700,7 +6700,7 @@ pfm_init(void)
return 0;
}
-__initcall(pfm_init);
+device_initcall(pfm_init);
/*
* this function is called before pfm_init()
@@ -243,7 +243,7 @@ static int __init register_memory(void)
return 0;
}
-__initcall(register_memory);
+device_initcall(register_memory);
#ifdef CONFIG_KEXEC
@@ -279,4 +279,4 @@ static int __init uncached_init(void)
return 0;
}
-__initcall(uncached_init);
+device_initcall(uncached_init);
@@ -2223,7 +2223,7 @@ create_gate_table (void)
return 0;
}
-__initcall(create_gate_table);
+device_initcall(create_gate_table);
void __init
unw_init (void)
@@ -716,4 +716,4 @@ per_linux32_init(void)
return 0;
}
-__initcall(per_linux32_init);
+device_initcall(per_linux32_init);
@@ -534,7 +534,7 @@ load-$(CONFIG_SGI_IP32) += 0xffffffff80004000
#
# This is a LIB so that it links at the end, and initcalls are later
# the sequence; but it is built as an object so that modules don't get
-# removed (as happens, even if they have __initcall/module_init)
+# removed (as happens, even if they have device_initcall/module_init)
#
core-$(CONFIG_SIBYTE_BCM112X) += arch/mips/sibyte/sb1250/
core-$(CONFIG_SIBYTE_BCM112X) += arch/mips/sibyte/common/
@@ -567,5 +567,5 @@ static int __init debugfs_unaligned(void)
return -ENOMEM;
return 0;
}
-__initcall(debugfs_unaligned);
+device_initcall(debugfs_unaligned);
#endif
@@ -285,4 +285,4 @@ static int __init lasat_register_sysctl(void)
return 0;
}
-__initcall(lasat_register_sysctl);
+device_initcall(lasat_register_sysctl);
@@ -1325,5 +1325,5 @@ static int __init debugfs_fpuemu(void)
return 0;
}
-__initcall(debugfs_fpuemu);
+device_initcall(debugfs_fpuemu);
#endif
@@ -108,4 +108,4 @@ static int pnx8550_proc_init( void )
return 0;
}
-__initcall(pnx8550_proc_init);
+device_initcall(pnx8550_proc_init);
@@ -255,4 +255,4 @@ int __init sibyte_bus_watcher(void)
return 0;
}
-__initcall(sibyte_bus_watcher);
+device_initcall(sibyte_bus_watcher);
@@ -1884,7 +1884,7 @@ static int __init gdbstub_postinit(void)
return 0;
}
-__initcall(gdbstub_postinit);
+device_initcall(gdbstub_postinit);
#endif
/*
@@ -1350,7 +1350,7 @@ static int __init mn10300_serial_init(void)
return ret;
}
-__initcall(mn10300_serial_init);
+device_initcall(mn10300_serial_init);
#ifdef CONFIG_MN10300_TTYSM_CONSOLE
@@ -48,4 +48,4 @@ static __init int profile_init(void)
return 0;
}
-__initcall(profile_init);
+device_initcall(profile_init);
@@ -410,7 +410,7 @@ pcxl_dma_init(void)
return 0;
}
-__initcall(pcxl_dma_init);
+device_initcall(pcxl_dma_init);
static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag)
{
@@ -295,7 +295,7 @@ static int __init pdc_chassis_create_procfs(void)
return 0;
}
-__initcall(pdc_chassis_create_procfs);
+device_initcall(pdc_chassis_create_procfs);
#endif /* CONFIG_PROC_FS */
#endif /* CONFIG_PDC_CHASSIS_WARN */
@@ -80,4 +80,4 @@ static int __init audit_classes_init(void)
return 0;
}
-__initcall(audit_classes_init);
+device_initcall(audit_classes_init);
@@ -134,5 +134,5 @@ register_powersave_nap_sysctl(void)
return 0;
}
-__initcall(register_powersave_nap_sysctl);
+device_initcall(register_powersave_nap_sysctl);
#endif
@@ -1203,7 +1203,7 @@ static int __init irq_debugfs_init(void)
return 0;
}
-__initcall(irq_debugfs_init);
+device_initcall(irq_debugfs_init);
#endif /* CONFIG_VIRQ_DEBUG */
#ifdef CONFIG_PPC64
@@ -91,7 +91,7 @@ static int __init proc_ppc64_init(void)
return 0;
}
-__initcall(proc_ppc64_init);
+device_initcall(proc_ppc64_init);
#endif /* CONFIG_PPC64 */
@@ -845,7 +845,7 @@ static int __init prom_reconfig_setup(void)
{
return pSeries_reconfig_notifier_register(&prom_reconfig_nb);
}
-__initcall(prom_reconfig_setup);
+device_initcall(prom_reconfig_setup);
#endif
/* Find the device node for a given logical cpu number, also returns the cpu
@@ -909,5 +909,5 @@ static int __init export_flat_device_tree(void)
return 0;
}
-__initcall(export_flat_device_tree);
+device_initcall(export_flat_device_tree);
#endif
@@ -279,7 +279,7 @@ static int __init proc_rtas_init(void)
return 0;
}
-__initcall(proc_rtas_init);
+device_initcall(proc_rtas_init);
static int parse_number(const char __user *p, size_t count, unsigned long *val)
{
@@ -508,7 +508,7 @@ static int __init rtas_init(void)
return 0;
}
-__initcall(rtas_init);
+device_initcall(rtas_init);
static int __init surveillance_setup(char *str)
{
@@ -92,7 +92,7 @@ static int __init smt_setup(void)
of_node_put(options);
return 0;
}
-__initcall(smt_setup);
+device_initcall(smt_setup);
static int __init setup_smt_snooze_delay(char *str)
{
@@ -248,7 +248,7 @@ int __init TAU_init(void)
return 0;
}
-__initcall(TAU_init);
+device_initcall(TAU_init);
/*
* return current temp
@@ -1303,7 +1303,7 @@ static int __init vio_bus_init(void)
return 0;
}
-__initcall(vio_bus_init);
+device_initcall(vio_bus_init);
static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf)
@@ -337,5 +337,5 @@ static int __init proc_lpevents_init(void)
&proc_lpevents_operations);
return 0;
}
-__initcall(proc_lpevents_init);
+device_initcall(proc_lpevents_init);
@@ -1299,7 +1299,7 @@ static int __init mf_proc_init(void)
return 0;
}
-__initcall(mf_proc_init);
+device_initcall(mf_proc_init);
#endif /* CONFIG_PROC_FS */
@@ -117,4 +117,4 @@ static int __init iseries_proc_init(void)
&proc_titantod_operations);
return 0;
}
-__initcall(iseries_proc_init);
+device_initcall(iseries_proc_init);
@@ -186,7 +186,7 @@ static int __init vio_proc_init(void)
proc_create("iSeries/config", 0, NULL, &proc_viopath_operations);
return 0;
}
-__initcall(vio_proc_init);
+device_initcall(vio_proc_init);
/* See if a given LP is active. Allow for invalid lps to be passed in
* and just return invalid
@@ -1287,4 +1287,4 @@ static int __init eeh_init_proc(void)
proc_create("ppc64/eeh", 0, NULL, &proc_eeh_operations);
return 0;
}
-__initcall(eeh_init_proc);
+device_initcall(eeh_init_proc);
@@ -164,4 +164,4 @@ static int __init hcall_inst_init(void)
return 0;
}
-__initcall(hcall_inst_init);
+device_initcall(hcall_inst_init);
@@ -77,5 +77,5 @@ static int __init apo_pm_init(void)
{
return (sysfs_create_file(power_kobj, &auto_poweron_attr.attr));
}
-__initcall(apo_pm_init);
+device_initcall(apo_pm_init);
#endif
@@ -152,7 +152,7 @@ static int __init init_ras_IRQ(void)
return 0;
}
-__initcall(init_ras_IRQ);
+device_initcall(init_ras_IRQ);
/*
* Handle power subsystem events (EPOW).
@@ -557,4 +557,4 @@ static int proc_ppc64_create_ofdt(void)
return 0;
}
-__initcall(proc_ppc64_create_ofdt);
+device_initcall(proc_ppc64_create_ofdt);
@@ -2751,7 +2751,7 @@ static int __init setup_xmon_sysrq(void)
register_sysrq_key('x', &sysrq_xmon_op);
return 0;
}
-__initcall(setup_xmon_sysrq);
+device_initcall(setup_xmon_sysrq);
#endif /* CONFIG_MAGIC_SYSRQ */
static int __initdata xmon_early, xmon_off;
@@ -659,7 +659,7 @@ out_driver:
return rc;
}
-__initcall(appldata_init);
+device_initcall(appldata_init);
/**************************** init / exit <END> ******************************/
@@ -75,4 +75,4 @@ static int __init audit_classes_init(void)
return 0;
}
-__initcall(audit_classes_init);
+device_initcall(audit_classes_init);
@@ -26,4 +26,4 @@ static int __init s390_init (void)
return 0;
}
-__initcall(s390_init);
+device_initcall(s390_init);
@@ -1806,7 +1806,7 @@ static int __init s390_ipl_init(void)
return 0;
}
-__initcall(s390_ipl_init);
+device_initcall(s390_ipl_init);
static void __init strncpy_skip_quote(char *dst, char *src, int n)
{
@@ -291,7 +291,7 @@ out:
update_cpu_core_map();
return rc;
}
-__initcall(init_topology_update);
+device_initcall(init_topology_update);
void __init s390_init_cpu_topology(void)
{
@@ -182,7 +182,7 @@ static int __init init_edosk7760_devices(void)
return platform_add_devices(edosk7760_devices,
ARRAY_SIZE(edosk7760_devices));
}
-__initcall(init_edosk7760_devices);
+device_initcall(init_edosk7760_devices);
/*
* The Machine Vector
@@ -284,7 +284,7 @@ static int __init sh7785lcr_devices_setup(void)
return platform_add_devices(sh7785lcr_devices,
ARRAY_SIZE(sh7785lcr_devices));
}
-__initcall(sh7785lcr_devices_setup);
+device_initcall(sh7785lcr_devices_setup);
/* Initialize IRQ setting */
void __init init_sh7785lcr_IRQ(void)
@@ -165,7 +165,7 @@ static int __init smsc_superio_setup(void)
return 0;
}
-__initcall(smsc_superio_setup);
+device_initcall(smsc_superio_setup);
static void __iomem *cayman_ioport_map(unsigned long port, unsigned int len)
{
@@ -83,7 +83,7 @@ static int __init landisk_devices_setup(void)
ARRAY_SIZE(landisk_devices));
}
-__initcall(landisk_devices_setup);
+device_initcall(landisk_devices_setup);
static void __init landisk_setup(char **cmdline_p)
{
@@ -258,7 +258,7 @@ static int __init rts7751r2d_devices_setup(void)
return platform_add_devices(rts7751r2d_devices,
ARRAY_SIZE(rts7751r2d_devices));
}
-__initcall(rts7751r2d_devices_setup);
+device_initcall(rts7751r2d_devices_setup);
static void rts7751r2d_power_off(void)
{
@@ -132,7 +132,7 @@ static int __init sdk7786_devices_setup(void)
return sdk7786_i2c_setup();
}
-__initcall(sdk7786_devices_setup);
+device_initcall(sdk7786_devices_setup);
static int sdk7786_mode_pins(void)
{
@@ -77,7 +77,7 @@ static int __init se7206_devices_setup(void)
{
return platform_add_devices(se7206_devices, ARRAY_SIZE(se7206_devices));
}
-__initcall(se7206_devices_setup);
+device_initcall(se7206_devices_setup);
/*
* The Machine Vector
@@ -48,7 +48,7 @@ static int __init se7751_devices_setup(void)
{
return platform_add_devices(se7751_devices, ARRAY_SIZE(se7751_devices));
}
-__initcall(se7751_devices_setup);
+device_initcall(se7751_devices_setup);
/*
* The Machine Vector
@@ -96,7 +96,7 @@ static int __init sh03_devices_setup(void)
return platform_add_devices(sh03_devices, ARRAY_SIZE(sh03_devices));
}
-__initcall(sh03_devices_setup);
+device_initcall(sh03_devices_setup);
static struct sh_machine_vector mv_sh03 __initmv = {
.mv_name = "Interface (CTP/PCI-SH03)",
@@ -923,7 +923,7 @@ static int __init init_sysctl(void)
return 0;
}
-__initcall(init_sysctl);
+device_initcall(init_sysctl);
asmlinkage void do_debug_interrupt(unsigned long code, struct pt_regs *regs)
@@ -188,4 +188,4 @@ static int __init apc_init(void)
* and is easiest to ioremap when SBus is already
* initialized, so we install ourselves thusly:
*/
-__initcall(apc_init);
+device_initcall(apc_init);
@@ -80,4 +80,4 @@ static int __init audit_classes_init(void)
return 0;
}
-__initcall(audit_classes_init);
+device_initcall(audit_classes_init);
@@ -903,7 +903,7 @@ static int __init mdesc_misc_init(void)
return misc_register(&mdesc_misc);
}
-__initcall(mdesc_misc_init);
+device_initcall(mdesc_misc_init);
void __init sun4v_mdesc_init(void)
{
@@ -93,4 +93,4 @@ static int __init pmc_init(void)
* and is easiest to ioremap when SBus is already
* initialized, so we install ourselves thusly:
*/
-__initcall(pmc_init);
+device_initcall(pmc_init);
@@ -493,7 +493,7 @@ static int __init mem_mc_init(void)
return 0;
}
-__initcall(mem_mc_init);
+device_initcall(mem_mc_init);
#define CONFIG_BUF_SIZE 64
@@ -816,7 +816,7 @@ static int __init mconsole_init(void)
return 1;
}
-__initcall(mconsole_init);
+device_initcall(mconsole_init);
static ssize_t mconsole_proc_write(struct file *file,
const char __user *buffer, size_t count, loff_t *pos)
@@ -873,7 +873,7 @@ void unlock_notify(void)
spin_unlock(¬ify_spinlock);
}
-__initcall(create_proc_mconsole);
+device_initcall(create_proc_mconsole);
#define NOTIFY "notify:"
@@ -923,7 +923,7 @@ static int add_notifier(void)
return 0;
}
-__initcall(add_notifier);
+device_initcall(add_notifier);
char *mconsole_notify_socket(void)
{
@@ -824,7 +824,7 @@ static int uml_net_init(void)
return 0;
}
-__initcall(uml_net_init);
+device_initcall(uml_net_init);
static void close_devices(void)
{
@@ -59,4 +59,4 @@ static int __init unregister_stderr(void)
return 0;
}
-__initcall(unregister_stderr);
+device_initcall(unregister_stderr);
@@ -1010,7 +1010,7 @@ static int __init ubd_mc_init(void)
return 0;
}
-__initcall(ubd_mc_init);
+device_initcall(ubd_mc_init);
static int __init ubd0_init(void)
{
@@ -1024,7 +1024,7 @@ static int __init ubd0_init(void)
return 0;
}
-__initcall(ubd0_init);
+device_initcall(ubd0_init);
/* Used in ubd_init, which is an initcall */
static struct platform_driver ubd_driver = {
@@ -75,4 +75,4 @@ static int make_proc_exitcode(void)
return 0;
}
-__initcall(make_proc_exitcode);
+device_initcall(make_proc_exitcode);
@@ -209,4 +209,4 @@ static int setup_iomem(void)
return 0;
}
-__initcall(setup_iomem);
+device_initcall(setup_iomem);
@@ -343,13 +343,13 @@ static int init_aio(void)
}
/*
- * The reason for the __initcall/__uml_exitcall asymmetry is that init_aio
+ * The reason for the device_initcall/__uml_exitcall asymmetry is that init_aio
* needs to be called when the kernel is running because it calls run_helper,
* which needs get_free_page. exit_aio is a __uml_exitcall because the generic
* kernel does not run __exitcalls on shutdown, and can't because many of them
* break when called outside of module unloading.
*/
-__initcall(init_aio);
+device_initcall(init_aio);
static void exit_aio(void)
{
@@ -46,7 +46,7 @@ static int __init init_syscall_regs(void)
return 0;
}
-__initcall(init_syscall_regs);
+device_initcall(init_syscall_regs);
extern int proc_mm;
@@ -473,7 +473,7 @@ static int __init init_thread_regs(void)
return 0;
}
-__initcall(init_thread_regs);
+device_initcall(init_thread_regs);
int copy_context_skas0(unsigned long new_stack, int pid)
{
@@ -326,7 +326,7 @@ static int __init make_umid_init(void)
return 0;
}
-__initcall(make_umid_init);
+device_initcall(make_umid_init);
int __init umid_file_name(char *name, char *buf, int len)
{
@@ -393,4 +393,4 @@ static int __init __setup_host_supports_tls(void)
return 0;
}
-__initcall(__setup_host_supports_tls);
+device_initcall(__setup_host_supports_tls);
@@ -78,4 +78,4 @@ static int __init audit_classes_init(void)
return 0;
}
-__initcall(audit_classes_init);
+device_initcall(audit_classes_init);
@@ -860,5 +860,5 @@ static int __init uv_bau_init(void)
return 0;
}
-__initcall(uv_bau_init);
-__initcall(uv_ptc_init);
+device_initcall(uv_bau_init);
+device_initcall(uv_ptc_init);
@@ -244,7 +244,7 @@ static ctl_table kernel_root_table2[] = {
};
#endif
-/* Assume __initcall executes before all user space. Hopefully kmod
+/* Assume device_initcall executes before all user space. Hopefully kmod
doesn't violate that. We'll find out if it does. */
static void __cpuinit vsyscall_set_cpu(int cpu)
{
@@ -306,4 +306,4 @@ static int __init vsyscall_init(void)
return 0;
}
-__initcall(vsyscall_init);
+device_initcall(vsyscall_init);
@@ -349,7 +349,7 @@ static int pt_dump_init(void)
return 0;
}
-__initcall(pt_dump_init);
+device_initcall(pt_dump_init);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Arjan van de Ven <arjan@linux.intel.com>");
MODULE_DESCRIPTION("Kernel debugging helper that dumps pagetables");
@@ -374,7 +374,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
#ifdef CONFIG_X86_64
-__initcall(sysenter_setup);
+device_initcall(sysenter_setup);
#ifdef CONFIG_SYSCTL
/* Register vsyscall32 into the ABI table */
@@ -405,7 +405,7 @@ static __init int ia32_binfmt_init(void)
register_sysctl_table(abi_root_table2);
return 0;
}
-__initcall(ia32_binfmt_init);
+device_initcall(ia32_binfmt_init);
#endif
#else /* CONFIG_X86_32 */
@@ -73,7 +73,7 @@ static int __init init_vdso_vars(void)
vdso_enabled = 0;
return -ENOMEM;
}
-__initcall(init_vdso_vars);
+device_initcall(init_vdso_vars);
struct linux_binprm;
@@ -248,7 +248,7 @@ static __exit void rs_exit(void)
}
-/* We use `late_initcall' instead of just `__initcall' as a workaround for
+/* We use `late_initcall' instead of just `device_initcall' as a workaround for
* the fact that (1) simcons_tty_init can't be called before tty_init,
* (2) tty_init is called via `module_init', (3) if statically linked,
* module_init == device_init, and (4) there's no ordering of init lists.
@@ -775,4 +775,4 @@ static int __init am79c961_init(void)
return platform_driver_register(&am79c961_driver);
}
-__initcall(am79c961_init);
+device_initcall(am79c961_init);
@@ -35,6 +35,7 @@
* removed some pre-2.2 kernel compatibility cruft
* 0.6 10.08.1999 Check if parport can do SPP and is safe to access during interrupt contexts
* 0.7 12.02.2000 adapted to softnet driver interface
+ * 0.8 03.18.2010 update deprecated __initcall to device_initcall
*
*/
@@ -64,6 +64,7 @@
* 0.8 12.02.2000 adapted to softnet driver interface
* removed direct parport access, uses parport driver methods
* 0.9 03.07.2000 fix interface name handling
+ * 0.10 03.18.2010 update deprecated __initcall to device_initcall
*/
/*****************************************************************************/
@@ -67,6 +67,7 @@
* 0.8 10.08.1999 use module_init/module_exit
* 0.9 12.02.2000 adapted to softnet driver interface
* 0.10 03.07.2000 fix interface name handling
+ * 0.11 03.18.2010 update deprecated __initcall to device_initcall
*/
/*****************************************************************************/
@@ -57,6 +57,7 @@
* 0.8 10.08.1999 use module_init/module_exit
* 0.9 12.02.2000 adapted to softnet driver interface
* 0.10 03.07.2000 fix interface name handling
+ * 0.11 03.18.2010 update deprecated __initcall to device_initcall
*/
/*****************************************************************************/
@@ -628,7 +628,7 @@ out:
free_page((unsigned long) sccb);
return rc;
}
-__initcall(sclp_detect_standby_memory);
+device_initcall(sclp_detect_standby_memory);
#endif /* CONFIG_MEMORY_HOTPLUG */
@@ -87,4 +87,4 @@ static int __init sclp_conf_init(void)
return rc;
}
-__initcall(sclp_conf_init);
+device_initcall(sclp_conf_init);
@@ -426,4 +426,4 @@ static int __init cpi_init(void)
return rc;
}
-__initcall(cpi_init);
+device_initcall(cpi_init);
@@ -707,7 +707,7 @@ out_driver:
put_tty_driver(driver);
return rc;
}
-__initcall(sclp_vt220_tty_init);
+device_initcall(sclp_vt220_tty_init);
static void __sclp_vt220_flush_buffer(void)
{
@@ -398,6 +398,6 @@ cio_ignore_proc_init (void)
return 0;
}
-__initcall (cio_ignore_proc_init);
+device_initcall(cio_ignore_proc_init);
#endif /* CONFIG_PROC_FS */
@@ -229,7 +229,7 @@ static int __init init_crypto(void)
return 0;
}
-__initcall(init_crypto);
+device_initcall(init_crypto);
/*
EXPORT_SYMBOL_GPL(crypto_register_alg);
@@ -92,7 +92,7 @@ static int __init aio_setup(void)
return 0;
}
-__initcall(aio_setup);
+device_initcall(aio_setup);
static void aio_free_ring(struct kioctx *ctx)
{
@@ -1780,4 +1780,4 @@ static int __init init_sys32_ioctl(void)
init_sys32_ioctl_cmp, NULL);
return 0;
}
-__initcall(init_sys32_ioctl);
+device_initcall(init_sys32_ioctl);
@@ -209,4 +209,4 @@ static int __init ipc_sysctl_init(void)
return 0;
}
-__initcall(ipc_sysctl_init);
+device_initcall(ipc_sysctl_init);
@@ -1322,4 +1322,4 @@ out_sysctl:
return error;
}
-__initcall(init_mqueue_fs);
+device_initcall(init_mqueue_fs);
@@ -106,7 +106,7 @@ static int __init ipc_init(void)
register_ipcns_notifier(&init_ipc_ns);
return 0;
}
-__initcall(ipc_init);
+device_initcall(ipc_init);
/**
* ipc_init_ids - initialise IPC identifiers
@@ -989,7 +989,7 @@ static int __init audit_init(void)
return 0;
}
-__initcall(audit_init);
+device_initcall(audit_init);
/* Process kernel command-line parameter at boot time. audit=0 or audit=1. */
static int __init audit_enable(char *str)
@@ -919,4 +919,4 @@ static int __init audit_tree_init(void)
return 0;
}
-__initcall(audit_tree_init);
+device_initcall(audit_tree_init);
@@ -153,7 +153,7 @@ static int __init proc_dma_init(void)
return 0;
}
-__initcall(proc_dma_init);
+device_initcall(proc_dma_init);
#endif
EXPORT_SYMBOL(request_dma);
@@ -2670,4 +2670,4 @@ static int __init futex_init(void)
return 0;
}
-__initcall(futex_init);
+device_initcall(futex_init);
@@ -687,5 +687,5 @@ static int __init lockdep_proc_init(void)
return 0;
}
-__initcall(lockdep_proc_init);
+device_initcall(lockdep_proc_init);
@@ -189,4 +189,4 @@ static __init int pid_namespaces_init(void)
return 0;
}
-__initcall(pid_namespaces_init);
+device_initcall(pid_namespaces_init);
@@ -1727,4 +1727,4 @@ static __init int init_posix_cpu_timers(void)
return 0;
}
-__initcall(init_posix_cpu_timers);
+device_initcall(init_posix_cpu_timers);
@@ -309,7 +309,7 @@ static __init int init_posix_timers(void)
return 0;
}
-__initcall(init_posix_timers);
+device_initcall(init_posix_timers);
static void schedule_next_timer(struct k_itimer *timr)
{
@@ -136,7 +136,7 @@ static int __init ioresources_init(void)
proc_create("iomem", 0, NULL, &proc_iomem_operations);
return 0;
}
-__initcall(ioresources_init);
+device_initcall(ioresources_init);
#endif /* CONFIG_PROC_FS */
@@ -379,7 +379,7 @@ static int __init init_sched_debug_procfs(void)
return 0;
}
-__initcall(init_sched_debug_procfs);
+device_initcall(init_sched_debug_procfs);
void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
{
@@ -296,4 +296,4 @@ static int __init init_timer_list_procfs(void)
return -ENOMEM;
return 0;
}
-__initcall(init_timer_list_procfs);
+device_initcall(init_timer_list_procfs);
@@ -422,4 +422,4 @@ static int __init init_tstats_procfs(void)
return -ENOMEM;
return 0;
}
-__initcall(init_tstats_procfs);
+device_initcall(init_tstats_procfs);
@@ -580,7 +580,7 @@ static int init_tracepoints(void)
{
return register_module_notifier(&tracepoint_module_nb);
}
-__initcall(init_tracepoints);
+device_initcall(init_tracepoints);
#endif /* CONFIG_MODULES */
@@ -111,4 +111,4 @@ static int __init utsname_sysctl_init(void)
return 0;
}
-__initcall(utsname_sysctl_init);
+device_initcall(utsname_sysctl_init);
@@ -63,4 +63,4 @@ static int __init audit_classes_init(void)
return 0;
}
-__initcall(audit_classes_init);
+device_initcall(audit_classes_init);
@@ -666,7 +666,7 @@ err:
return -ENOMEM;
}
-__initcall(debug_objects_init_debugfs);
+device_initcall(debug_objects_init_debugfs);
#else
static inline void debug_objects_init_debugfs(void) { }
@@ -39,7 +39,7 @@ static __init int init_emergency_pool(void)
return 0;
}
-__initcall(init_emergency_pool);
+device_initcall(init_emergency_pool);
/*
* highmem version, map in to vec
@@ -3231,7 +3231,7 @@ static int __init gate_vma_init(void)
gate_vma.vm_flags |= VM_ALWAYSDUMP;
return 0;
}
-__initcall(gate_vma_init);
+device_initcall(gate_vma_init);
#endif
struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
@@ -149,4 +149,4 @@ static int __init mm_sysfs_init(void)
return 0;
}
-__initcall(mm_sysfs_init);
+device_initcall(mm_sysfs_init);
@@ -1597,7 +1597,7 @@ static int __init cpucache_init(void)
start_cpu_timer(cpu);
return 0;
}
-__initcall(cpucache_init);
+device_initcall(cpucache_init);
/*
* Interface to system's page allocator. No need to hold the cache-lock.
@@ -4577,7 +4577,7 @@ static int __init slab_sysfs_init(void)
return 0;
}
-__initcall(slab_sysfs_init);
+device_initcall(slab_sysfs_init);
#endif
/*
@@ -1764,7 +1764,7 @@ static int __init procswaps_init(void)
proc_create("swaps", 0, NULL, &proc_swaps_operations);
return 0;
}
-__initcall(procswaps_init);
+device_initcall(procswaps_init);
#endif /* CONFIG_PROC_FS */
#ifdef MAX_SWAPFILES_CHECK
@@ -32,7 +32,7 @@ static __init int init_syncookies(void)
get_random_bytes(syncookie_secret, sizeof(syncookie_secret));
return 0;
}
-__initcall(init_syncookies);
+device_initcall(init_syncookies);
#define COOKIEBITS 24 /* Upper bits store count */
#define COOKIEMASK (((__u32)1 << COOKIEBITS) - 1)
@@ -748,4 +748,4 @@ static __init int sysctl_ipv4_init(void)
return 0;
}
-__initcall(sysctl_ipv4_init);
+device_initcall(sysctl_ipv4_init);
@@ -83,7 +83,7 @@ static int __init key_proc_init(void)
} /* end key_proc_init() */
-__initcall(key_proc_init);
+device_initcall(key_proc_init);
/*****************************************************************************/
/*
@@ -5783,7 +5783,7 @@ out:
return err;
}
-__initcall(selinux_nf_ip_init);
+device_initcall(selinux_nf_ip_init);
#ifdef CONFIG_SECURITY_SELINUX_DISABLE
static void selinux_nf_ip_exit(void)
@@ -315,5 +315,5 @@ static __init int sel_netif_init(void)
return err;
}
-__initcall(sel_netif_init);
+device_initcall(sel_netif_init);
@@ -113,4 +113,4 @@ static int __init selnl_init(void)
return 0;
}
-__initcall(selnl_init);
+device_initcall(selnl_init);
@@ -344,4 +344,4 @@ static __init int sel_netnode_init(void)
return ret;
}
-__initcall(sel_netnode_init);
+device_initcall(sel_netnode_init);
@@ -278,4 +278,4 @@ static __init int sel_netport_init(void)
return ret;
}
-__initcall(sel_netport_init);
+device_initcall(sel_netport_init);
@@ -1730,7 +1730,7 @@ static int __init init_sel_fs(void)
return err;
}
-__initcall(init_sel_fs);
+device_initcall(init_sel_fs);
#ifdef CONFIG_SECURITY_SELINUX_DISABLE
void exit_sel_fs(void)
@@ -2964,7 +2964,7 @@ static int __init aurule_init(void)
return err;
}
-__initcall(aurule_init);
+device_initcall(aurule_init);
#ifdef CONFIG_NETLABEL
/**
@@ -1366,4 +1366,4 @@ static int __init init_smk_fs(void)
return err;
}
-__initcall(init_smk_fs);
+device_initcall(init_smk_fs);
@@ -38,4 +38,4 @@ static int __init alsa_sound_last_init(void)
return 0;
}
-__initcall(alsa_sound_last_init);
+device_initcall(alsa_sound_last_init);