From 8a6d48c0542876eb3acfc0970c0ab7872db08d5f Mon Sep 17 00:00:00 2001
From: Zheng Da <zhengda1936@gmail.com>
Date: Sun, 6 Dec 2009 05:26:23 +0100
Subject: check in the original version of dde linux26.

---
 libdde_linux26/lib/src/drivers/pci/pci-driver.c | 1008 +++++++++++++++++++++++
 1 file changed, 1008 insertions(+)
 create mode 100644 libdde_linux26/lib/src/drivers/pci/pci-driver.c

(limited to 'libdde_linux26/lib/src/drivers/pci/pci-driver.c')

diff --git a/libdde_linux26/lib/src/drivers/pci/pci-driver.c b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
new file mode 100644
index 00000000..199ec8a7
--- /dev/null
+++ b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
@@ -0,0 +1,1008 @@
+/*
+ * drivers/pci/pci-driver.c
+ *
+ * (C) Copyright 2002-2004, 2007 Greg Kroah-Hartman <greg@kroah.com>
+ * (C) Copyright 2007 Novell Inc.
+ *
+ * Released under the GPL v2 only.
+ *
+ */
+
+#include <linux/pci.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/mempolicy.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/cpu.h>
+#include "pci.h"
+
+#ifdef DDE_LINUX
+#include "local.h"
+#endif /* DDE_LINUX */
+
+/*
+ * Dynamic device IDs are disabled for !CONFIG_HOTPLUG
+ */
+
+struct pci_dynid {
+	struct list_head node;
+	struct pci_device_id id;
+};
+
+#ifdef CONFIG_HOTPLUG
+
+/**
+ * store_new_id - add a new PCI device ID to this driver and re-probe devices
+ * @driver: target device driver
+ * @buf: buffer for scanning device ID data
+ * @count: input size
+ *
+ * Adds a new dynamic pci device ID to this driver,
+ * and causes the driver to probe for all devices again.
+ */
+static ssize_t
+store_new_id(struct device_driver *driver, const char *buf, size_t count)
+{
+	struct pci_dynid *dynid;
+	struct pci_driver *pdrv = to_pci_driver(driver);
+	const struct pci_device_id *ids = pdrv->id_table;
+	__u32 vendor, device, subvendor=PCI_ANY_ID,
+		subdevice=PCI_ANY_ID, class=0, class_mask=0;
+	unsigned long driver_data=0;
+	int fields=0;
+	int retval=0;
+
+	fields = sscanf(buf, "%x %x %x %x %x %x %lx",
+			&vendor, &device, &subvendor, &subdevice,
+			&class, &class_mask, &driver_data);
+	if (fields < 2)
+		return -EINVAL;
+
+	/* Only accept driver_data values that match an existing id_table
+	   entry */
+	if (ids) {
+		retval = -EINVAL;
+		while (ids->vendor || ids->subvendor || ids->class_mask) {
+			if (driver_data == ids->driver_data) {
+				retval = 0;
+				break;
+			}
+			ids++;
+		}
+		if (retval)	/* No match */
+			return retval;
+	}
+
+	dynid = kzalloc(sizeof(*dynid), GFP_KERNEL);
+	if (!dynid)
+		return -ENOMEM;
+
+	dynid->id.vendor = vendor;
+	dynid->id.device = device;
+	dynid->id.subvendor = subvendor;
+	dynid->id.subdevice = subdevice;
+	dynid->id.class = class;
+	dynid->id.class_mask = class_mask;
+	dynid->id.driver_data = driver_data;
+
+	spin_lock(&pdrv->dynids.lock);
+	list_add_tail(&dynid->node, &pdrv->dynids.list);
+	spin_unlock(&pdrv->dynids.lock);
+
+	if (get_driver(&pdrv->driver)) {
+		retval = driver_attach(&pdrv->driver);
+		put_driver(&pdrv->driver);
+	}
+
+	if (retval)
+		return retval;
+	return count;
+}
+static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id);
+
+static void
+pci_free_dynids(struct pci_driver *drv)
+{
+	struct pci_dynid *dynid, *n;
+
+	spin_lock(&drv->dynids.lock);
+	list_for_each_entry_safe(dynid, n, &drv->dynids.list, node) {
+		list_del(&dynid->node);
+		kfree(dynid);
+	}
+	spin_unlock(&drv->dynids.lock);
+}
+
+static int
+pci_create_newid_file(struct pci_driver *drv)
+{
+	int error = 0;
+	if (drv->probe != NULL)
+		error = driver_create_file(&drv->driver, &driver_attr_new_id);
+	return error;
+}
+
+static void pci_remove_newid_file(struct pci_driver *drv)
+{
+	driver_remove_file(&drv->driver, &driver_attr_new_id);
+}
+#else /* !CONFIG_HOTPLUG */
+static inline void pci_free_dynids(struct pci_driver *drv) {}
+static inline int pci_create_newid_file(struct pci_driver *drv)
+{
+	return 0;
+}
+static inline void pci_remove_newid_file(struct pci_driver *drv) {}
+#endif
+
+/**
+ * pci_match_id - See if a pci device matches a given pci_id table
+ * @ids: array of PCI device id structures to search in
+ * @dev: the PCI device structure to match against.
+ *
+ * Used by a driver to check whether a PCI device present in the
+ * system is in its list of supported devices.  Returns the matching
+ * pci_device_id structure or %NULL if there is no match.
+ *
+ * Deprecated, don't use this as it will not catch any dynamic ids
+ * that a driver might want to check for.
+ */
+const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
+					 struct pci_dev *dev)
+{
+	if (ids) {
+		while (ids->vendor || ids->subvendor || ids->class_mask) {
+			if (pci_match_one_device(ids, dev))
+				return ids;
+			ids++;
+		}
+	}
+	return NULL;
+}
+
+/**
+ * pci_match_device - Tell if a PCI device structure has a matching PCI device id structure
+ * @drv: the PCI driver to match against
+ * @dev: the PCI device structure to match against
+ *
+ * Used by a driver to check whether a PCI device present in the
+ * system is in its list of supported devices.  Returns the matching
+ * pci_device_id structure or %NULL if there is no match.
+ */
+static const struct pci_device_id *pci_match_device(struct pci_driver *drv,
+						    struct pci_dev *dev)
+{
+	struct pci_dynid *dynid;
+
+	/* Look at the dynamic ids first, before the static ones */
+	spin_lock(&drv->dynids.lock);
+	list_for_each_entry(dynid, &drv->dynids.list, node) {
+		if (pci_match_one_device(&dynid->id, dev)) {
+			spin_unlock(&drv->dynids.lock);
+			return &dynid->id;
+		}
+	}
+	spin_unlock(&drv->dynids.lock);
+
+	return pci_match_id(drv->id_table, dev);
+}
+
+struct drv_dev_and_id {
+	struct pci_driver *drv;
+	struct pci_dev *dev;
+	const struct pci_device_id *id;
+};
+
+static long local_pci_probe(void *_ddi)
+{
+	struct drv_dev_and_id *ddi = _ddi;
+
+	return ddi->drv->probe(ddi->dev, ddi->id);
+}
+
+static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
+			  const struct pci_device_id *id)
+{
+	int error, node;
+	struct drv_dev_and_id ddi = { drv, dev, id };
+
+	/* Execute driver initialization on node where the device's
+	   bus is attached to.  This way the driver likely allocates
+	   its local memory on the right node without any need to
+	   change it. */
+	node = dev_to_node(&dev->dev);
+	if (node >= 0) {
+		int cpu;
+		node_to_cpumask_ptr(nodecpumask, node);
+
+		get_online_cpus();
+		cpu = cpumask_any_and(nodecpumask, cpu_online_mask);
+		if (cpu < nr_cpu_ids)
+			error = work_on_cpu(cpu, local_pci_probe, &ddi);
+		else
+			error = local_pci_probe(&ddi);
+		put_online_cpus();
+	} else
+		error = local_pci_probe(&ddi);
+	return error;
+}
+
+/**
+ * __pci_device_probe()
+ * @drv: driver to call to check if it wants the PCI device
+ * @pci_dev: PCI device being probed
+ * 
+ * returns 0 on success, else error.
+ * side-effect: pci_dev->driver is set to drv when drv claims pci_dev.
+ */
+static int
+__pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
+{
+	const struct pci_device_id *id;
+	int error = 0;
+
+	if (!pci_dev->driver && drv->probe) {
+		error = -ENODEV;
+
+		id = pci_match_device(drv, pci_dev);
+		if (id)
+			error = pci_call_probe(drv, pci_dev, id);
+		if (error >= 0) {
+			pci_dev->driver = drv;
+			error = 0;
+		}
+	}
+	return error;
+}
+
+static int pci_device_probe(struct device * dev)
+{
+	int error = 0;
+	struct pci_driver *drv;
+	struct pci_dev *pci_dev;
+
+	drv = to_pci_driver(dev->driver);
+	pci_dev = to_pci_dev(dev);
+	pci_dev_get(pci_dev);
+	error = __pci_device_probe(drv, pci_dev);
+	if (error)
+		pci_dev_put(pci_dev);
+
+	return error;
+}
+
+static int pci_device_remove(struct device * dev)
+{
+	struct pci_dev * pci_dev = to_pci_dev(dev);
+	struct pci_driver * drv = pci_dev->driver;
+
+	if (drv) {
+		if (drv->remove)
+			drv->remove(pci_dev);
+		pci_dev->driver = NULL;
+	}
+
+	/*
+	 * If the device is still on, set the power state as "unknown",
+	 * since it might change by the next time we load the driver.
+	 */
+	if (pci_dev->current_state == PCI_D0)
+		pci_dev->current_state = PCI_UNKNOWN;
+
+	/*
+	 * We would love to complain here if pci_dev->is_enabled is set, that
+	 * the driver should have called pci_disable_device(), but the
+	 * unfortunate fact is there are too many odd BIOS and bridge setups
+	 * that don't like drivers doing that all of the time.  
+	 * Oh well, we can dream of sane hardware when we sleep, no matter how
+	 * horrible the crap we have to deal with is when we are awake...
+	 */
+
+	pci_dev_put(pci_dev);
+	return 0;
+}
+
+static void pci_device_shutdown(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct pci_driver *drv = pci_dev->driver;
+
+	if (drv && drv->shutdown)
+		drv->shutdown(pci_dev);
+	pci_msi_shutdown(pci_dev);
+	pci_msix_shutdown(pci_dev);
+}
+
+#ifdef CONFIG_PM_SLEEP
+
+/*
+ * Default "suspend" method for devices that have no driver provided suspend,
+ * or not even a driver at all (second part).
+ */
+static void pci_pm_set_unknown_state(struct pci_dev *pci_dev)
+{
+	/*
+	 * mark its power state as "unknown", since we don't know if
+	 * e.g. the BIOS will change its device state when we suspend.
+	 */
+	if (pci_dev->current_state == PCI_D0)
+		pci_dev->current_state = PCI_UNKNOWN;
+}
+
+/*
+ * Default "resume" method for devices that have no driver provided resume,
+ * or not even a driver at all (second part).
+ */
+static int pci_pm_reenable_device(struct pci_dev *pci_dev)
+{
+	int retval;
+
+	/* if the device was enabled before suspend, reenable */
+	retval = pci_reenable_device(pci_dev);
+	/*
+	 * if the device was busmaster before the suspend, make it busmaster
+	 * again
+	 */
+	if (pci_dev->is_busmaster)
+		pci_set_master(pci_dev);
+
+	return retval;
+}
+
+static int pci_legacy_suspend(struct device *dev, pm_message_t state)
+{
+#ifndef DDE_LINUX
+	struct pci_dev * pci_dev = to_pci_dev(dev);
+	struct pci_driver * drv = pci_dev->driver;
+	int i = 0;
+
+	if (drv && drv->suspend) {
+		pci_power_t prev = pci_dev->current_state;
+
+		pci_dev->state_saved = false;
+
+		i = drv->suspend(pci_dev, state);
+		suspend_report_result(drv->suspend, i);
+		if (i)
+			return i;
+
+		if (pci_dev->state_saved)
+			goto Fixup;
+
+		if (pci_dev->current_state != PCI_D0
+		    && pci_dev->current_state != PCI_UNKNOWN) {
+			WARN_ONCE(pci_dev->current_state != prev,
+				"PCI PM: Device state not saved by %pF\n",
+				drv->suspend);
+			goto Fixup;
+		}
+	}
+
+	pci_save_state(pci_dev);
+	/*
+	 * This is for compatibility with existing code with legacy PM support.
+	 */
+	pci_pm_set_unknown_state(pci_dev);
+
+ Fixup:
+	pci_fixup_device(pci_fixup_suspend, pci_dev);
+
+	return i;
+#else
+	WARN_UNIMPL;
+	return 0;
+#endif /* DDE_LINUX */
+}
+
+static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
+{
+#ifndef DDE_LINUX
+	struct pci_dev * pci_dev = to_pci_dev(dev);
+	struct pci_driver * drv = pci_dev->driver;
+	int i = 0;
+
+	if (drv && drv->suspend_late) {
+		i = drv->suspend_late(pci_dev, state);
+		suspend_report_result(drv->suspend_late, i);
+	}
+	return i;
+#else
+	WARN_UNIMPL;
+	return 0;
+#endif
+}
+
+static int pci_legacy_resume_early(struct device *dev)
+{
+	struct pci_dev * pci_dev = to_pci_dev(dev);
+	struct pci_driver * drv = pci_dev->driver;
+
+	return drv && drv->resume_early ?
+			drv->resume_early(pci_dev) : 0;
+}
+
+static int pci_legacy_resume(struct device *dev)
+{
+	struct pci_dev * pci_dev = to_pci_dev(dev);
+	struct pci_driver * drv = pci_dev->driver;
+
+	pci_fixup_device(pci_fixup_resume, pci_dev);
+
+	return drv && drv->resume ?
+			drv->resume(pci_dev) : pci_pm_reenable_device(pci_dev);
+}
+
+/* Auxiliary functions used by the new power management framework */
+
+static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev)
+{
+	pci_restore_standard_config(pci_dev);
+	pci_dev->state_saved = false;
+	pci_fixup_device(pci_fixup_resume_early, pci_dev);
+}
+
+static void pci_pm_default_resume(struct pci_dev *pci_dev)
+{
+	pci_fixup_device(pci_fixup_resume, pci_dev);
+
+	if (!pci_is_bridge(pci_dev))
+		pci_enable_wake(pci_dev, PCI_D0, false);
+}
+
+static void pci_pm_default_suspend(struct pci_dev *pci_dev)
+{
+	/* Disable non-bridge devices without PM support */
+	if (!pci_is_bridge(pci_dev))
+		pci_disable_enabled_device(pci_dev);
+	pci_save_state(pci_dev);
+}
+
+static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
+{
+	struct pci_driver *drv = pci_dev->driver;
+	bool ret = drv && (drv->suspend || drv->suspend_late || drv->resume
+		|| drv->resume_early);
+
+	/*
+	 * Legacy PM support is used by default, so warn if the new framework is
+	 * supported as well.  Drivers are supposed to support either the
+	 * former, or the latter, but not both at the same time.
+	 */
+	WARN_ON(ret && drv->driver.pm);
+
+	return ret;
+}
+
+/* New power management framework */
+
+static int pci_pm_prepare(struct device *dev)
+{
+	struct device_driver *drv = dev->driver;
+	int error = 0;
+
+	if (drv && drv->pm && drv->pm->prepare)
+		error = drv->pm->prepare(dev);
+
+	return error;
+}
+
+static void pci_pm_complete(struct device *dev)
+{
+	struct device_driver *drv = dev->driver;
+
+	if (drv && drv->pm && drv->pm->complete)
+		drv->pm->complete(dev);
+}
+
+#ifdef CONFIG_SUSPEND
+
+static int pci_pm_suspend(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_suspend(dev, PMSG_SUSPEND);
+
+	if (!pm) {
+		pci_pm_default_suspend(pci_dev);
+		goto Fixup;
+	}
+
+	pci_dev->state_saved = false;
+
+	if (pm->suspend) {
+		pci_power_t prev = pci_dev->current_state;
+		int error;
+
+		error = pm->suspend(dev);
+		suspend_report_result(pm->suspend, error);
+		if (error)
+			return error;
+
+		if (pci_dev->state_saved)
+			goto Fixup;
+
+		if (pci_dev->current_state != PCI_D0
+		    && pci_dev->current_state != PCI_UNKNOWN) {
+			WARN_ONCE(pci_dev->current_state != prev,
+				"PCI PM: State of device not saved by %pF\n",
+				pm->suspend);
+			goto Fixup;
+		}
+	}
+
+	if (!pci_dev->state_saved) {
+		pci_save_state(pci_dev);
+		if (!pci_is_bridge(pci_dev))
+			pci_prepare_to_sleep(pci_dev);
+	}
+
+ Fixup:
+	pci_fixup_device(pci_fixup_suspend, pci_dev);
+
+	return 0;
+}
+
+static int pci_pm_suspend_noirq(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct device_driver *drv = dev->driver;
+	int error = 0;
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_suspend_late(dev, PMSG_SUSPEND);
+
+	if (drv && drv->pm && drv->pm->suspend_noirq) {
+		error = drv->pm->suspend_noirq(dev);
+		suspend_report_result(drv->pm->suspend_noirq, error);
+	}
+
+	if (!error)
+		pci_pm_set_unknown_state(pci_dev);
+
+	return error;
+}
+
+static int pci_pm_resume_noirq(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct device_driver *drv = dev->driver;
+	int error = 0;
+
+	pci_pm_default_resume_noirq(pci_dev);
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_resume_early(dev);
+
+	if (drv && drv->pm && drv->pm->resume_noirq)
+		error = drv->pm->resume_noirq(dev);
+
+	return error;
+}
+
+static int pci_pm_resume(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+	int error = 0;
+
+	/*
+	 * This is necessary for the suspend error path in which resume is
+	 * called without restoring the standard config registers of the device.
+	 */
+	if (pci_dev->state_saved)
+		pci_restore_standard_config(pci_dev);
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_resume(dev);
+
+	pci_pm_default_resume(pci_dev);
+
+	if (pm) {
+		if (pm->resume)
+			error = pm->resume(dev);
+	} else {
+		pci_pm_reenable_device(pci_dev);
+	}
+
+	return 0;
+}
+
+#else /* !CONFIG_SUSPEND */
+
+#define pci_pm_suspend		NULL
+#define pci_pm_suspend_noirq	NULL
+#define pci_pm_resume		NULL
+#define pci_pm_resume_noirq	NULL
+
+#endif /* !CONFIG_SUSPEND */
+
+#ifdef CONFIG_HIBERNATION
+
+static int pci_pm_freeze(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_suspend(dev, PMSG_FREEZE);
+
+	if (!pm) {
+		pci_pm_default_suspend(pci_dev);
+		return 0;
+	}
+
+	pci_dev->state_saved = false;
+
+	if (pm->freeze) {
+		int error;
+
+		error = pm->freeze(dev);
+		suspend_report_result(pm->freeze, error);
+		if (error)
+			return error;
+	}
+
+	if (!pci_dev->state_saved)
+		pci_save_state(pci_dev);
+
+	return 0;
+}
+
+static int pci_pm_freeze_noirq(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct device_driver *drv = dev->driver;
+	int error = 0;
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_suspend_late(dev, PMSG_FREEZE);
+
+	if (drv && drv->pm && drv->pm->freeze_noirq) {
+		error = drv->pm->freeze_noirq(dev);
+		suspend_report_result(drv->pm->freeze_noirq, error);
+	}
+
+	if (!error)
+		pci_pm_set_unknown_state(pci_dev);
+
+	return error;
+}
+
+static int pci_pm_thaw_noirq(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct device_driver *drv = dev->driver;
+	int error = 0;
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_resume_early(dev);
+
+	pci_update_current_state(pci_dev, PCI_D0);
+
+	if (drv && drv->pm && drv->pm->thaw_noirq)
+		error = drv->pm->thaw_noirq(dev);
+
+	return error;
+}
+
+static int pci_pm_thaw(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+	int error = 0;
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_resume(dev);
+
+	if (pm) {
+		if (pm->thaw)
+			error = pm->thaw(dev);
+	} else {
+		pci_pm_reenable_device(pci_dev);
+	}
+
+	return error;
+}
+
+static int pci_pm_poweroff(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+	int error = 0;
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_suspend(dev, PMSG_HIBERNATE);
+
+	if (!pm) {
+		pci_pm_default_suspend(pci_dev);
+		goto Fixup;
+	}
+
+	pci_dev->state_saved = false;
+
+	if (pm->poweroff) {
+		error = pm->poweroff(dev);
+		suspend_report_result(pm->poweroff, error);
+	}
+
+	if (!pci_dev->state_saved && !pci_is_bridge(pci_dev))
+		pci_prepare_to_sleep(pci_dev);
+
+ Fixup:
+	pci_fixup_device(pci_fixup_suspend, pci_dev);
+
+	return error;
+}
+
+static int pci_pm_poweroff_noirq(struct device *dev)
+{
+	struct device_driver *drv = dev->driver;
+	int error = 0;
+
+	if (pci_has_legacy_pm_support(to_pci_dev(dev)))
+		return pci_legacy_suspend_late(dev, PMSG_HIBERNATE);
+
+	if (drv && drv->pm && drv->pm->poweroff_noirq) {
+		error = drv->pm->poweroff_noirq(dev);
+		suspend_report_result(drv->pm->poweroff_noirq, error);
+	}
+
+	return error;
+}
+
+static int pci_pm_restore_noirq(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct device_driver *drv = dev->driver;
+	int error = 0;
+
+	pci_pm_default_resume_noirq(pci_dev);
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_resume_early(dev);
+
+	if (drv && drv->pm && drv->pm->restore_noirq)
+		error = drv->pm->restore_noirq(dev);
+
+	return error;
+}
+
+static int pci_pm_restore(struct device *dev)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+	int error = 0;
+
+	/*
+	 * This is necessary for the hibernation error path in which restore is
+	 * called without restoring the standard config registers of the device.
+	 */
+	if (pci_dev->state_saved)
+		pci_restore_standard_config(pci_dev);
+
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_resume(dev);
+
+	pci_pm_default_resume(pci_dev);
+
+	if (pm) {
+		if (pm->restore)
+			error = pm->restore(dev);
+	} else {
+		pci_pm_reenable_device(pci_dev);
+	}
+
+	return error;
+}
+
+#else /* !CONFIG_HIBERNATION */
+
+#define pci_pm_freeze		NULL
+#define pci_pm_freeze_noirq	NULL
+#define pci_pm_thaw		NULL
+#define pci_pm_thaw_noirq	NULL
+#define pci_pm_poweroff		NULL
+#define pci_pm_poweroff_noirq	NULL
+#define pci_pm_restore		NULL
+#define pci_pm_restore_noirq	NULL
+
+#endif /* !CONFIG_HIBERNATION */
+
+struct dev_pm_ops pci_dev_pm_ops = {
+	.prepare = pci_pm_prepare,
+	.complete = pci_pm_complete,
+	.suspend = pci_pm_suspend,
+	.resume = pci_pm_resume,
+	.freeze = pci_pm_freeze,
+	.thaw = pci_pm_thaw,
+	.poweroff = pci_pm_poweroff,
+	.restore = pci_pm_restore,
+	.suspend_noirq = pci_pm_suspend_noirq,
+	.resume_noirq = pci_pm_resume_noirq,
+	.freeze_noirq = pci_pm_freeze_noirq,
+	.thaw_noirq = pci_pm_thaw_noirq,
+	.poweroff_noirq = pci_pm_poweroff_noirq,
+	.restore_noirq = pci_pm_restore_noirq,
+};
+
+#define PCI_PM_OPS_PTR	(&pci_dev_pm_ops)
+
+#else /* !CONFIG_PM_SLEEP */
+
+#define PCI_PM_OPS_PTR	NULL
+
+#endif /* !CONFIG_PM_SLEEP */
+
+/**
+ * __pci_register_driver - register a new pci driver
+ * @drv: the driver structure to register
+ * @owner: owner module of drv
+ * @mod_name: module name string
+ * 
+ * Adds the driver structure to the list of registered drivers.
+ * Returns a negative value on error, otherwise 0. 
+ * If no error occurred, the driver remains registered even if 
+ * no device was claimed during registration.
+ */
+int __pci_register_driver(struct pci_driver *drv, struct module *owner,
+			  const char *mod_name)
+{
+	int error;
+
+	/* initialize common driver fields */
+	drv->driver.name = drv->name;
+	drv->driver.bus = &pci_bus_type;
+	drv->driver.owner = owner;
+	drv->driver.mod_name = mod_name;
+
+	spin_lock_init(&drv->dynids.lock);
+	INIT_LIST_HEAD(&drv->dynids.list);
+
+	/* register with core */
+	error = driver_register(&drv->driver);
+	if (error)
+		return error;
+
+	error = pci_create_newid_file(drv);
+	if (error)
+		driver_unregister(&drv->driver);
+
+	return error;
+}
+
+/**
+ * pci_unregister_driver - unregister a pci driver
+ * @drv: the driver structure to unregister
+ * 
+ * Deletes the driver structure from the list of registered PCI drivers,
+ * gives it a chance to clean up by calling its remove() function for
+ * each device it was responsible for, and marks those devices as
+ * driverless.
+ */
+
+void
+pci_unregister_driver(struct pci_driver *drv)
+{
+	pci_remove_newid_file(drv);
+	driver_unregister(&drv->driver);
+	pci_free_dynids(drv);
+}
+
+static struct pci_driver pci_compat_driver = {
+	.name = "compat"
+};
+
+/**
+ * pci_dev_driver - get the pci_driver of a device
+ * @dev: the device to query
+ *
+ * Returns the appropriate pci_driver structure or %NULL if there is no 
+ * registered driver for the device.
+ */
+struct pci_driver *
+pci_dev_driver(const struct pci_dev *dev)
+{
+	if (dev->driver)
+		return dev->driver;
+	else {
+		int i;
+		for(i=0; i<=PCI_ROM_RESOURCE; i++)
+			if (dev->resource[i].flags & IORESOURCE_BUSY)
+				return &pci_compat_driver;
+	}
+	return NULL;
+}
+
+/**
+ * pci_bus_match - Tell if a PCI device structure has a matching PCI device id structure
+ * @dev: the PCI device structure to match against
+ * @drv: the device driver to search for matching PCI device id structures
+ * 
+ * Used by a driver to check whether a PCI device present in the
+ * system is in its list of supported devices. Returns the matching
+ * pci_device_id structure or %NULL if there is no match.
+ */
+static int pci_bus_match(struct device *dev, struct device_driver *drv)
+{
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct pci_driver *pci_drv = to_pci_driver(drv);
+	const struct pci_device_id *found_id;
+
+	found_id = pci_match_device(pci_drv, pci_dev);
+	if (found_id)
+		return 1;
+
+	return 0;
+}
+
+/**
+ * pci_dev_get - increments the reference count of the pci device structure
+ * @dev: the device being referenced
+ *
+ * Each live reference to a device should be refcounted.
+ *
+ * Drivers for PCI devices should normally record such references in
+ * their probe() methods, when they bind to a device, and release
+ * them by calling pci_dev_put(), in their disconnect() methods.
+ *
+ * A pointer to the device with the incremented reference counter is returned.
+ */
+struct pci_dev *pci_dev_get(struct pci_dev *dev)
+{
+	if (dev)
+		get_device(&dev->dev);
+	return dev;
+}
+
+/**
+ * pci_dev_put - release a use of the pci device structure
+ * @dev: device that's been disconnected
+ *
+ * Must be called when a user of a device is finished with it.  When the last
+ * user of the device calls this function, the memory of the device is freed.
+ */
+void pci_dev_put(struct pci_dev *dev)
+{
+	if (dev)
+		put_device(&dev->dev);
+}
+
+#ifndef CONFIG_HOTPLUG
+int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+	return -ENODEV;
+}
+#endif
+
+struct bus_type pci_bus_type = {
+	.name		= "pci",
+	.match		= pci_bus_match,
+	.uevent		= pci_uevent,
+	.probe		= pci_device_probe,
+	.remove		= pci_device_remove,
+	.shutdown	= pci_device_shutdown,
+#ifndef DDE_LINUX
+	.dev_attrs	= pci_dev_attrs,
+#endif
+	.pm		= PCI_PM_OPS_PTR,
+};
+
+static int __init pci_driver_init(void)
+{
+	return bus_register(&pci_bus_type);
+}
+
+postcore_initcall(pci_driver_init);
+
+EXPORT_SYMBOL(pci_match_id);
+EXPORT_SYMBOL(__pci_register_driver);
+EXPORT_SYMBOL(pci_unregister_driver);
+EXPORT_SYMBOL(pci_dev_driver);
+EXPORT_SYMBOL(pci_bus_type);
+EXPORT_SYMBOL(pci_dev_get);
+EXPORT_SYMBOL(pci_dev_put);
-- 
cgit v1.2.3


