Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (199 commits) [MTD] NAND: Fix breakage all over the place [PATCH] NAND: fix remaining OOB length calculation [MTD] NAND Fixup NDFC merge brokeness [MTD NAND] S3C2410 driver cleanup [MTD NAND] s3c24x0 board: Fix clock handling, ensure proper initialisation. [JFFS2] Check CRC32 on dirent and data nodes each time they're read [JFFS2] When retiring nextblock, allocate a node_ref for the wasted space [JFFS2] Mark XATTR support as experimental, for now [JFFS2] Don't trust node headers before the CRC is checked. [MTD] Restore MTD_ROM and MTD_RAM types [MTD] assume mtd->writesize is 1 for NOR flashes [MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles [MTD] Prepare physmap for 64-bit-resources [JFFS2] Fix more breakage caused by janitorial meddling. [JFFS2] Remove stray __exit from jffs2_compressors_exit() [MTD] Allow alternate JFFS2 mount variant for root filesystem. [MTD] Disconnect struct mtd_info from ABI [MTD] replace MTD_RAM with MTD_GENERIC_TYPE [MTD] replace MTD_ROM with MTD_GENERIC_TYPE [MTD] remove a forgotten MTD_XIP ...
This commit is contained in:
Linus Torvalds
@@ -20,7 +20,6 @@ obj-$(CONFIG_SMP) += cpu.o spinlock.o
|
||||
obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
|
||||
obj-$(CONFIG_UID16) += uid16.o
|
||||
obj-$(CONFIG_MODULES) += module.o
|
||||
obj-$(CONFIG_OBSOLETE_INTERMODULE) += intermodule.o
|
||||
obj-$(CONFIG_KALLSYMS) += kallsyms.o
|
||||
obj-$(CONFIG_PM) += power/
|
||||
obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
|
||||
|
||||
@@ -1,184 +0,0 @@
|
||||
/* Deprecated, do not use. Moved from module.c to here. --RR */
|
||||
|
||||
/* Written by Keith Owens <kaos@ocs.com.au> Oct 2000 */
|
||||
#include <linux/module.h>
|
||||
#include <linux/kmod.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
/* inter_module functions are always available, even when the kernel is
|
||||
* compiled without modules. Consumers of inter_module_xxx routines
|
||||
* will always work, even when both are built into the kernel, this
|
||||
* approach removes lots of #ifdefs in mainline code.
|
||||
*/
|
||||
|
||||
static struct list_head ime_list = LIST_HEAD_INIT(ime_list);
|
||||
static DEFINE_SPINLOCK(ime_lock);
|
||||
static int kmalloc_failed;
|
||||
|
||||
struct inter_module_entry {
|
||||
struct list_head list;
|
||||
const char *im_name;
|
||||
struct module *owner;
|
||||
const void *userdata;
|
||||
};
|
||||
|
||||
/**
|
||||
* inter_module_register - register a new set of inter module data.
|
||||
* @im_name: an arbitrary string to identify the data, must be unique
|
||||
* @owner: module that is registering the data, always use THIS_MODULE
|
||||
* @userdata: pointer to arbitrary userdata to be registered
|
||||
*
|
||||
* Description: Check that the im_name has not already been registered,
|
||||
* complain if it has. For new data, add it to the inter_module_entry
|
||||
* list.
|
||||
*/
|
||||
void inter_module_register(const char *im_name, struct module *owner, const void *userdata)
|
||||
{
|
||||
struct list_head *tmp;
|
||||
struct inter_module_entry *ime, *ime_new;
|
||||
|
||||
if (!(ime_new = kzalloc(sizeof(*ime), GFP_KERNEL))) {
|
||||
/* Overloaded kernel, not fatal */
|
||||
printk(KERN_ERR
|
||||
"Aiee, inter_module_register: cannot kmalloc entry for '%s'\n",
|
||||
im_name);
|
||||
kmalloc_failed = 1;
|
||||
return;
|
||||
}
|
||||
ime_new->im_name = im_name;
|
||||
ime_new->owner = owner;
|
||||
ime_new->userdata = userdata;
|
||||
|
||||
spin_lock(&ime_lock);
|
||||
list_for_each(tmp, &ime_list) {
|
||||
ime = list_entry(tmp, struct inter_module_entry, list);
|
||||
if (strcmp(ime->im_name, im_name) == 0) {
|
||||
spin_unlock(&ime_lock);
|
||||
kfree(ime_new);
|
||||
/* Program logic error, fatal */
|
||||
printk(KERN_ERR "inter_module_register: duplicate im_name '%s'", im_name);
|
||||
BUG();
|
||||
}
|
||||
}
|
||||
list_add(&(ime_new->list), &ime_list);
|
||||
spin_unlock(&ime_lock);
|
||||
}
|
||||
|
||||
/**
|
||||
* inter_module_unregister - unregister a set of inter module data.
|
||||
* @im_name: an arbitrary string to identify the data, must be unique
|
||||
*
|
||||
* Description: Check that the im_name has been registered, complain if
|
||||
* it has not. For existing data, remove it from the
|
||||
* inter_module_entry list.
|
||||
*/
|
||||
void inter_module_unregister(const char *im_name)
|
||||
{
|
||||
struct list_head *tmp;
|
||||
struct inter_module_entry *ime;
|
||||
|
||||
spin_lock(&ime_lock);
|
||||
list_for_each(tmp, &ime_list) {
|
||||
ime = list_entry(tmp, struct inter_module_entry, list);
|
||||
if (strcmp(ime->im_name, im_name) == 0) {
|
||||
list_del(&(ime->list));
|
||||
spin_unlock(&ime_lock);
|
||||
kfree(ime);
|
||||
return;
|
||||
}
|
||||
}
|
||||
spin_unlock(&ime_lock);
|
||||
if (kmalloc_failed) {
|
||||
printk(KERN_ERR
|
||||
"inter_module_unregister: no entry for '%s', "
|
||||
"probably caused by previous kmalloc failure\n",
|
||||
im_name);
|
||||
return;
|
||||
}
|
||||
else {
|
||||
/* Program logic error, fatal */
|
||||
printk(KERN_ERR "inter_module_unregister: no entry for '%s'", im_name);
|
||||
BUG();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* inter_module_get - return arbitrary userdata from another module.
|
||||
* @im_name: an arbitrary string to identify the data, must be unique
|
||||
*
|
||||
* Description: If the im_name has not been registered, return NULL.
|
||||
* Try to increment the use count on the owning module, if that fails
|
||||
* then return NULL. Otherwise return the userdata.
|
||||
*/
|
||||
static const void *inter_module_get(const char *im_name)
|
||||
{
|
||||
struct list_head *tmp;
|
||||
struct inter_module_entry *ime;
|
||||
const void *result = NULL;
|
||||
|
||||
spin_lock(&ime_lock);
|
||||
list_for_each(tmp, &ime_list) {
|
||||
ime = list_entry(tmp, struct inter_module_entry, list);
|
||||
if (strcmp(ime->im_name, im_name) == 0) {
|
||||
if (try_module_get(ime->owner))
|
||||
result = ime->userdata;
|
||||
break;
|
||||
}
|
||||
}
|
||||
spin_unlock(&ime_lock);
|
||||
return(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* inter_module_get_request - im get with automatic request_module.
|
||||
* @im_name: an arbitrary string to identify the data, must be unique
|
||||
* @modname: module that is expected to register im_name
|
||||
*
|
||||
* Description: If inter_module_get fails, do request_module then retry.
|
||||
*/
|
||||
const void *inter_module_get_request(const char *im_name, const char *modname)
|
||||
{
|
||||
const void *result = inter_module_get(im_name);
|
||||
if (!result) {
|
||||
request_module("%s", modname);
|
||||
result = inter_module_get(im_name);
|
||||
}
|
||||
return(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* inter_module_put - release use of data from another module.
|
||||
* @im_name: an arbitrary string to identify the data, must be unique
|
||||
*
|
||||
* Description: If the im_name has not been registered, complain,
|
||||
* otherwise decrement the use count on the owning module.
|
||||
*/
|
||||
void inter_module_put(const char *im_name)
|
||||
{
|
||||
struct list_head *tmp;
|
||||
struct inter_module_entry *ime;
|
||||
|
||||
spin_lock(&ime_lock);
|
||||
list_for_each(tmp, &ime_list) {
|
||||
ime = list_entry(tmp, struct inter_module_entry, list);
|
||||
if (strcmp(ime->im_name, im_name) == 0) {
|
||||
if (ime->owner)
|
||||
module_put(ime->owner);
|
||||
spin_unlock(&ime_lock);
|
||||
return;
|
||||
}
|
||||
}
|
||||
spin_unlock(&ime_lock);
|
||||
printk(KERN_ERR "inter_module_put: no entry for '%s'", im_name);
|
||||
BUG();
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(inter_module_register);
|
||||
EXPORT_SYMBOL(inter_module_unregister);
|
||||
EXPORT_SYMBOL(inter_module_get_request);
|
||||
EXPORT_SYMBOL(inter_module_put);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
Reference in New Issue
Block a user