Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 (a6cc48ee) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/driver-model/platform.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -122,15 +122,15 @@ None the less, there are some APIs to support such legacy drivers. Avoid
		using these calls except with such hotplug-deficient drivers.

		struct platform_device *platform_device_alloc(
		char *name, unsigned id);
		const char *name, int id);

		You can use platform_device_alloc() to dynamically allocate a device, which
		you will then initialize with resources and platform_device_register().
		A better solution is usually:

		struct platform_device *platform_device_register_simple(
		char *name, unsigned id,
		struct resource *res, unsigned nres);
		const char *name, int id,
		struct resource *res, unsigned int nres);

		You can use platform_device_register_simple() as a one-step call to allocate
		and register a device.

Documentation/ja_JP/stable_kernel_rules.txt

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		NOTE:
		This is Japanese translated version of "Documentation/stable_kernel_rules.txt".
		This one is maintained by Tsugikazu Shibata <tshibata@ab.jp.nec.com>
		and JF Project team <www.linux.or.jp/JF>.
		If you find difference with original file or problem in translation,
		please contact maintainer of this file or JF project.

		Please also note that purpose of this file is easier to read for non
		English natives and do no intended to fork. So, if you have any
		comment or update of this file, please try to update Original(English)
		file at first.

		==================================
		ããã¯ã
		linux-2.6.24/Documentation/stable_kernel_rules.txt
		ã®åè¨³ã§ãã

		ç¿»è¨³å£ä½ï¼ JF ããã¸ã§ã¯ã < http://www.linux.or.jp/JF/ >
		ç¿»è¨³æ¥ï¼ 2007/12/30
		ç¿»è¨³èï¼ Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com>
		æ ¡æ£èï¼ æ¦äºä¼¸åããã<takei at webmasters dot gr dot jp>
		ããããã (Seiji Kaneko) <skaneko at a2 dot mbn dot or dot jp>
		å°æ éå¸ãã (Masanori Kobayasi) <zap03216 at nifty dot ne dot jp>
		éå£ãã (Kenji Noguchi) <tokyo246 at gmail dot com>
		ç¥å®®ä¿¡å¤ªéãã <jin at libjingu dot jp>
		==================================

		ãã£ã¨ç¥ãããã£ã Linux 2.6 -stable ãªãªã¼ã¹ã®å¨ã¦

		"-stable" ããªã¼ã«ã©ã®ãããªç¨®é¡ã®ããããåãå¥ããããããã©ã®ãããª
		ãã®ãåãå¥ããããªãããã«ã¤ãã¦ã®è¦å-

		- æããã«æ£ããããã¹ãããã¦ãããã®ã§ãªããã°ãªããªãã
		- æè(å¤æ´è¡ã®åå¾)ãå«ãã¦ 100 è¡ããå¤§ããã¦ã¯ãããªãã
		- ãã ä¸åã®ãã¨ã ããä¿®æ£ãã¦ããã¹ãã
		- çãæ©ã¾ãã¦ããæ¬ç©ã®ãã°ãä¿®æ£ããªããã°ãªããªãã("ããã¯ãã°ã§
		ãããããããªãã..." ã®ãããªãã®ã§ã¯ãªã)
		- ãã«ãã¨ã©ã¼(CONFIG_BROKENã«ãªã£ã¦ãããã®ãé¤ã), oops, ãã³ã°ããã¼
		ã¿ç ´å£ãç¾å®ã®ã»ãã¥ãªãã£åé¡ããã®ä» "ãããããã¯ãã¡ã ã"ã¨ãã
		ãããªãã®ãä¿®æ£ããªããã°ãªããªããçãè¨ãã°ãéå¤§ãªåé¡ã
		- ã©ã®ããã«ç«¶åç¶æãçºçãããã®èª¬æãä¸ç·ã«æ¸ããã¦ããªãéãã
		"çè«çã«ã¯ç«¶åç¶æã«ãªã"ãããªãã®ã¯ä¸å¯ã
		- ãããªãäºç´°ãªä¿®æ£ãå«ãããã¨ã¯ã§ããªãã(ã¹ãã«ã®ä¿®æ£ãç©ºç½ã®ã¯ãªã¼
		ã³ã¢ãããªã©)
		- å¯¾å¿ãããµãã·ã¹ãã ã¡ã³ãããåãå¥ãããã®ã§ãªããã°ãªããªãã
		- Documentation/SubmittingPatches ã®è¦åã«å¾ã£ããã®ã§ãªããã°ãªããªãã

		-stable ããªã¼ã«ããããéä»ããæç¶ã-

		- ä¸è¨ã®è¦åã«å¾ã£ã¦ããããç¢ºèªããå¾ã«ãstable@kernel.org ã«ããã
		ãéãã
		- éä¿¡èã¯ãããããã¥ã¼ã«åãä»ããããéã«ã¯ ACK ããå´ä¸ãããå ´å
		ã«ã¯ NAK ãåãåãããã®åå¿ã¯éçºèãã¡ã®ã¹ã±ã¸ã¥ã¼ã«ã«ãã£ã¦ãæ°
		æ¥ãããå ´åãããã
		- ããåãåããããããããã¯ä»ã®éçºèãã¡ã®ã¬ãã¥ã¼ã®ããã«
		-stable ãã¥ã¼ã«è¿½å ãããã
		- ã»ãã¥ãªãã£ãããã¯ãã®ã¨ã¤ãªã¢ã¹ (stable@kernel.org) ã«éãããã¹
		ãã§ã¯ãªããä»£ããã« security@kernel.org ã®ã¢ãã¬ã¹ã«éãããã

		ã¬ãã¥ã¼ãµã¤ã¯ã«-

		- -stable ã¡ã³ãããã¬ãã¥ã¼ãµã¤ã¯ã«ãæ±ºããã¨ãããããã¯ã¬ãã¥ã¼å§
		å¡ä¼ã¨ããããå½±é¿ããé åã®ã¡ã³ãã(æä¾èããã®é åã®ã¡ã³ããã§ç¡
		ãéã)ã«éãããlinux-kernel ã¡ã¼ãªã³ã°ãªã¹ãã«CCãããã
		- ã¬ãã¥ã¼å§å¡ä¼ã¯ 48æéã®éã« ACK ã NAK ãåºãã
		- ããããããå§å¡ä¼ã®ã¡ã³ãããå´ä¸ããããã¡ã³ããéãã¡ã³ããæ°ä»
		ããªãã£ãåé¡ãæã¡ããããlinux-kernel ã¡ã³ãããããã«ç°è°ãå±ã
		ãå ´åã«ã¯ããããã¯ãã¥ã¼ããåé¤ãããã
		- ã¬ãã¥ã¼ãµã¤ã¯ã«ã®æå¾ã«ãACK ãåãããããã¯ææ°ã® -stable ãªãªã¼
		ã¹ã«è¿½å ããããã®å¾ã«æ°ãã -stable ãªãªã¼ã¹ãè¡ãããã
		- ã»ãã¥ãªãã£ãããã¯ãéå¸¸ã®ã¬ãã¥ã¼ãµã¤ã¯ã«ãéãããã»ãã¥ãªãã£
		ã«ã¼ãã«ãã¼ã ããç´æ¥ -stable ããªã¼ã«åãä»ããããã
		ãã®æç¶ãã®è©³ç´°ã«ã¤ãã¦ã¯ kernel security ãã¼ã ã«åãåããããã¨ã

		ã¬ãã¥ã¼å§å¡ä¼-

		- ãã®å§å¡ä¼ã¯ããã®ã¿ã¹ã¯ã«ã¤ãã¦æ´»åããå¤ãã®ãã©ã³ãã£ã¢ã¨ãå°æ°ã®
		éãã©ã³ãã£ã¢ã®ã«ã¼ãã«éçºèéã§æ§æããã¦ããã

drivers/base/core.c

+13 −27

Original line number	Diff line number	Diff line
		@@ -423,10 +423,8 @@ struct kset *devices_kset;
		int device_create_file(struct device dev, struct device_attribute attr)
		{
		int error = 0;
		if (get_device(dev)) {
		if (dev)
		error = sysfs_create_file(&dev->kobj, &attr->attr);
		put_device(dev);
		}
		return error;
		}

		@@ -437,10 +435,8 @@ int device_create_file(struct device dev, struct device_attribute attr)
		*/
		void device_remove_file(struct device dev, struct device_attribute attr)
		{
		if (get_device(dev)) {
		if (dev)
		sysfs_remove_file(&dev->kobj, &attr->attr);
		put_device(dev);
		}
		}

		/**
		@@ -1144,25 +1140,11 @@ struct device device_create(struct class class, struct device *parent,
		}
		EXPORT_SYMBOL_GPL(device_create);

		/**
		* find_device - finds a device that was created with device_create()
		* @class: pointer to the struct class that this device was registered with
		* @devt: the dev_t of the device that was previously registered
		*/
		static struct device find_device(struct class class, dev_t devt)
		static int __match_devt(struct device dev, void data)
		{
		struct device *dev = NULL;
		struct device *dev_tmp;
		dev_t *devt = data;

		down(&class->sem);
		list_for_each_entry(dev_tmp, &class->devices, node) {
		if (dev_tmp->devt == devt) {
		dev = dev_tmp;
		break;
		}
		}
		up(&class->sem);
		return dev;
		return dev->devt == *devt;
		}

		/**
		@@ -1177,10 +1159,12 @@ void device_destroy(struct class *class, dev_t devt)
		{
		struct device *dev;

		dev = find_device(class, devt);
		if (dev)
		dev = class_find_device(class, &devt, __match_devt);
		if (dev) {
		put_device(dev);
		device_unregister(dev);
		}
		}
		EXPORT_SYMBOL_GPL(device_destroy);

		#ifdef CONFIG_PM_SLEEP
		@@ -1203,9 +1187,11 @@ void destroy_suspended_device(struct class *class, dev_t devt)
		{
		struct device *dev;

		dev = find_device(class, devt);
		if (dev)
		dev = class_find_device(class, &devt, __match_devt);
		if (dev) {
		device_pm_schedule_removal(dev);
		put_device(dev);
		}
		}
		EXPORT_SYMBOL_GPL(destroy_suspended_device);
		#endif /* CONFIG_PM_SLEEP */

drivers/base/driver.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -97,10 +97,9 @@ int driver_create_file(struct device_driver *drv,
		struct driver_attribute *attr)
		{
		int error;
		if (get_driver(drv)) {
		if (drv)
		error = sysfs_create_file(&drv->p->kobj, &attr->attr);
		put_driver(drv);
		} else
		else
		error = -EINVAL;
		return error;
		}
		@@ -114,10 +113,8 @@ EXPORT_SYMBOL_GPL(driver_create_file);
		void driver_remove_file(struct device_driver *drv,
		struct driver_attribute *attr)
		{
		if (get_driver(drv)) {
		if (drv)
		sysfs_remove_file(&drv->p->kobj, &attr->attr);
		put_driver(drv);
		}
		}
		EXPORT_SYMBOL_GPL(driver_remove_file);

drivers/base/power/main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,7 @@ void device_pm_schedule_removal(struct device *dev)
		list_move_tail(&dev->power.entry, &dpm_destroy);
		mutex_unlock(&dpm_list_mtx);
		}
		EXPORT_SYMBOL_GPL(device_pm_schedule_removal);

		/**
		* pm_sleep_lock - mutual exclusion for registration and suspend