From 145623ebcf753252a36a3e67128fb9879d0001e4 Mon Sep 17 00:00:00 2001
From: Zheng Da <zhengda1936@gmail.com>
Date: Tue, 5 Jan 2010 16:51:25 +0100
Subject: call initcall functions explicitly.

---
 libdde_linux26/contrib/arch/x86/kernel/pci-dma.c |  2 +-
 libdde_linux26/contrib/block/blk-ioc.c           |  2 +-
 libdde_linux26/contrib/block/blk-settings.c      |  2 +-
 libdde_linux26/contrib/block/blk-softirq.c       |  2 +-
 libdde_linux26/contrib/block/noop-iosched.c      |  2 +-
 libdde_linux26/contrib/fs/bio.c                  |  2 +-
 libdde_linux26/contrib/mm/backing-dev.c          |  2 +-
 libdde_linux26/contrib/net/core/neighbour.c      |  2 +-
 libdde_linux26/lib/src/arch/l4/init.c            | 48 +++++++++++++++++++++++-
 libdde_linux26/lib/src/arch/l4/local.h           |  2 +-
 libdde_linux26/lib/src/arch/l4/page_alloc.c      |  2 +-
 libdde_linux26/lib/src/arch/l4/pci.c             |  2 +-
 libdde_linux26/lib/src/arch/l4/timer.c           |  2 +-
 libdde_linux26/lib/src/block/genhd.c             |  2 +-
 libdde_linux26/lib/src/drivers/pci/pci-driver.c  |  2 +-
 libdde_linux26/lib/src/drivers/pci/pci.c         |  2 +-
 libdde_linux26/lib/src/drivers/pci/probe.c       |  2 +-
 libdde_linux26/lib/src/fs/char_dev.c             |  2 +-
 libdde_linux26/lib/src/kernel/workqueue.c        |  2 +-
 libdde_linux26/lib/src/net/core/dev.c            |  2 +-
 libdde_linux26/lib/src/net/core/net_namespace.c  |  2 +-
 21 files changed, 66 insertions(+), 22 deletions(-)

