Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (a8251096) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/isdn/hisax/hisax_fcpcipnp.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -74,9 +74,10 @@ static struct pnp_device_id fcpnp_ids[] __devinitdata = {
	.id = "AVM0900",		.id = "AVM0900",
	.driver_data = (unsigned long) "Fritz!Card PnP",		.driver_data = (unsigned long) "Fritz!Card PnP",
	},		},
			{ .id = "" }
	};		};

	MODULE_DEVICE_TABLE(isapnp, fcpnp_ids);		MODULE_DEVICE_TABLE(pnp, fcpnp_ids);
	#endif		#endif

	static int protocol = 2; /* EURO-ISDN Default */		static int protocol = 2; /* EURO-ISDN Default */

include/linux/isapnp.h

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -43,10 +43,10 @@
	*/		*/

	#ifdef __KERNEL__		#ifdef __KERNEL__
			#include <linux/mod_devicetable.h>

	#define DEVICE_COUNT_COMPATIBLE 4		#define DEVICE_COUNT_COMPATIBLE 4

	#define ISAPNP_ANY_ID 0xffff
	#define ISAPNP_CARD_DEVS 8		#define ISAPNP_CARD_DEVS 8

	#define ISAPNP_CARD_ID(_va, _vb, _vc, _device) \		#define ISAPNP_CARD_ID(_va, _vb, _vc, _device) \
	@@ -74,12 +74,6 @@ struct isapnp_card_id {
	#define ISAPNP_DEVICE_SINGLE_END \		#define ISAPNP_DEVICE_SINGLE_END \
	.card_vendor = 0, .card_device = 0		.card_vendor = 0, .card_device = 0

	struct isapnp_device_id {
	unsigned short card_vendor, card_device;
	unsigned short vendor, function;
	unsigned long driver_data; /* data private to the driver */
	};

	#if defined(CONFIG_ISAPNP) \|\| (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))		#if defined(CONFIG_ISAPNP) \|\| (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE))

	#define __ISAPNP__		#define __ISAPNP__

include/linux/mod_devicetable.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -509,4 +509,11 @@ struct zorro_device_id {

	#define ZORRO_DEVICE_MODALIAS_FMT "zorro:i%08X"		#define ZORRO_DEVICE_MODALIAS_FMT "zorro:i%08X"

			#define ISAPNP_ANY_ID 0xffff
			struct isapnp_device_id {
			unsigned short card_vendor, card_device;
			unsigned short vendor, function;
			kernel_ulong_t driver_data; /* data private to the driver */
			};

	#endif /* LINUX_MOD_DEVICETABLE_H */		#endif /* LINUX_MOD_DEVICETABLE_H */

kernel/module.c

+37 −22

Original line number	Original line	Diff line number	Diff line
	@@ -565,33 +565,26 @@ int use_module(struct module a, struct module b)
	struct module_use *use;		struct module_use *use;
	int no_warn, err;		int no_warn, err;

	if (b == NULL \|\| already_uses(a, b)) return 1;		if (b == NULL \|\| already_uses(a, b))

	/* If we're interrupted or time out, we fail. */
	if (wait_event_interruptible_timeout(
	module_wq, (err = strong_try_module_get(b)) != -EBUSY,
	30 * HZ) <= 0) {
	printk("%s: gave up waiting for init of module %s.\n",
	a->name, b->name);
	return 0;		return 0;
	}

	/* If strong_try_module_get() returned a different error, we fail. */		/* If we're interrupted or time out, we fail. */
			err = strong_try_module_get(b);
	if (err)		if (err)
	return 0;		return err;

	DEBUGP("Allocating new usage for %s.\n", a->name);		DEBUGP("Allocating new usage for %s.\n", a->name);
	use = kmalloc(sizeof(*use), GFP_ATOMIC);		use = kmalloc(sizeof(*use), GFP_ATOMIC);
	if (!use) {		if (!use) {
	printk("%s: out of memory loading\n", a->name);		printk("%s: out of memory loading\n", a->name);
	module_put(b);		module_put(b);
	return 0;		return -ENOMEM;
	}		}

	use->module_which_uses = a;		use->module_which_uses = a;
	list_add(&use->list, &b->modules_which_use_me);		list_add(&use->list, &b->modules_which_use_me);
	no_warn = sysfs_create_link(b->holders_dir, &a->mkobj.kobj, a->name);		no_warn = sysfs_create_link(b->holders_dir, &a->mkobj.kobj, a->name);
	return 1;		return 0;
	}		}
	EXPORT_SYMBOL_GPL(use_module);		EXPORT_SYMBOL_GPL(use_module);

	@@ -884,7 +877,7 @@ static inline void module_unload_free(struct module *mod)

	int use_module(struct module a, struct module b)		int use_module(struct module a, struct module b)
	{		{
	return strong_try_module_get(b) == 0;		return strong_try_module_get(b);
	}		}
	EXPORT_SYMBOL_GPL(use_module);		EXPORT_SYMBOL_GPL(use_module);

	@@ -1055,17 +1048,39 @@ static const struct kernel_symbol resolve_symbol(Elf_Shdr sechdrs,
	struct module *owner;		struct module *owner;
	const struct kernel_symbol *sym;		const struct kernel_symbol *sym;
	const unsigned long *crc;		const unsigned long *crc;
			DEFINE_WAIT(wait);
			int err;
			long timeleft = 30 * HZ;

			again:
	sym = find_symbol(name, &owner, &crc,		sym = find_symbol(name, &owner, &crc,
	!(mod->taints & (1 << TAINT_PROPRIETARY_MODULE)), true);		!(mod->taints & (1 << TAINT_PROPRIETARY_MODULE)), true);
	/* use_module can fail due to OOM,		if (!sym)
	or module initialization or unloading */		return NULL;
	if (sym) {
	if (!check_version(sechdrs, versindex, name, mod, crc, owner)		if (!check_version(sechdrs, versindex, name, mod, crc, owner))
	\|\| !use_module(mod, owner))		return NULL;
	sym = NULL;
			prepare_to_wait(&module_wq, &wait, TASK_INTERRUPTIBLE);
			err = use_module(mod, owner);
			if (likely(!err) \|\| err != -EBUSY \|\| signal_pending(current)) {
			finish_wait(&module_wq, &wait);
			return err ? NULL : sym;
	}		}
	return sym;
			/* Module is still loading. Drop lock and wait. */
			mutex_unlock(&module_mutex);
			timeleft = schedule_timeout(timeleft);
			mutex_lock(&module_mutex);
			finish_wait(&module_wq, &wait);

			/* Module might be gone entirely, or replaced. Re-lookup. */
			if (timeleft)
			goto again;

			printk(KERN_WARNING "%s: gave up waiting for init of module %s.\n",
			mod->name, owner->name);
			return NULL;
	}		}

	/*		/*

scripts/mod/file2alias.c

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -828,6 +828,19 @@ static int do_zorro_entry(const char filename, struct zorro_device_id id,
	return 1;		return 1;
	}		}

			/* looks like: "pnp:dD" */
			static int do_isapnp_entry(const char *filename,
			struct isapnp_device_id id, char alias)
			{
			sprintf(alias, "pnp:d%c%c%c%x%x%x%x*",
			'A' + ((id->vendor >> 2) & 0x3f) - 1,
			'A' + (((id->vendor & 3) << 3) \| ((id->vendor >> 13) & 7)) - 1,
			'A' + ((id->vendor >> 8) & 0x1f) - 1,
			(id->function >> 4) & 0x0f, id->function & 0x0f,
			(id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
			return 1;
			}

	/* Ignore any prefix, eg. some architectures prepend _ */		/* Ignore any prefix, eg. some architectures prepend _ */
	static inline int sym_is(const char symbol, const char name)		static inline int sym_is(const char symbol, const char name)
	{		{
	@@ -983,6 +996,10 @@ void handle_moddevtable(struct module mod, struct elf_info info,
	do_table(symval, sym->st_size,		do_table(symval, sym->st_size,
	sizeof(struct zorro_device_id), "zorro",		sizeof(struct zorro_device_id), "zorro",
	do_zorro_entry, mod);		do_zorro_entry, mod);
			else if (sym_is(symname, "__mod_isapnp_device_table"))
			do_table(symval, sym->st_size,
			sizeof(struct isapnp_device_id), "isa",
			do_isapnp_entry, mod);
	free(zeros);		free(zeros);
	}		}