more Driver core patches for 2.6.20
Subsystems (5)
PATCH 1/1 more Driver core patches for 2.6.20
Here are some more driver core and debugfs patches and a serial port device id addition for 2.6.20-git.
All of these have been in the -mm tree.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
Patches will be sent as a follow-on to this message to lkml for people to see.
thanks,
greg k-h
drivers/base/bus.c | 22 ++++---- drivers/base/class.c | 3 +- drivers/pcmcia/at91_cf.c | 2 +- drivers/pcmcia/soc_common.c | 8 ++-- drivers/serial/serial_cs.c | 5 ++ fs/debugfs/file.c | 12 ++++ fs/debugfs/inode.c | 82 ++++++++++++++++++++++++++---- fs/partitions/check.c | 9 +-- include/linux/debugfs.h | 10 ++++ include/linux/device.h | 1 + include/linux/kmod.h | 2 + include/linux/module.h | 53 ++++++++++++++++--- include/linux/moduleparam.h | 12 ++++ include/pcmcia/ciscode.h | 1 + kernel/kmod.c | 120 +++++++++++++++++++++++++++++++++++++++++++ kernel/module.c | 47 ++++++++++------- kernel/params.c | 29 ++++++----- lib/kobject.c | 2 +- 18 files changed, 343 insertions(+), 77 deletions(-)
---------------
Alexey Dobriyan (1):
pcmcia: some class_device fallout
Andrew Morton (1):
Driver core: device_add_attrs() cleanup
Cornelia Huck (1):
debugfs: Remove misleading comments.
Greg Kroah-Hartman (1):
Driver.h copyright update
Kay Sievers (1):
Driver core: let request_module() send a /sys/modules/kmod/-uevent
Mariusz Kozlowski (1):
Driver: remove redundant kobject_unregister checks
Martin Stoilov (1):
kobject: kobj->k_name verification fix
Peter Oberparleiter (1):
debugfs: implement symbolic links
Randy Dunlap (1):
sysfs: fix build errors: uevent with CONFIG_SYSFS=n
Sergei Organov (1):
serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
PATCH 1/10 Driver.h copyright update
It was pointed out that I had not updated my copyright on driver.h
--- include/linux/device.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/linux/device.h +1 -0
@@ -2,6 +2,7 @@* device.h - generic, centralized driver model * * Copyright (c) 2001-2003 Patrick Mochel <[email protected]> +* Copyright (c) 2004-2007 Greg Kroah-Hartman <[email protected]> * * This file is released under the GPLv2 *
Signature · 1 line
1.5.0
PATCH 2/10 Driver core: let request_module() send a /sys/modules/kmod/-uevent
From: Kay Sievers <[email protected]>
On recent systems, calls to /sbin/modprobe are handled by udev depending on the kind of device the kernel has discovered. This patch creates an uevent for the kernels internal request_module(), to let udev take control over the request, instead of forking the binary directly by the kernel. The direct execution of /sbin/modprobe can be disabled by setting:
/sys/module/kmod/mod_request_helper (/proc/sys/kernel/modprobe)
to an empty string, the same way /proc/sys/kernel/hotplug is disabled on an udev system.
--- include/linux/kmod.h | 2 + kernel/kmod.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/module.c | 26 +++++++---- kernel/params.c | 1 + 4 files changed, 139 insertions(+), 10 deletions(-)
include/linux/kmod.h +2 -0
@@ -28,8 +28,10 @@#ifdef CONFIG_KMOD /* modprobe exit status on success, -ve on error. Return value * usually useless though. */ +extern void kmod_sysfs_init (void );extern int request_module (const char * name, ...) __attribute__ ((format (printf,1 ,2 )));#else +static inline void kmod_sysfs_init (void ) {};static inline int request_module (const char * name, ...) {return -ENOSYS ; }#endif
kernel/kmod.c +120 -0
153 lines not on this page · raw message
kernel/module.c +16 -10
@@ -653,20 +653,11 @@ static void wait_for_zero_refcount(struct module *mod)mutex_lock (&module_mutex); } -asmlinkage long -sys_delete_module (const char __user *name_user,unsigned int flags) +int delete_module (const char *name,unsigned int flags) {struct module *mod; -char name[MODULE_NAME_LEN ];int ret, forced =0 ; -if (!capable (CAP_SYS_MODULE )) -return -EPERM ; - -if (strncpy_from_user (name, name_user,MODULE_NAME_LEN -1 ) <0 ) -return -EFAULT ; - name[MODULE_NAME_LEN -1 ] ='\0' ; -if (mutex_lock_interruptible (&module_mutex) !=0 )return -EINTR ;
@@ -727,6 +718,21 @@ sys_delete_module(const char __user *name_user, unsigned int flags)return ret; } +asmlinkage long +sys_delete_module (const char __user *name_user,unsigned int flags) +{ +char name[MODULE_NAME_LEN ]; + +if (!capable (CAP_SYS_MODULE )) +return -EPERM ; + +if (strncpy_from_user (name, name_user,MODULE_NAME_LEN -1 ) <0 ) +return -EFAULT ; + name[MODULE_NAME_LEN -1 ] ='\0' ; + +return delete_module (name, flags); +} +static void print_unload_info (struct seq_file *m,struct module *mod) {struct module_use *use;
kernel/params.c +1 -0
@@ -714,6 +714,7 @@ static int __init param_sysfs_init(void) }param_sysfs_builtin (); +kmod_sysfs_init ();return 0 ; }
Signature · 1 line
1.5.0
PATCH 3/10 serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
From: Sergei Organov <[email protected]>
Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
--- drivers/serial/serial_cs.c | 5 +++++ include/pcmcia/ciscode.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-)
drivers/serial/serial_cs.c +5 -0
@@ -248,6 +248,10 @@ static const struct serial_quirk quirks[] = { .multi = 2, }, { .manfid = MANFID_QUATECH, + .prodid = PRODID_QUATECH_DUAL_RS232_G, + .multi = 2, + }, { + .manfid = MANFID_QUATECH, .prodid = PRODID_QUATECH_QUAD_RS232, .multi = 4, }, {
@@ -891,6 +895,7 @@ static struct pcmcia_device_id serial_ids[] = {PCMCIA_DEVICE_PROD_ID12 ("OEM " ,"C288MX " ,0xb572d360 ,0xd2385b7a ),PCMCIA_DEVICE_PROD_ID12 ("PCMCIA " ,"C336MX " ,0x99bcafe9 ,0xaa25bcab ),PCMCIA_DEVICE_PROD_ID12 ("Quatech Inc" ,"PCMCIA Dual RS-232 Serial Port Card" ,0xc4420b35 ,0x92abc92f ), +PCMCIA_DEVICE_PROD_ID12 ("Quatech Inc" ,"Dual RS-232 Serial Port PC Card" ,0xc4420b35 ,0x031a380d ),PCMCIA_PFC_DEVICE_CIS_PROD_ID12 (1 ,"PCMCIA" ,"EN2218-LAN/MODEM" ,0x281f1c5d ,0x570f348e ,"PCMLM28.cis" ),PCMCIA_PFC_DEVICE_CIS_PROD_ID12 (1 ,"PCMCIA" ,"UE2218-LAN/MODEM" ,0x281f1c5d ,0x6fdcacee ,"PCMLM28.cis" ), PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "PCMLM28.cis"),
include/pcmcia/ciscode.h +1 -0
@@ -95,6 +95,7 @@#define PRODID_QUATECH_DUAL_RS232 0x0012#define PRODID_QUATECH_DUAL_RS232_D1 0x0007#define PRODID_QUATECH_DUAL_RS232_D2 0x0052 +#define PRODID_QUATECH_DUAL_RS232_G 0x004d#define PRODID_QUATECH_QUAD_RS232 0x001b#define PRODID_QUATECH_DUAL_RS422 0x000e#define PRODID_QUATECH_QUAD_RS422 0x0045
Signature · 1 line
1.5.0
PATCH 4/10 kobject: kobj->k_name verification fix
From: Martin Stoilov <[email protected]>
The function 'kobject_add' tries to verify the name of a new kobject instance is properly set before continuing.
if (!kobj->k_name)
kobj->k_name = kobj->name;
if (!kobj->k_name) {
pr_debug("kobject attempted to be registered with no name!\n");
WARN_ON(1);
return -EINVAL;
}
The statement:
if (!kobj->k_name) {
pr_debug("kobject attempted to be registered with no name!\n");
WARN_ON(1);
return -EINVAL;
}
is useless the way it is right now, because it can never be true. I
think the
code was intended to be:
if (!kobj->k_name)
kobj->k_name = kobj->name;
if (!*kobj->k_name) {
pr_debug("kobject attempted to be registered with no name!\n");
WARN_ON(1);
return -EINVAL;
}
because this would make sure the kobj->name buffer has something in it.
So the missing '*' is just a typo. Although, I would much prefer
expression like:
if (*kobj->k_name == '\0') {
pr_debug("kobject attempted to be registered with no name!\n");
WARN_ON(1);
return -EINVAL;
}because this would've made the intention clear, in this patch I just restore the missing '*' without changing the coding style of the function.
--- lib/kobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
lib/kobject.c +1 -1
@@ -171,7 +171,7 @@ int kobject_shadow_add(struct kobject * kobj, struct dentry *shadow_parent)return -ENOENT ;if (!kobj->k_name) kobj->k_name = kobj->name; -if (!kobj->k_name) { +if (!*kobj->k_name) {pr_debug ("kobject attempted to be registered with no name!\n" );WARN_ON (1 );return -EINVAL ;
Signature · 1 line
1.5.0
PATCH 5/10 Driver: remove redundant kobject_unregister checks
From: Mariusz Kozlowski <[email protected]>
Here is a patch that removes all redundant kobject_unregister argument checks.
--- drivers/base/class.c | 3 +-- fs/partitions/check.c | 9 +++------ kernel/module.c | 7 ++----- 3 files changed, 6 insertions(+), 13 deletions(-)
drivers/base/class.c +1 -2
@@ -163,8 +163,7 @@ int class_register(struct class * cls)void class_unregister (struct class * cls) {pr_debug ("device class '%s': unregistering\n" , cls->name); -if (cls->virtual_dir) -kobject_unregister (cls->virtual_dir); +kobject_unregister (cls->virtual_dir);remove_class_attrs (cls);subsystem_unregister (&cls->subsys); }
fs/partitions/check.c +3 -6
@@ -358,8 +358,7 @@ void delete_partition(struct gendisk *disk, int part) p->ios[0 ] = p->ios[1 ] =0 ; p->sectors[0 ] = p->sectors[1 ] =0 ;sysfs_remove_link (&p->kobj,"subsystem" ); -if (p->holder_dir) -kobject_unregister (p->holder_dir); +kobject_unregister (p->holder_dir);kobject_uevent (&p->kobj,KOBJ_REMOVE );kobject_del (&p->kobj);kobject_put (&p->kobj);
@@ -603,10 +602,8 @@ void del_gendisk(struct gendisk *disk) disk->stamp =0 ;kobject_uevent (&disk->kobj,KOBJ_REMOVE ); -if (disk->holder_dir) -kobject_unregister (disk->holder_dir); -if (disk->slave_dir) -kobject_unregister (disk->slave_dir); +kobject_unregister (disk->holder_dir); +kobject_unregister (disk->slave_dir);if (disk->driverfs_dev) {char *disk_name =make_block_name (disk);sysfs_remove_link (&disk->kobj,"device" );
kernel/module.c +2 -5
@@ -1180,11 +1180,8 @@ static void mod_kobject_remove(struct module *mod) {module_remove_modinfo_attrs (mod);module_param_sysfs_remove (mod); -if (mod->mkobj.drivers_dir) -kobject_unregister (mod->mkobj.drivers_dir); -if (mod->holders_dir) -kobject_unregister (mod->holders_dir); - +kobject_unregister (mod->mkobj.drivers_dir); +kobject_unregister (mod->holders_dir);kobject_unregister (&mod->mkobj.kobj); }
Signature · 1 line
1.5.0
PATCH 6/10 debugfs: implement symbolic links
From: Peter Oberparleiter <[email protected]>
debugfs: implement symbolic links
Implement a new function debugfs_create_symlink() which can be used to create symbolic links in debugfs. This function can be useful for people moving functionality from /proc to debugfs (e.g. the gcov-kernel patch).
--- fs/debugfs/file.c | 12 +++++++ fs/debugfs/inode.c | 76 ++++++++++++++++++++++++++++++++++++++++++++-- include/linux/debugfs.h | 10 ++++++ 3 files changed, 94 insertions(+), 4 deletions(-)
fs/debugfs/file.c +12 -0
@@ -16,6 +16,7 @@#include <linux/module.h> #include <linux/fs.h> #include <linux/pagemap.h> +#include <linux/namei.h> #include <linux/debugfs.h> static ssize_t default_read_file(struct file *file, char __user *buf,
@@ -44,6 +45,17 @@ const struct file_operations debugfs_file_operations = { .open = default_open, }; +static void *debugfs_follow_link (struct dentry *dentry,struct nameidata *nd) +{ +nd_set_link (nd, dentry->d_inode->i_private); +return NULL ; +} + +const struct inode_operations debugfs_link_operations = { + .readlink = generic_readlink, + .follow_link = debugfs_follow_link, +}; +static void debugfs_u8_set (void *data,u64 val) { *(u8 *)data = val;
fs/debugfs/inode.c +72 -4
126 lines not on this page · raw message
include/linux/debugfs.h +10 -0
@@ -33,6 +33,9 @@ struct dentry *debugfs_create_file(const char *name, mode_t mode,struct dentry *debugfs_create_dir (const char *name,struct dentry *parent); +struct dentry *debugfs_create_symlink (const char *name,struct dentry *parent, +const char *dest); +void debugfs_remove (struct dentry *dentry); struct dentry *debugfs_create_u8(const char *name, mode_t mode,
@@ -70,6 +73,13 @@ static inline struct dentry *debugfs_create_dir(const char *name,return ERR_PTR (-ENODEV ); } +static inline struct dentry *debugfs_create_symlink (const char *name, +struct dentry *parent, +const char *dest) +{ +return ERR_PTR (-ENODEV ); +} +static inline void debugfs_remove (struct dentry *dentry) { }
Signature · 1 line
1.5.0
PATCH 7/10 debugfs: Remove misleading comments.
From: Cornelia Huck <[email protected]>
Just mention which error will be returned if debugfs is disabled. Callers should be able to figure out themselves what they need to check.
--- fs/debugfs/inode.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-)
fs/debugfs/inode.c +3 -9
@@ -212,9 +212,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode,* you are responsible here.) If an error occurs, %NULL will be returned. * * If debugfs is not enabled in the kernel, the value -%ENODEV will be -* returned. It is not wise to check for this value, but rather, check for -* %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling -* code. +* returned. */ struct dentry *debugfs_create_file(const char *name, mode_t mode, struct dentry *parent, void *data,
@@ -264,9 +262,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);* you are responsible here.) If an error occurs, %NULL will be returned. * * If debugfs is not enabled in the kernel, the value -%ENODEV will be -* returned. It is not wise to check for this value, but rather, check for -* %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling -* code. +* returned. */ struct dentry *debugfs_create_dir (const char *name,struct dentry *parent) {
@@ -297,9 +293,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir);* returned. * * If debugfs is not enabled in the kernel, the value -%ENODEV will be -* returned. It is not wise to check for this value, but rather, check for -* %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling -* code. +* returned. */ struct dentry *debugfs_create_symlink (const char *name,struct dentry *parent,const char *target)
Signature · 1 line
1.5.0
PATCH 8/10 Driver core: device_add_attrs() cleanup
From: Andrew Morton <[email protected]>
Clean up the coding in device_add_attrs() a bit.
--- drivers/base/bus.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-)
drivers/base/bus.c +10 -12
@@ -324,27 +324,25 @@ int bus_for_each_drv(struct bus_type * bus, struct device_driver * start,return error; } -static int device_add_attrs (struct bus_type * bus,struct device * dev) +static int device_add_attrs (struct bus_type *bus,struct device *dev) {int error =0 ;int i; -if (bus->dev_attrs) { -for (i =0 ;attr_name (bus->dev_attrs[i]); i++) { - error =device_create_file (dev,&bus->dev_attrs[i]); -if (error) - goto Err; +if (!bus->dev_attrs) +return 0 ; + +for (i =0 ;attr_name (bus->dev_attrs[i]); i++) { + error =device_create_file (dev,&bus->dev_attrs[i]); +if (error) { +while (--i >=0 ) +device_remove_file (dev, &bus->dev_attrs[i]); +break ; } } - Done:return error; - Err: -while (--i >=0 ) -device_remove_file (dev,&bus->dev_attrs[i]); - goto Done; } -static void device_remove_attrs (struct bus_type * bus,struct device * dev) {int i;
Signature · 1 line
1.5.0
PATCH 9/10 pcmcia: some class_device fallout
From: Alexey Dobriyan <[email protected]>
As found on some arm defconfigs.
I only looked at how original patch changes things and other patches fix compilation. ;-)
--- drivers/pcmcia/at91_cf.c | 2 +- drivers/pcmcia/soc_common.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/pcmcia/at91_cf.c +1 -1
@@ -277,7 +277,7 @@ static int __init at91_cf_probe(struct platform_device *pdev) board->det_pin, board->irq_pin); cf->socket.owner =THIS_MODULE ; - cf->socket.dev.dev = &pdev->dev; + cf->socket.dev.parent = &pdev->dev; cf->socket.ops = &at91_cf_ops; cf->socket.resource_ops = &pccard_static_ops; cf->socket.features =SS_CAP_PCCARD |SS_CAP_STATIC_MAP
drivers/pcmcia/soc_common.c +4 -4
@@ -478,7 +478,7 @@ dump_bits(char **p, const char *prefix, unsigned int val, struct bittbl *bits, i* * Returns: the number of characters added to the buffer */ -static ssize_t show_status (struct device *dev,char *buf) +static ssize_t show_status (struct device *dev,struct device_attribute *attr,char *buf) {struct soc_pcmcia_socket *skt = container_of(dev, struct soc_pcmcia_socket, socket.dev);
@@ -501,7 +501,7 @@ static ssize_t show_status(struct device *dev, char *buf)return p-buf; } -static CLASS_DEVICE_ATTR(status, S_IRUGO, show_status, NULL); +static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);static struct pccard_operations soc_common_pcmcia_operations = {
@@ -660,7 +660,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops skt->socket.ops = &soc_common_pcmcia_operations; skt->socket.owner = ops->owner; - skt->socket.dev.dev = dev; + skt->socket.dev.parent = dev;init_timer (&skt->poll_timer); skt->poll_timer.function = soc_common_pcmcia_poll_event;
@@ -747,7 +747,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *opsadd_timer (&skt->poll_timer); -device_create_file (&skt->socket.dev, &device_attr_status); +device_create_file (&skt->socket.dev, &dev_attr_status); }dev_set_drvdata (dev, sinfo);
Signature · 1 line
1.5.0
PATCH 10/10 sysfs: fix build errors: uevent with CONFIG_SYSFS=n
From: Randy Dunlap <[email protected]>
Fix source files to build with CONFIG_SYSFS=n.module_subsys is not available.
SYSFS=n, MODULES=y: T:y
SYSFS=n, MODULES=n: T:y
SYSFS=y, MODULES=y: T:y
SYSFS=y, MODULES=n: T:y
--- include/linux/module.h | 53 +++++++++++++++++++++++++++++++++++------- include/linux/moduleparam.h | 12 +++++++++ kernel/module.c | 14 ++++++++--- kernel/params.c | 28 ++++++++++++---------- 4 files changed, 81 insertions(+), 26 deletions(-)
include/linux/module.h +44 -9
@@ -76,8 +76,6 @@ void sort_extable(struct exception_table_entry *start, struct exception_table_entry *finish);void sort_main_extable (void ); -extern struct subsystem module_subsys; -#ifdef MODULE #define MODULE_GENERIC_TABLE (gtype,name) \ extern const struct gtype##_id __mod_##gtype##_table \
@@ -467,10 +465,6 @@ int unregister_module_notifier(struct notifier_block * nb);extern void print_modules (void ); -struct device_driver ; -void module_add_driver (struct module *,struct device_driver *); -void module_remove_driver (struct device_driver *); -#else /* !CONFIG_MODULES... */ #define EXPORT_SYMBOL (sym)#define EXPORT_SYMBOL_GPL (sym)
@@ -568,18 +562,59 @@ static inline void print_modules(void) { } +#endif /* CONFIG_MODULES */ +struct device_driver ; +#ifdef CONFIG_SYSFS struct module ; -static inline void module_add_driver (struct module *module,struct device_driver *driver) +extern struct subsystem module_subsys; + +int mod_sysfs_init (struct module *mod); +int mod_sysfs_setup (struct module *mod, +struct kernel_param *kparam, +unsigned int num_params); +int module_add_modinfo_attrs (struct module *mod); +void module_remove_modinfo_attrs (struct module *mod); + +#else /* !CONFIG_SYSFS */ + +static inline int mod_sysfs_init (struct module *mod) { +return 0 ; } -static inline void module_remove_driver (struct device_driver *driver) +static inline int mod_sysfs_setup (struct module *mod, +struct kernel_param *kparam, +unsigned int num_params) { +return 0 ; } -#endif /* CONFIG_MODULES */ +static inline int module_add_modinfo_attrs (struct module *mod) +{ +return 0 ; +} + +static inline void module_remove_modinfo_attrs (struct module *mod) +{ } + +#endif /* CONFIG_SYSFS */ + +#if defined(CONFIG_SYSFS ) && defined(CONFIG_MODULES ) + +void module_add_driver (struct module *mod,struct device_driver *drv); +void module_remove_driver (struct device_driver *drv); + +#else /* not both CONFIG_SYSFS && CONFIG_MODULES */ + +static inline void module_add_driver (struct module *mod,struct device_driver *drv) +{ } + +static inline void module_remove_driver (struct device_driver *drv) +{ } + +#endif #define symbol_request (x) try_then_request_module(symbol_get(x), "symbol:" #x)
include/linux/moduleparam.h +12 -0
@@ -169,10 +169,22 @@ extern int param_get_string(char *buffer, struct kernel_param *kp);struct module ; +#if defined(CONFIG_SYSFS ) && defined(CONFIG_MODULES )extern int module_param_sysfs_setup (struct module *mod,struct kernel_param *kparam,unsigned int num_params);extern void module_param_sysfs_remove (struct module *mod); +#else +static inline int module_param_sysfs_setup (struct module *mod, +struct kernel_param *kparam, +unsigned int num_params) +{ +return 0 ; +} + +static inline void module_param_sysfs_remove (struct module *mod) +{ } +#endif #endif /* _LINUX_MODULE_PARAMS_H */
kernel/module.c +10 -4
@@ -1074,7 +1074,8 @@ static inline void remove_sect_attrs(struct module *mod) }#endif /* CONFIG_KALLSYMS */ -static int module_add_modinfo_attrs (struct module *mod) +#ifdef CONFIG_SYSFS +int module_add_modinfo_attrs (struct module *mod) {struct module_attribute *attr;struct module_attribute *temp_attr;
@@ -1100,7 +1101,7 @@ static int module_add_modinfo_attrs(struct module *mod)return error; } -static void module_remove_modinfo_attrs (struct module *mod) +void module_remove_modinfo_attrs (struct module *mod) {struct module_attribute *attr;int i;
@@ -1115,8 +1116,10 @@ static void module_remove_modinfo_attrs(struct module *mod) }kfree (mod->modinfo_attrs); } +#endif -static int mod_sysfs_init (struct module *mod) +#ifdef CONFIG_SYSFS +int mod_sysfs_init (struct module *mod) {int err;
@@ -1139,7 +1142,7 @@ out:return err; } -static int mod_sysfs_setup (struct module *mod, +int mod_sysfs_setup (struct module *mod,struct kernel_param *kparam,unsigned int num_params) {
@@ -1175,6 +1178,7 @@ out_unreg: out: return err; } +#endif static void mod_kobject_remove (struct module *mod) {
@@ -2348,6 +2352,7 @@ void print_modules(void)printk ("\n" ); } +#ifdef CONFIG_SYSFS static char *make_driver_name (struct device_driver *drv) {char *driver_name;
@@ -2422,6 +2427,7 @@ void module_remove_driver(struct device_driver *drv) } }EXPORT_SYMBOL (module_remove_driver); +#endif #ifdef CONFIG_MODVERSIONS /* Generate the signature for struct module here, too, for modversions. */
kernel/params.c +15 -13
@@ -30,8 +30,6 @@ #define DEBUGP(fmt, a...)#endif -static struct kobj_type module_ktype; -static inline char dash2underscore (char c) {if (c =='-' )
@@ -391,6 +389,7 @@ struct module_param_attrsstruct param_attribute attrs[0 ]; }; +#ifdef CONFIG_SYSFS #define to_param_attr (n) container_of(n, struct param_attribute, mattr); static ssize_t param_attr_show(struct module_attribute *mattr,
@@ -426,6 +425,7 @@ static ssize_t param_attr_store(struct module_attribute *mattr,return len; return err; } +#endif #ifdef CONFIG_MODULES #define __modinit
@@ -433,6 +433,7 @@ static ssize_t param_attr_store(struct module_attribute *mattr,#define __modinit __init#endif +#ifdef CONFIG_SYSFS /* * param_sysfs_setup - setup sysfs support for one module or KBUILD_MODNAME * @mk: struct module_kobject (contains parent kobject)
@@ -500,9 +501,7 @@ param_sysfs_setup(struct module_kobject *mk,return mp; } -#ifdef CONFIG_MODULES -/* * module_param_sysfs_setup - setup sysfs support for one module * @mod: module
@@ -625,7 +624,6 @@ static void __init param_sysfs_builtin(void)/* module-related sysfs stuff */ -#ifdef CONFIG_SYSFS #define to_module_attr (n) container_of(n, struct module_attribute, attr);#define to_module_kobject (n) container_of(n, struct module_kobject, kobj);
@@ -673,6 +671,8 @@ static struct sysfs_ops module_sysfs_ops = { .store = module_attr_store, }; +static struct kobj_type module_ktype; +static int uevent_filter (struct kset *kset,struct kobject *kobj) {struct kobj_type *ktype =get_ktype (kobj);
@@ -686,19 +686,12 @@ static struct kset_uevent_ops module_uevent_ops = { .filter = uevent_filter, }; -#else -static struct sysfs_ops module_sysfs_ops = { - .show =NULL , - .store =NULL , -}; -#endif +decl_subsys (module, &module_ktype, &module_uevent_ops);static struct kobj_type module_ktype = { .sysfs_ops = &module_sysfs_ops, }; -decl_subsys (module, &module_ktype, &module_uevent_ops); -/* * param_sysfs_init - wrapper for built-in params support */
@@ -720,6 +713,15 @@ static int __init param_sysfs_init(void) }subsys_initcall (param_sysfs_init); +#else +#if 0 +static struct sysfs_ops module_sysfs_ops = { + .show =NULL , + .store =NULL , +}; +#endif +#endif +EXPORT_SYMBOL (param_set_byte);EXPORT_SYMBOL (param_get_byte);EXPORT_SYMBOL (param_set_short);
Signature · 1 line
1.5.0