(limited to 'libdde_linux26/lib/src/drivers/pci/pci-driver.c')

diff --git a/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c b/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
index b2542853..80e9f10e 100644
--- a/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
+++ b/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
@@ -282,7 +282,7 @@ void pci_iommu_shutdown(void)
 	gart_iommu_shutdown();
 }
 /* Must execute after PCI subsystem */
-fs_initcall(pci_iommu_init);
+//fs_initcall(pci_iommu_init);
 
 #ifdef CONFIG_PCI
 /* Many VIA bridges seem to corrupt data for DAC. Disable it here */
diff --git a/libdde_linux26/contrib/block/blk-ioc.c b/libdde_linux26/contrib/block/blk-ioc.c
index 012f065a..e067a82a 100644
--- a/libdde_linux26/contrib/block/blk-ioc.c
+++ b/libdde_linux26/contrib/block/blk-ioc.c
@@ -177,4 +177,4 @@ static int __init blk_ioc_init(void)
 			sizeof(struct io_context), 0, SLAB_PANIC, NULL);
 	return 0;
 }
-subsys_initcall(blk_ioc_init);
+//subsys_initcall(blk_ioc_init);
diff --git a/libdde_linux26/contrib/block/blk-settings.c b/libdde_linux26/contrib/block/blk-settings.c
index 59fd05d9..ad0af33c 100644
--- a/libdde_linux26/contrib/block/blk-settings.c
+++ b/libdde_linux26/contrib/block/blk-settings.c
@@ -469,4 +469,4 @@ static int __init blk_settings_init(void)
 	blk_max_pfn = max_pfn - 1;
 	return 0;
 }
-subsys_initcall(blk_settings_init);
+//subsys_initcall(blk_settings_init);
diff --git a/libdde_linux26/contrib/block/blk-softirq.c b/libdde_linux26/contrib/block/blk-softirq.c
index ce0efc6b..e9a18af7 100644
--- a/libdde_linux26/contrib/block/blk-softirq.c
+++ b/libdde_linux26/contrib/block/blk-softirq.c
@@ -172,4 +172,4 @@ static __init int blk_softirq_init(void)
 	register_hotcpu_notifier(&blk_cpu_notifier);
 	return 0;
 }
-subsys_initcall(blk_softirq_init);
+//subsys_initcall(blk_softirq_init);
diff --git a/libdde_linux26/contrib/block/noop-iosched.c b/libdde_linux26/contrib/block/noop-iosched.c
index 075cb108..e78234a9 100644
--- a/libdde_linux26/contrib/block/noop-iosched.c
+++ b/libdde_linux26/contrib/block/noop-iosched.c
@@ -114,7 +114,7 @@ static void __exit noop_exit(void)
 	elv_unregister(&elevator_noop);
 }
 
-subsys_initcall(noop_init);
+//subsys_initcall(noop_init);
 module_exit(noop_exit);
 
 
diff --git a/libdde_linux26/contrib/fs/bio.c b/libdde_linux26/contrib/fs/bio.c
index d4f06327..a59a1488 100644
--- a/libdde_linux26/contrib/fs/bio.c
+++ b/libdde_linux26/contrib/fs/bio.c
@@ -1615,7 +1615,7 @@ static int __init init_bio(void)
 	return 0;
 }
 
-subsys_initcall(init_bio);
+//subsys_initcall(init_bio);
 
 EXPORT_SYMBOL(bio_alloc);
 EXPORT_SYMBOL(bio_kmalloc);
diff --git a/libdde_linux26/contrib/mm/backing-dev.c b/libdde_linux26/contrib/mm/backing-dev.c
index 8e858744..32f604bc 100644
--- a/libdde_linux26/contrib/mm/backing-dev.c
+++ b/libdde_linux26/contrib/mm/backing-dev.c
@@ -167,7 +167,7 @@ static __init int bdi_class_init(void)
 	return 0;
 }
 
-postcore_initcall(bdi_class_init);
+//postcore_initcall(bdi_class_init);
 
 int bdi_register(struct backing_dev_info *bdi, struct device *parent,
 		const char *fmt, ...)
diff --git a/libdde_linux26/contrib/net/core/neighbour.c b/libdde_linux26/contrib/net/core/neighbour.c
index 278a142d..4a90e322 100644
--- a/libdde_linux26/contrib/net/core/neighbour.c
+++ b/libdde_linux26/contrib/net/core/neighbour.c
@@ -2820,5 +2820,5 @@ static int __init neigh_init(void)
 	return 0;
 }
 
-subsys_initcall(neigh_init);
+//subsys_initcall(neigh_init);
 
diff --git a/libdde_linux26/lib/src/arch/l4/init.c b/libdde_linux26/lib/src/arch/l4/init.c
index 79112f78..1d44bf97 100644
--- a/libdde_linux26/lib/src/arch/l4/init.c
+++ b/libdde_linux26/lib/src/arch/l4/init.c
@@ -26,8 +26,52 @@ void __init __attribute__((used)) l4dde26_init(void)
 
 void l4dde26_do_initcalls(void)
 {
+	extern void dde_page_cache_init (void);
+	extern void pci_iommu_init (void);
+	extern void init_workqueues (void);
+	extern void pci_init (void);
+	extern void pci_driver_init (void);
+	extern void pcibus_class_init (void);
+	extern void net_dev_init (void);
+	extern void neigh_init (void);
+	extern void net_ns_init (void);
+	extern void blk_ioc_init (void);
+	extern void blk_settings_init (void);
+	extern void blk_softirq_init (void);
+	extern void genhd_device_init (void);
+	extern void noop_init (void);
+	extern void bdi_class_init (void);
+	extern void init_bio (void);
+	extern void chrdev_init (void);
 	/* finally, let DDEKit perform all the initcalls */
-	ddekit_do_initcalls();
+//	ddekit_do_initcalls();
+	/* 1000: pure_, core_ */
+	l4dde26_init ();
+	l4dde26_init_timers ();
+	net_ns_init ();
+	dde_page_cache_init ();
+	init_workqueues ();
+	chrdev_init ();
+	/* 1001: postcore_ */
+	pci_driver_init ();
+	pcibus_class_init ();
+	bdi_class_init ();
+	/* 1002: arch_ */
+	l4dde26_init_pci ();
+	/* 1003: subsys_ */
+	net_dev_init ();
+	neigh_init ();
+	blk_ioc_init ();
+	blk_settings_init ();
+	blk_softirq_init ();
+	genhd_device_init ();
+	noop_init ();
+	init_bio ();
+	/* 1004: fs_ */
+	pci_iommu_init ();
+	/* 1005: device_ */
+	pci_init ();
+	/* 1006: late_ */
 }
 
-dde_initcall(l4dde26_init);
+//dde_initcall(l4dde26_init);
diff --git a/libdde_linux26/lib/src/arch/l4/local.h b/libdde_linux26/lib/src/arch/l4/local.h
index d834a9db..275c745b 100644
--- a/libdde_linux26/lib/src/arch/l4/local.h
+++ b/libdde_linux26/lib/src/arch/l4/local.h
@@ -6,7 +6,7 @@
 #include <ddekit/assert.h>
 #include <ddekit/condvar.h>
 #include <ddekit/debug.h>
-#include <ddekit/initcall.h>
+//#include <ddekit/initcall.h>
 #include <ddekit/interrupt.h>
 #include <ddekit/lock.h>
 #include <ddekit/memory.h>
diff --git a/libdde_linux26/lib/src/arch/l4/page_alloc.c b/libdde_linux26/lib/src/arch/l4/page_alloc.c
index e887bd51..a418cc65 100644
--- a/libdde_linux26/lib/src/arch/l4/page_alloc.c
+++ b/libdde_linux26/lib/src/arch/l4/page_alloc.c
@@ -273,4 +273,4 @@ static void __init dde_page_cache_init(void)
 		INIT_HLIST_HEAD(&dde_page_cache[i]);
 }
 
-core_initcall(dde_page_cache_init);
+//core_initcall(dde_page_cache_init);
diff --git a/libdde_linux26/lib/src/arch/l4/pci.c b/libdde_linux26/lib/src/arch/l4/pci.c
index 2a0391f2..e86c42e8 100644
--- a/libdde_linux26/lib/src/arch/l4/pci.c
+++ b/libdde_linux26/lib/src/arch/l4/pci.c
@@ -186,4 +186,4 @@ void __init l4dde26_init_pci(void)
 	INITIALIZE_INITVAR(dde26_pci);
 }
 
-arch_initcall(l4dde26_init_pci);
+//arch_initcall(l4dde26_init_pci);
diff --git a/libdde_linux26/lib/src/arch/l4/timer.c b/libdde_linux26/lib/src/arch/l4/timer.c
index ea04b67e..f80aa5d3 100644
--- a/libdde_linux26/lib/src/arch/l4/timer.c
+++ b/libdde_linux26/lib/src/arch/l4/timer.c
@@ -154,7 +154,7 @@ void __init l4dde26_init_timers(void)
 	INITIALIZE_INITVAR(dde26_timer);
 }
 
-core_initcall(l4dde26_init_timers);
+//core_initcall(l4dde26_init_timers);
 
 extern unsigned long volatile __jiffy_data jiffies;
 
diff --git a/libdde_linux26/lib/src/block/genhd.c b/libdde_linux26/lib/src/block/genhd.c
index 921cebff..9028c31c 100644
--- a/libdde_linux26/lib/src/block/genhd.c
+++ b/libdde_linux26/lib/src/block/genhd.c
@@ -812,7 +812,7 @@ static int __init genhd_device_init(void)
 	return 0;
 }
 
-subsys_initcall(genhd_device_init);
+//subsys_initcall(genhd_device_init);
 
 static ssize_t disk_range_show(struct device *dev,
 			       struct device_attribute *attr, char *buf)
diff --git a/libdde_linux26/lib/src/drivers/pci/pci-driver.c b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
index 199ec8a7..ba4e5108 100644
--- a/libdde_linux26/lib/src/drivers/pci/pci-driver.c
+++ b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
@@ -997,7 +997,7 @@ static int __init pci_driver_init(void)
 	return bus_register(&pci_bus_type);
 }
 
-postcore_initcall(pci_driver_init);
+//postcore_initcall(pci_driver_init);
 
 EXPORT_SYMBOL(pci_match_id);
 EXPORT_SYMBOL(__pci_register_driver);
diff --git a/libdde_linux26/lib/src/drivers/pci/pci.c b/libdde_linux26/lib/src/drivers/pci/pci.c
index f67bf734..05c7b38d 100644
--- a/libdde_linux26/lib/src/drivers/pci/pci.c
+++ b/libdde_linux26/lib/src/drivers/pci/pci.c
@@ -2434,7 +2434,7 @@ static int __init pci_setup(char *str)
 }
 early_param("pci", pci_setup);
 
-device_initcall(pci_init);
+//device_initcall(pci_init);
 
 EXPORT_SYMBOL(pci_reenable_device);
 EXPORT_SYMBOL(pci_enable_device_io);
diff --git a/libdde_linux26/lib/src/drivers/pci/probe.c b/libdde_linux26/lib/src/drivers/pci/probe.c
index 32da5108..d68a3023 100644
--- a/libdde_linux26/lib/src/drivers/pci/probe.c
+++ b/libdde_linux26/lib/src/drivers/pci/probe.c
@@ -104,7 +104,7 @@ static int __init pcibus_class_init(void)
 {
 	return class_register(&pcibus_class);
 }
-postcore_initcall(pcibus_class_init);
+//postcore_initcall(pcibus_class_init);
 
 /*
  * Translate the low bits of the PCI base
diff --git a/libdde_linux26/lib/src/fs/char_dev.c b/libdde_linux26/lib/src/fs/char_dev.c
index 3b8e8b3d..9dd832b4 100644
--- a/libdde_linux26/lib/src/fs/char_dev.c
+++ b/libdde_linux26/lib/src/fs/char_dev.c
@@ -556,7 +556,7 @@ void __init chrdev_init(void)
 }
 
 #ifndef LIBINPUT
-core_initcall(chrdev_init);
+//core_initcall(chrdev_init);
 #endif
 
 /* Let modules do char dev stuff */
diff --git a/libdde_linux26/lib/src/kernel/workqueue.c b/libdde_linux26/lib/src/kernel/workqueue.c
index 5ad26d9f..d52b22b5 100644
--- a/libdde_linux26/lib/src/kernel/workqueue.c
+++ b/libdde_linux26/lib/src/kernel/workqueue.c
@@ -1034,5 +1034,5 @@ void __init init_workqueues(void)
 }
 
 #ifdef DDE_LINUX
-core_initcall(init_workqueues);
+//core_initcall(init_workqueues);
 #endif
diff --git a/libdde_linux26/lib/src/net/core/dev.c b/libdde_linux26/lib/src/net/core/dev.c
index 1e9247c2..7afb2553 100644
--- a/libdde_linux26/lib/src/net/core/dev.c
+++ b/libdde_linux26/lib/src/net/core/dev.c
@@ -5252,7 +5252,7 @@ out:
 	return rc;
 }
 
-subsys_initcall(net_dev_init);
+//subsys_initcall(net_dev_init);
 
 EXPORT_SYMBOL(__dev_get_by_index);
 EXPORT_SYMBOL(__dev_get_by_name);
diff --git a/libdde_linux26/lib/src/net/core/net_namespace.c b/libdde_linux26/lib/src/net/core/net_namespace.c
index ab5a0a7f..e1f05049 100644
--- a/libdde_linux26/lib/src/net/core/net_namespace.c
+++ b/libdde_linux26/lib/src/net/core/net_namespace.c
@@ -239,7 +239,7 @@ static int __init net_ns_init(void)
 	return 0;
 }
 
-pure_initcall(net_ns_init);
+//pure_initcall(net_ns_init);
 
 #ifdef CONFIG_NET_NS
 static int register_pernet_operations(struct list_head *list,
-- 
cgit v1.2.3


From 436fa4a5352cea7fc8eeafe2fc078031d731b471 Mon Sep 17 00:00:00 2001
From: Zheng Da <zhengda1936@gmail.com>
Date: Wed, 13 Jan 2010 11:59:13 +0100
Subject: Remove the static declaration of initcall functions.

---
 libdde_linux26/contrib/arch/x86/kernel/pci-dma.c | 2 +-
 libdde_linux26/contrib/block/blk-ioc.c           | 2 +-
 libdde_linux26/contrib/block/blk-settings.c      | 2 +-
 libdde_linux26/contrib/block/blk-softirq.c       | 2 +-
 libdde_linux26/contrib/block/noop-iosched.c      | 2 +-
 libdde_linux26/contrib/fs/bio.c                  | 2 +-
 libdde_linux26/contrib/mm/backing-dev.c          | 2 +-
 libdde_linux26/contrib/net/core/neighbour.c      | 2 +-
 libdde_linux26/lib/src/arch/l4/page_alloc.c      | 2 +-
 libdde_linux26/lib/src/block/genhd.c             | 2 +-
 libdde_linux26/lib/src/drivers/pci/pci-driver.c  | 2 +-
 libdde_linux26/lib/src/drivers/pci/pci.c         | 2 +-
 libdde_linux26/lib/src/drivers/pci/probe.c       | 2 +-
 libdde_linux26/lib/src/net/core/dev.c            | 2 +-
 libdde_linux26/lib/src/net/core/net_namespace.c  | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'libdde_linux26/lib/src/drivers/pci/pci-driver.c')

diff --git a/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c b/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
index 80e9f10e..3a26519b 100644
--- a/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
+++ b/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
@@ -263,7 +263,7 @@ int dma_supported(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_supported);
 
-static int __init pci_iommu_init(void)
+int __init pci_iommu_init(void)
 {
 	calgary_iommu_init();
 
diff --git a/libdde_linux26/contrib/block/blk-ioc.c b/libdde_linux26/contrib/block/blk-ioc.c
index e067a82a..b3292405 100644
--- a/libdde_linux26/contrib/block/blk-ioc.c
+++ b/libdde_linux26/contrib/block/blk-ioc.c
@@ -171,7 +171,7 @@ void copy_io_context(struct io_context **pdst, struct io_context **psrc)
 }
 EXPORT_SYMBOL(copy_io_context);
 
-static int __init blk_ioc_init(void)
+int __init blk_ioc_init(void)
 {
 	iocontext_cachep = kmem_cache_create("blkdev_ioc",
 			sizeof(struct io_context), 0, SLAB_PANIC, NULL);
diff --git a/libdde_linux26/contrib/block/blk-settings.c b/libdde_linux26/contrib/block/blk-settings.c
index ad0af33c..2178202f 100644
--- a/libdde_linux26/contrib/block/blk-settings.c
+++ b/libdde_linux26/contrib/block/blk-settings.c
@@ -463,7 +463,7 @@ void blk_queue_update_dma_alignment(struct request_queue *q, int mask)
 }
 EXPORT_SYMBOL(blk_queue_update_dma_alignment);
 
-static int __init blk_settings_init(void)
+int __init blk_settings_init(void)
 {
 	blk_max_low_pfn = max_low_pfn - 1;
 	blk_max_pfn = max_pfn - 1;
diff --git a/libdde_linux26/contrib/block/blk-softirq.c b/libdde_linux26/contrib/block/blk-softirq.c
index e9a18af7..34041d14 100644
--- a/libdde_linux26/contrib/block/blk-softirq.c
+++ b/libdde_linux26/contrib/block/blk-softirq.c
@@ -161,7 +161,7 @@ void blk_complete_request(struct request *req)
 }
 EXPORT_SYMBOL(blk_complete_request);
 
-static __init int blk_softirq_init(void)
+__init int blk_softirq_init(void)
 {
 	int i;
 
diff --git a/libdde_linux26/contrib/block/noop-iosched.c b/libdde_linux26/contrib/block/noop-iosched.c
index e78234a9..a7618fdb 100644
--- a/libdde_linux26/contrib/block/noop-iosched.c
+++ b/libdde_linux26/contrib/block/noop-iosched.c
@@ -101,7 +101,7 @@ static struct elevator_type elevator_noop = {
 	.elevator_owner = THIS_MODULE,
 };
 
-static int __init noop_init(void)
+int __init noop_init(void)
 {
 	DEBUG_MSG("here!");
 	elv_register(&elevator_noop);
diff --git a/libdde_linux26/contrib/fs/bio.c b/libdde_linux26/contrib/fs/bio.c
index a59a1488..7e0238b8 100644
--- a/libdde_linux26/contrib/fs/bio.c
+++ b/libdde_linux26/contrib/fs/bio.c
@@ -1592,7 +1592,7 @@ static void __init biovec_init_slabs(void)
 	}
 }
 
-static int __init init_bio(void)
+int __init init_bio(void)
 {
 	bio_slab_max = 2;
 	bio_slab_nr = 0;
diff --git a/libdde_linux26/contrib/mm/backing-dev.c b/libdde_linux26/contrib/mm/backing-dev.c
index 32f604bc..25ebba9a 100644
--- a/libdde_linux26/contrib/mm/backing-dev.c
+++ b/libdde_linux26/contrib/mm/backing-dev.c
@@ -159,7 +159,7 @@ static struct device_attribute bdi_dev_attrs[] = {
 	__ATTR_NULL,
 };
 
-static __init int bdi_class_init(void)
+__init int bdi_class_init(void)
 {
 	bdi_class = class_create(THIS_MODULE, "bdi");
 	bdi_class->dev_attrs = bdi_dev_attrs;
diff --git a/libdde_linux26/contrib/net/core/neighbour.c b/libdde_linux26/contrib/net/core/neighbour.c
index 4a90e322..02dc8bda 100644
--- a/libdde_linux26/contrib/net/core/neighbour.c
+++ b/libdde_linux26/contrib/net/core/neighbour.c
@@ -2808,7 +2808,7 @@ EXPORT_SYMBOL(neigh_sysctl_unregister);
 
 #endif	/* CONFIG_SYSCTL */
 
-static int __init neigh_init(void)
+int __init neigh_init(void)
 {
 	rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL);
 	rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL);
diff --git a/libdde_linux26/lib/src/arch/l4/page_alloc.c b/libdde_linux26/lib/src/arch/l4/page_alloc.c
index a418cc65..7c4faa0e 100644
--- a/libdde_linux26/lib/src/arch/l4/page_alloc.c
+++ b/libdde_linux26/lib/src/arch/l4/page_alloc.c
@@ -264,7 +264,7 @@ void *__init alloc_large_system_hash(const char *tablename,
 }
 
 
-static void __init dde_page_cache_init(void)
+void __init dde_page_cache_init(void)
 {
 	printk("Initializing DDE page cache\n");
 	int i=0;
diff --git a/libdde_linux26/lib/src/block/genhd.c b/libdde_linux26/lib/src/block/genhd.c
index 9028c31c..f9a205f5 100644
--- a/libdde_linux26/lib/src/block/genhd.c
+++ b/libdde_linux26/lib/src/block/genhd.c
@@ -792,7 +792,7 @@ static struct kobject *base_probe(dev_t devt, int *partno, void *data)
 	return NULL;
 }
 
-static int __init genhd_device_init(void)
+int __init genhd_device_init(void)
 {
 	int error;
 
diff --git a/libdde_linux26/lib/src/drivers/pci/pci-driver.c b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
index ba4e5108..591d9489 100644
--- a/libdde_linux26/lib/src/drivers/pci/pci-driver.c
+++ b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
@@ -992,7 +992,7 @@ struct bus_type pci_bus_type = {
 	.pm		= PCI_PM_OPS_PTR,
 };
 
-static int __init pci_driver_init(void)
+int __init pci_driver_init(void)
 {
 	return bus_register(&pci_bus_type);
 }
diff --git a/libdde_linux26/lib/src/drivers/pci/pci.c b/libdde_linux26/lib/src/drivers/pci/pci.c
index 05c7b38d..9bf601c3 100644
--- a/libdde_linux26/lib/src/drivers/pci/pci.c
+++ b/libdde_linux26/lib/src/drivers/pci/pci.c
@@ -2404,7 +2404,7 @@ int __devinit pci_init(void)
 	return 0;
 }
 
-static int __init pci_setup(char *str)
+int __init pci_setup(char *str)
 {
 #ifndef DDE_LINUX
 	while (str) {
diff --git a/libdde_linux26/lib/src/drivers/pci/probe.c b/libdde_linux26/lib/src/drivers/pci/probe.c
index d68a3023..9cbc3bfb 100644
--- a/libdde_linux26/lib/src/drivers/pci/probe.c
+++ b/libdde_linux26/lib/src/drivers/pci/probe.c
@@ -100,7 +100,7 @@ static struct class pcibus_class = {
 	.dev_release	= &release_pcibus_dev,
 };
 
-static int __init pcibus_class_init(void)
+int __init pcibus_class_init(void)
 {
 	return class_register(&pcibus_class);
 }
diff --git a/libdde_linux26/lib/src/net/core/dev.c b/libdde_linux26/lib/src/net/core/dev.c
index 7afb2553..e66f1da2 100644
--- a/libdde_linux26/lib/src/net/core/dev.c
+++ b/libdde_linux26/lib/src/net/core/dev.c
@@ -5184,7 +5184,7 @@ static struct pernet_operations __net_initdata default_device_ops = {
  *       This is called single threaded during boot, so no need
  *       to take the rtnl semaphore.
  */
-static int __init net_dev_init(void)
+int __init net_dev_init(void)
 {
 	int i, rc = -ENOMEM;
 
diff --git a/libdde_linux26/lib/src/net/core/net_namespace.c b/libdde_linux26/lib/src/net/core/net_namespace.c
index e1f05049..29f29621 100644
--- a/libdde_linux26/lib/src/net/core/net_namespace.c
+++ b/libdde_linux26/lib/src/net/core/net_namespace.c
@@ -202,7 +202,7 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
 }
 #endif
 
-static int __init net_ns_init(void)
+int __init net_ns_init(void)
 {
 	struct net_generic *ng;
 	int err;
-- 
cgit v1.2.3


From 2680eecc499e43679be098e5834d4f3a62f59a0c Mon Sep 17 00:00:00 2001
From: Zheng Da <zhengda1936@gmail.com>
Date: Sat, 16 Jan 2010 01:21:07 +0100
Subject: prepare to use initcall to do initialization.

---
 libdde_linux26/contrib/arch/x86/kernel/pci-dma.c |  4 +-
 libdde_linux26/contrib/block/blk-ioc.c           |  4 +-
 libdde_linux26/contrib/block/blk-settings.c      |  4 +-
 libdde_linux26/contrib/block/blk-softirq.c       |  4 +-
 libdde_linux26/contrib/block/noop-iosched.c      |  4 +-
 libdde_linux26/contrib/fs/bio.c                  |  4 +-
 libdde_linux26/contrib/mm/backing-dev.c          |  4 +-
 libdde_linux26/contrib/net/core/neighbour.c      |  4 +-
 libdde_linux26/include/linux/init.h              |  4 +-
 libdde_linux26/lib/src/arch/l4/init.c            | 49 +-----------------------
 libdde_linux26/lib/src/arch/l4/local.h           |  2 +-
 libdde_linux26/lib/src/arch/l4/page_alloc.c      |  4 +-
 libdde_linux26/lib/src/arch/l4/pci.c             |  2 +-
 libdde_linux26/lib/src/arch/l4/timer.c           |  2 +-
 libdde_linux26/lib/src/block/genhd.c             |  4 +-
 libdde_linux26/lib/src/drivers/pci/pci-driver.c  |  4 +-
 libdde_linux26/lib/src/drivers/pci/pci.c         |  4 +-
 libdde_linux26/lib/src/drivers/pci/probe.c       |  4 +-
 libdde_linux26/lib/src/fs/char_dev.c             |  2 +-
 libdde_linux26/lib/src/kernel/workqueue.c        |  2 +-
 libdde_linux26/lib/src/net/core/dev.c            |  4 +-
 libdde_linux26/lib/src/net/core/net_namespace.c  |  4 +-
 22 files changed, 39 insertions(+), 84 deletions(-)

(limited to 'libdde_linux26/lib/src/drivers/pci/pci-driver.c')

diff --git a/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c b/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
index 3a26519b..b2542853 100644
--- a/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
+++ b/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
@@ -263,7 +263,7 @@ int dma_supported(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_supported);
 
-int __init pci_iommu_init(void)
+static int __init pci_iommu_init(void)
 {
 	calgary_iommu_init();
 
@@ -282,7 +282,7 @@ void pci_iommu_shutdown(void)
 	gart_iommu_shutdown();
 }
 /* Must execute after PCI subsystem */
-//fs_initcall(pci_iommu_init);
+fs_initcall(pci_iommu_init);
 
 #ifdef CONFIG_PCI
 /* Many VIA bridges seem to corrupt data for DAC. Disable it here */
diff --git a/libdde_linux26/contrib/block/blk-ioc.c b/libdde_linux26/contrib/block/blk-ioc.c
index b3292405..012f065a 100644
--- a/libdde_linux26/contrib/block/blk-ioc.c
+++ b/libdde_linux26/contrib/block/blk-ioc.c
@@ -171,10 +171,10 @@ void copy_io_context(struct io_context **pdst, struct io_context **psrc)
 }
 EXPORT_SYMBOL(copy_io_context);
 
-int __init blk_ioc_init(void)
+static int __init blk_ioc_init(void)
 {
 	iocontext_cachep = kmem_cache_create("blkdev_ioc",
 			sizeof(struct io_context), 0, SLAB_PANIC, NULL);
 	return 0;
 }
-//subsys_initcall(blk_ioc_init);
+subsys_initcall(blk_ioc_init);
diff --git a/libdde_linux26/contrib/block/blk-settings.c b/libdde_linux26/contrib/block/blk-settings.c
index 2178202f..59fd05d9 100644
--- a/libdde_linux26/contrib/block/blk-settings.c
+++ b/libdde_linux26/contrib/block/blk-settings.c
@@ -463,10 +463,10 @@ void blk_queue_update_dma_alignment(struct request_queue *q, int mask)
 }
 EXPORT_SYMBOL(blk_queue_update_dma_alignment);
 
-int __init blk_settings_init(void)
+static int __init blk_settings_init(void)
 {
 	blk_max_low_pfn = max_low_pfn - 1;
 	blk_max_pfn = max_pfn - 1;
 	return 0;
 }
-//subsys_initcall(blk_settings_init);
+subsys_initcall(blk_settings_init);
diff --git a/libdde_linux26/contrib/block/blk-softirq.c b/libdde_linux26/contrib/block/blk-softirq.c
index 34041d14..ce0efc6b 100644
--- a/libdde_linux26/contrib/block/blk-softirq.c
+++ b/libdde_linux26/contrib/block/blk-softirq.c
@@ -161,7 +161,7 @@ void blk_complete_request(struct request *req)
 }
 EXPORT_SYMBOL(blk_complete_request);
 
-__init int blk_softirq_init(void)
+static __init int blk_softirq_init(void)
 {
 	int i;
 
@@ -172,4 +172,4 @@ __init int blk_softirq_init(void)
 	register_hotcpu_notifier(&blk_cpu_notifier);
 	return 0;
 }
-//subsys_initcall(blk_softirq_init);
+subsys_initcall(blk_softirq_init);
diff --git a/libdde_linux26/contrib/block/noop-iosched.c b/libdde_linux26/contrib/block/noop-iosched.c
index a7618fdb..075cb108 100644
--- a/libdde_linux26/contrib/block/noop-iosched.c
+++ b/libdde_linux26/contrib/block/noop-iosched.c
@@ -101,7 +101,7 @@ static struct elevator_type elevator_noop = {
 	.elevator_owner = THIS_MODULE,
 };
 
-int __init noop_init(void)
+static int __init noop_init(void)
 {
 	DEBUG_MSG("here!");
 	elv_register(&elevator_noop);
@@ -114,7 +114,7 @@ static void __exit noop_exit(void)
 	elv_unregister(&elevator_noop);
 }
 
-//subsys_initcall(noop_init);
+subsys_initcall(noop_init);
 module_exit(noop_exit);
 
 
diff --git a/libdde_linux26/contrib/fs/bio.c b/libdde_linux26/contrib/fs/bio.c
index 7e0238b8..d4f06327 100644
--- a/libdde_linux26/contrib/fs/bio.c
+++ b/libdde_linux26/contrib/fs/bio.c
@@ -1592,7 +1592,7 @@ static void __init biovec_init_slabs(void)
 	}
 }
 
-int __init init_bio(void)
+static int __init init_bio(void)
 {
 	bio_slab_max = 2;
 	bio_slab_nr = 0;
@@ -1615,7 +1615,7 @@ int __init init_bio(void)
 	return 0;
 }
 
-//subsys_initcall(init_bio);
+subsys_initcall(init_bio);
 
 EXPORT_SYMBOL(bio_alloc);
 EXPORT_SYMBOL(bio_kmalloc);
diff --git a/libdde_linux26/contrib/mm/backing-dev.c b/libdde_linux26/contrib/mm/backing-dev.c
index 25ebba9a..8e858744 100644
--- a/libdde_linux26/contrib/mm/backing-dev.c
+++ b/libdde_linux26/contrib/mm/backing-dev.c
@@ -159,7 +159,7 @@ static struct device_attribute bdi_dev_attrs[] = {
 	__ATTR_NULL,
 };
 
-__init int bdi_class_init(void)
+static __init int bdi_class_init(void)
 {
 	bdi_class = class_create(THIS_MODULE, "bdi");
 	bdi_class->dev_attrs = bdi_dev_attrs;
@@ -167,7 +167,7 @@ __init int bdi_class_init(void)
 	return 0;
 }
 
-//postcore_initcall(bdi_class_init);
+postcore_initcall(bdi_class_init);
 
 int bdi_register(struct backing_dev_info *bdi, struct device *parent,
 		const char *fmt, ...)
diff --git a/libdde_linux26/contrib/net/core/neighbour.c b/libdde_linux26/contrib/net/core/neighbour.c
index 97ed0aee..e0a03c81 100644
--- a/libdde_linux26/contrib/net/core/neighbour.c
+++ b/libdde_linux26/contrib/net/core/neighbour.c
@@ -2810,7 +2810,7 @@ EXPORT_SYMBOL(neigh_sysctl_unregister);
 
 #endif	/* CONFIG_SYSCTL */
 
-int __init neigh_init(void)
+static int __init neigh_init(void)
 {
 	rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL);
 	rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL);
@@ -2822,5 +2822,5 @@ int __init neigh_init(void)
 	return 0;
 }
 
-//subsys_initcall(neigh_init);
+subsys_initcall(neigh_init);
 
diff --git a/libdde_linux26/include/linux/init.h b/libdde_linux26/include/linux/init.h
index c7138b66..770546a2 100644
--- a/libdde_linux26/include/linux/init.h
+++ b/libdde_linux26/include/linux/init.h
@@ -2,7 +2,7 @@
 #define _LINUX_INIT_H
 
 #ifdef DDE_LINUX
-//#include <ddekit/initcall.h>
+#include <ddekit/initcall.h>
 #endif
 #include <linux/compiler.h>
 
@@ -184,7 +184,7 @@ extern void (*late_time_init)(void);
 #else // DDE_LINUX
 // XXX: DDE CTORs are executed in reverse order as was done by
 //      Linux' initcalls in earlier versions
-//#include <l4/dde/ddekit/initcall.h>
+#include <ddekit/initcall.h>
 #define __define_initcall(level,fn,id) DDEKIT_CTOR(fn,level)
 #endif
 
diff --git a/libdde_linux26/lib/src/arch/l4/init.c b/libdde_linux26/lib/src/arch/l4/init.c
index 195b1b23..79112f78 100644
--- a/libdde_linux26/lib/src/arch/l4/init.c
+++ b/libdde_linux26/lib/src/arch/l4/init.c
@@ -26,53 +26,8 @@ void __init __attribute__((used)) l4dde26_init(void)
 
 void l4dde26_do_initcalls(void)
 {
-	extern void dde_page_cache_init (void);
-	extern void pci_iommu_init (void);
-	extern void init_workqueues (void);
-	extern void pci_init (void);
-	extern void pci_driver_init (void);
-	extern void pcibus_class_init (void);
-	extern void net_dev_init (void);
-	extern void neigh_init (void);
-	extern void net_ns_init (void);
-	extern void blk_ioc_init (void);
-	extern void blk_settings_init (void);
-	extern void blk_softirq_init (void);
-	extern void genhd_device_init (void);
-	extern void noop_init (void);
-	extern void bdi_class_init (void);
-	extern void init_bio (void);
-	extern void chrdev_init (void);
 	/* finally, let DDEKit perform all the initcalls */
-//	ddekit_do_initcalls();
-	/* 1000: pure_, core_ */
-	l4dde26_init ();
-	l4dde26_process_init ();
-	l4dde26_init_timers ();
-	net_ns_init ();
-	dde_page_cache_init ();
-	init_workqueues ();
-	chrdev_init ();
-	/* 1001: postcore_ */
-	pci_driver_init ();
-	pcibus_class_init ();
-	bdi_class_init ();
-	/* 1002: arch_ */
-	l4dde26_init_pci ();
-	/* 1003: subsys_ */
-	net_dev_init ();
-//	neigh_init ();
-	blk_ioc_init ();
-	blk_settings_init ();
-	blk_softirq_init ();
-//	genhd_device_init ();
-	noop_init ();
-	init_bio ();
-	/* 1004: fs_ */
-	pci_iommu_init ();
-	/* 1005: device_ */
-	pci_init ();
-	/* 1006: late_ */
+	ddekit_do_initcalls();
 }
 
-//dde_initcall(l4dde26_init);
+dde_initcall(l4dde26_init);
diff --git a/libdde_linux26/lib/src/arch/l4/local.h b/libdde_linux26/lib/src/arch/l4/local.h
index 275c745b..d834a9db 100644
--- a/libdde_linux26/lib/src/arch/l4/local.h
+++ b/libdde_linux26/lib/src/arch/l4/local.h
@@ -6,7 +6,7 @@
 #include <ddekit/assert.h>
 #include <ddekit/condvar.h>
 #include <ddekit/debug.h>
-//#include <ddekit/initcall.h>
+#include <ddekit/initcall.h>
 #include <ddekit/interrupt.h>
 #include <ddekit/lock.h>
 #include <ddekit/memory.h>
diff --git a/libdde_linux26/lib/src/arch/l4/page_alloc.c b/libdde_linux26/lib/src/arch/l4/page_alloc.c
index 7c4faa0e..e887bd51 100644
--- a/libdde_linux26/lib/src/arch/l4/page_alloc.c
+++ b/libdde_linux26/lib/src/arch/l4/page_alloc.c
@@ -264,7 +264,7 @@ void *__init alloc_large_system_hash(const char *tablename,
 }
 
 
-void __init dde_page_cache_init(void)
+static void __init dde_page_cache_init(void)
 {
 	printk("Initializing DDE page cache\n");
 	int i=0;
@@ -273,4 +273,4 @@ void __init dde_page_cache_init(void)
 		INIT_HLIST_HEAD(&dde_page_cache[i]);
 }
 
-//core_initcall(dde_page_cache_init);
+core_initcall(dde_page_cache_init);
diff --git a/libdde_linux26/lib/src/arch/l4/pci.c b/libdde_linux26/lib/src/arch/l4/pci.c
index e86c42e8..2a0391f2 100644
--- a/libdde_linux26/lib/src/arch/l4/pci.c
+++ b/libdde_linux26/lib/src/arch/l4/pci.c
@@ -186,4 +186,4 @@ void __init l4dde26_init_pci(void)
 	INITIALIZE_INITVAR(dde26_pci);
 }
 
-//arch_initcall(l4dde26_init_pci);
+arch_initcall(l4dde26_init_pci);
diff --git a/libdde_linux26/lib/src/arch/l4/timer.c b/libdde_linux26/lib/src/arch/l4/timer.c
index 8149fe7e..2b657ab4 100644
--- a/libdde_linux26/lib/src/arch/l4/timer.c
+++ b/libdde_linux26/lib/src/arch/l4/timer.c
@@ -154,7 +154,7 @@ void __init l4dde26_init_timers(void)
 	INITIALIZE_INITVAR(dde26_timer);
 }
 
-//core_initcall(l4dde26_init_timers);
+core_initcall(l4dde26_init_timers);
 
 __attribute__((weak)) void do_gettimeofday (struct timeval *tv)
 {
diff --git a/libdde_linux26/lib/src/block/genhd.c b/libdde_linux26/lib/src/block/genhd.c
index f9a205f5..921cebff 100644
--- a/libdde_linux26/lib/src/block/genhd.c
+++ b/libdde_linux26/lib/src/block/genhd.c
@@ -792,7 +792,7 @@ static struct kobject *base_probe(dev_t devt, int *partno, void *data)
 	return NULL;
 }
 
-int __init genhd_device_init(void)
+static int __init genhd_device_init(void)
 {
 	int error;
 
@@ -812,7 +812,7 @@ int __init genhd_device_init(void)
 	return 0;
 }
 
-//subsys_initcall(genhd_device_init);
+subsys_initcall(genhd_device_init);
 
 static ssize_t disk_range_show(struct device *dev,
 			       struct device_attribute *attr, char *buf)
diff --git a/libdde_linux26/lib/src/drivers/pci/pci-driver.c b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
index 591d9489..199ec8a7 100644
--- a/libdde_linux26/lib/src/drivers/pci/pci-driver.c
+++ b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
@@ -992,12 +992,12 @@ struct bus_type pci_bus_type = {
 	.pm		= PCI_PM_OPS_PTR,
 };
 
-int __init pci_driver_init(void)
+static int __init pci_driver_init(void)
 {
 	return bus_register(&pci_bus_type);
 }
 
-//postcore_initcall(pci_driver_init);
+postcore_initcall(pci_driver_init);
 
 EXPORT_SYMBOL(pci_match_id);
 EXPORT_SYMBOL(__pci_register_driver);
diff --git a/libdde_linux26/lib/src/drivers/pci/pci.c b/libdde_linux26/lib/src/drivers/pci/pci.c
index 9bf601c3..f67bf734 100644
--- a/libdde_linux26/lib/src/drivers/pci/pci.c
+++ b/libdde_linux26/lib/src/drivers/pci/pci.c
@@ -2404,7 +2404,7 @@ int __devinit pci_init(void)
 	return 0;
 }
 
-int __init pci_setup(char *str)
+static int __init pci_setup(char *str)
 {
 #ifndef DDE_LINUX
 	while (str) {
@@ -2434,7 +2434,7 @@ int __init pci_setup(char *str)
 }
 early_param("pci", pci_setup);
 
-//device_initcall(pci_init);
+device_initcall(pci_init);
 
 EXPORT_SYMBOL(pci_reenable_device);
 EXPORT_SYMBOL(pci_enable_device_io);
diff --git a/libdde_linux26/lib/src/drivers/pci/probe.c b/libdde_linux26/lib/src/drivers/pci/probe.c
index 9cbc3bfb..32da5108 100644
--- a/libdde_linux26/lib/src/drivers/pci/probe.c
+++ b/libdde_linux26/lib/src/drivers/pci/probe.c
@@ -100,11 +100,11 @@ static struct class pcibus_class = {
 	.dev_release	= &release_pcibus_dev,
 };
 
-int __init pcibus_class_init(void)
+static int __init pcibus_class_init(void)
 {
 	return class_register(&pcibus_class);
 }
-//postcore_initcall(pcibus_class_init);
+postcore_initcall(pcibus_class_init);
 
 /*
  * Translate the low bits of the PCI base
diff --git a/libdde_linux26/lib/src/fs/char_dev.c b/libdde_linux26/lib/src/fs/char_dev.c
index 9dd832b4..3b8e8b3d 100644
--- a/libdde_linux26/lib/src/fs/char_dev.c
+++ b/libdde_linux26/lib/src/fs/char_dev.c
@@ -556,7 +556,7 @@ void __init chrdev_init(void)
 }
 
 #ifndef LIBINPUT
-//core_initcall(chrdev_init);
+core_initcall(chrdev_init);
 #endif
 
 /* Let modules do char dev stuff */
diff --git a/libdde_linux26/lib/src/kernel/workqueue.c b/libdde_linux26/lib/src/kernel/workqueue.c
index d52b22b5..5ad26d9f 100644
--- a/libdde_linux26/lib/src/kernel/workqueue.c
+++ b/libdde_linux26/lib/src/kernel/workqueue.c
@@ -1034,5 +1034,5 @@ void __init init_workqueues(void)
 }
 
 #ifdef DDE_LINUX
-//core_initcall(init_workqueues);
+core_initcall(init_workqueues);
 #endif
diff --git a/libdde_linux26/lib/src/net/core/dev.c b/libdde_linux26/lib/src/net/core/dev.c
index b1307dd2..65b4ba42 100644
--- a/libdde_linux26/lib/src/net/core/dev.c
+++ b/libdde_linux26/lib/src/net/core/dev.c
@@ -5186,7 +5186,7 @@ static struct pernet_operations __net_initdata default_device_ops = {
  *       This is called single threaded during boot, so no need
  *       to take the rtnl semaphore.
  */
-int __init net_dev_init(void)
+static int __init net_dev_init(void)
 {
 	int i, rc = -ENOMEM;
 
@@ -5254,7 +5254,7 @@ out:
 	return rc;
 }
 
-//subsys_initcall(net_dev_init);
+subsys_initcall(net_dev_init);
 
 EXPORT_SYMBOL(__dev_get_by_index);
 EXPORT_SYMBOL(__dev_get_by_name);
diff --git a/libdde_linux26/lib/src/net/core/net_namespace.c b/libdde_linux26/lib/src/net/core/net_namespace.c
index 29f29621..ab5a0a7f 100644
--- a/libdde_linux26/lib/src/net/core/net_namespace.c
+++ b/libdde_linux26/lib/src/net/core/net_namespace.c
@@ -202,7 +202,7 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
 }
 #endif
 
-int __init net_ns_init(void)
+static int __init net_ns_init(void)
 {
 	struct net_generic *ng;
 	int err;
@@ -239,7 +239,7 @@ int __init net_ns_init(void)
 	return 0;
 }
 
-//pure_initcall(net_ns_init);
+pure_initcall(net_ns_init);
 
 #ifdef CONFIG_NET_NS
 static int register_pernet_operations(struct list_head *list,
-- 
cgit v1.2.3