7 files changed, 637 insertions, 121 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index c7ad7a5b3535..85cf7ea978aa 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -8,10 +8,10 @@ config BITREVERSE
         tristate
 
 config GENERIC_FIND_FIRST_BIT
-        def_bool n
+        bool
 
 config GENERIC_FIND_NEXT_BIT
-        def_bool n
+        bool
 
 config CRC_CCITT
         tristate "CRC-CCITT functions"
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index aa81d2848448..31d784dd80d0 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -807,6 +807,61 @@ menuconfig BUILD_DOCSRC
 
           Say N if you are unsure.
 
+config DYNAMIC_PRINTK_DEBUG
+        bool "Enable dynamic printk() call support"
+        default n
+        depends on PRINTK
+        select PRINTK_DEBUG
+        help
+
+          Compiles debug level messages into the kernel, which would not
+          otherwise be available at runtime. These messages can then be
+          enabled/disabled on a per module basis. This mechanism implicitly
+          enables all pr_debug() and dev_dbg() calls. The impact of this
+          compile option is a larger kernel text size of about 2%.
+
+          Usage:
+
+          Dynamic debugging is controlled by the debugfs file,
+          dynamic_printk/modules. This file contains a list of the modules that
+          can be enabled. The format of the file is the module name, followed
+          by a set of flags that can be enabled. The first flag is always the
+          'enabled' flag. For example:
+
+                <module_name> <enabled=0/1>
+                                .
+                                .
+                                .
+
+          <module_name> : Name of the module in which the debug call resides
+          <enabled=0/1> : whether the messages are enabled or not
+
+          From a live system:
+
+                snd_hda_intel enabled=0
+                fixup enabled=0
+                driver enabled=0
+
+          Enable a module:
+
+                $echo "set enabled=1 <module_name>" > dynamic_printk/modules
+
+          Disable a module:
+
+                $echo "set enabled=0 <module_name>" > dynamic_printk/modules
+
+          Enable all modules:
+
+                $echo "set enabled=1 all" > dynamic_printk/modules
+
+          Disable all modules:
+
+                $echo "set enabled=0 all" > dynamic_printk/modules
+
+          Finally, passing "dynamic_printk" at the command line enables
+          debugging for all modules. This mode can be turned off via the above
+          disable command.
+
 source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"
diff --git a/lib/Makefile b/lib/Makefile
index 44001af76a7d..16feaab057b2 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -81,6 +81,8 @@ obj-$(CONFIG_HAVE_LMB) += lmb.o
 
 obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o
 
+obj-$(CONFIG_DYNAMIC_PRINTK_DEBUG) += dynamic_printk.o
+
 hostprogs-y     := gen_crc32table
 clean-files     := crc32table.h
 
diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c
new file mode 100644
index 000000000000..d640f87bdc9e
--- /dev/null
+++ b/lib/dynamic_printk.c
@@ -0,0 +1,418 @@
+/*
+ * lib/dynamic_printk.c
+ *
+ * make pr_debug()/dev_dbg() calls runtime configurable based upon their
+ * their source module.
+ *
+ * Copyright (C) 2008 Red Hat, Inc., Jason Baron <jbaron@redhat.com>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/uaccess.h>
+#include <linux/seq_file.h>
+#include <linux/debugfs.h>
+#include <linux/fs.h>
+
+extern struct mod_debug __start___verbose[];
+extern struct mod_debug __stop___verbose[];
+
+struct debug_name {
+        struct hlist_node hlist;
+        struct hlist_node hlist2;
+        int hash1;
+        int hash2;
+        char *name;
+        int enable;
+        int type;
+};
+
+static int nr_entries;
+static int num_enabled;
+int dynamic_enabled = DYNAMIC_ENABLED_NONE;
+static struct hlist_head module_table[DEBUG_HASH_TABLE_SIZE] =
+        { [0 ... DEBUG_HASH_TABLE_SIZE-1] = HLIST_HEAD_INIT };
+static struct hlist_head module_table2[DEBUG_HASH_TABLE_SIZE] =
+        { [0 ... DEBUG_HASH_TABLE_SIZE-1] = HLIST_HEAD_INIT };
+static DECLARE_MUTEX(debug_list_mutex);
+
+/* dynamic_printk_enabled, and dynamic_printk_enabled2 are bitmasks in which
+ * bit n is set to 1 if any modname hashes into the bucket n, 0 otherwise. They
+ * use independent hash functions, to reduce the chance of false positives.
+ */
+long long dynamic_printk_enabled;
+EXPORT_SYMBOL_GPL(dynamic_printk_enabled);
+long long dynamic_printk_enabled2;
+EXPORT_SYMBOL_GPL(dynamic_printk_enabled2);
+
+/* returns the debug module pointer. */
+static struct debug_name *find_debug_module(char *module_name)
+{
+        int i;
+        struct hlist_head *head;
+        struct hlist_node *node;
+        struct debug_name *element;
+
+        element = NULL;
+        for (i = 0; i < DEBUG_HASH_TABLE_SIZE; i++) {
+                head = &module_table[i];
+                hlist_for_each_entry_rcu(element, node, head, hlist)
+                        if (!strcmp(element->name, module_name))
+                                return element;
+        }
+        return NULL;
+}
+
+/* returns the debug module pointer. */
+static struct debug_name *find_debug_module_hash(char *module_name, int hash)
+{
+        struct hlist_head *head;
+        struct hlist_node *node;
+        struct debug_name *element;
+
+        element = NULL;
+        head = &module_table[hash];
+        hlist_for_each_entry_rcu(element, node, head, hlist)
+                if (!strcmp(element->name, module_name))
+                        return element;
+        return NULL;
+}
+
+/* caller must hold mutex*/
+static int __add_debug_module(char *mod_name, int hash, int hash2)
+{
+        struct debug_name *new;
+        char *module_name;
+        int ret = 0;
+
+        if (find_debug_module(mod_name)) {
+                ret = -EINVAL;
+                goto out;
+        }
+        module_name = kmalloc(strlen(mod_name) + 1, GFP_KERNEL);
+        if (!module_name) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        module_name = strcpy(module_name, mod_name);
+        module_name[strlen(mod_name)] = '\0';
+        new = kzalloc(sizeof(struct debug_name), GFP_KERNEL);
+        if (!new) {
+                kfree(module_name);
+                ret = -ENOMEM;
+                goto out;
+        }
+        INIT_HLIST_NODE(&new->hlist);
+        INIT_HLIST_NODE(&new->hlist2);
+        new->name = module_name;
+        new->hash1 = hash;
+        new->hash2 = hash2;
+        hlist_add_head_rcu(&new->hlist, &module_table[hash]);
+        hlist_add_head_rcu(&new->hlist2, &module_table2[hash2]);
+        nr_entries++;
+out:
+        return ret;
+}
+
+int unregister_dynamic_debug_module(char *mod_name)
+{
+        struct debug_name *element;
+        int ret = 0;
+
+        down(&debug_list_mutex);
+        element = find_debug_module(mod_name);
+        if (!element) {
+                ret = -EINVAL;
+                goto out;
+        }
+        hlist_del_rcu(&element->hlist);
+        hlist_del_rcu(&element->hlist2);
+        synchronize_rcu();
+        kfree(element->name);
+        if (element->enable)
+                num_enabled--;
+        kfree(element);
+        nr_entries--;
+out:
+        up(&debug_list_mutex);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module);
+
+int register_dynamic_debug_module(char *mod_name, int type, char *share_name,
+                                        char *flags, int hash, int hash2)
+{
+        struct debug_name *elem;
+        int ret = 0;
+
+        down(&debug_list_mutex);
+        elem = find_debug_module(mod_name);
+        if (!elem) {
+                if (__add_debug_module(mod_name, hash, hash2))
+                        goto out;
+                elem = find_debug_module(mod_name);
+                if (dynamic_enabled == DYNAMIC_ENABLED_ALL &&
+                                !strcmp(mod_name, share_name)) {
+                        elem->enable = true;
+                        num_enabled++;
+                }
+        }
+        elem->type |= type;
+out:
+        up(&debug_list_mutex);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(register_dynamic_debug_module);
+
+int __dynamic_dbg_enabled_helper(char *mod_name, int type, int value, int hash)
+{
+        struct debug_name *elem;
+        int ret = 0;
+
+        if (dynamic_enabled == DYNAMIC_ENABLED_ALL)
+                return 1;
+        rcu_read_lock();
+        elem = find_debug_module_hash(mod_name, hash);
+        if (elem && elem->enable)
+                ret = 1;
+        rcu_read_unlock();
+        return ret;
+}
+EXPORT_SYMBOL_GPL(__dynamic_dbg_enabled_helper);
+
+static void set_all(bool enable)
+{
+        struct debug_name *e;
+        struct hlist_node *node;
+        int i;
+        long long enable_mask;
+
+        for (i = 0; i < DEBUG_HASH_TABLE_SIZE; i++) {
+                if (module_table[i].first != NULL) {
+                        hlist_for_each_entry(e, node, &module_table[i], hlist) {
+                                e->enable = enable;
+                        }
+                }
+        }
+        if (enable)
+                enable_mask = ULLONG_MAX;
+        else
+                enable_mask = 0;
+        dynamic_printk_enabled = enable_mask;
+        dynamic_printk_enabled2 = enable_mask;
+}
+
+static int disabled_hash(int i, bool first_table)
+{
+        struct debug_name *e;
+        struct hlist_node *node;
+
+        if (first_table) {
+                hlist_for_each_entry(e, node, &module_table[i], hlist) {
+                        if (e->enable)
+                                return 0;
+                }
+        } else {
+                hlist_for_each_entry(e, node, &module_table2[i], hlist2) {
+                        if (e->enable)
+                                return 0;
+                }
+        }
+        return 1;
+}
+
+static ssize_t pr_debug_write(struct file *file, const char __user *buf,
+                                size_t length, loff_t *ppos)
+{
+        char *buffer, *s, *value_str, *setting_str;
+        int err, value;
+        struct debug_name *elem = NULL;
+        int all = 0;
+
+        if (length > PAGE_SIZE || length < 0)
+                return -EINVAL;
+
+        buffer = (char *)__get_free_page(GFP_KERNEL);
+        if (!buffer)
+                return -ENOMEM;
+
+        err = -EFAULT;
+        if (copy_from_user(buffer, buf, length))
+                goto out;
+
+        err = -EINVAL;
+        if (length < PAGE_SIZE)
+                buffer[length] = '\0';
+        else if (buffer[PAGE_SIZE-1])
+                goto out;
+
+        err = -EINVAL;
+        down(&debug_list_mutex);
+
+        if (strncmp("set", buffer, 3))
+                goto out_up;
+        s = buffer + 3;
+        setting_str = strsep(&s, "=");
+        if (s == NULL)
+                goto out_up;
+        setting_str = strstrip(setting_str);
+        value_str = strsep(&s, " ");
+        if (s == NULL)
+                goto out_up;
+        s = strstrip(s);
+        if (!strncmp(s, "all", 3))
+                all = 1;
+        else
+                elem = find_debug_module(s);
+        if (!strncmp(setting_str, "enable", 6)) {
+                value = !!simple_strtol(value_str, NULL, 10);
+                if (all) {
+                        if (value) {
+                                set_all(true);
+                                num_enabled = nr_entries;
+                                dynamic_enabled = DYNAMIC_ENABLED_ALL;
+                        } else {
+                                set_all(false);
+                                num_enabled = 0;
+                                dynamic_enabled = DYNAMIC_ENABLED_NONE;
+                        }
+                        err = 0;
+                } else {
+                        if (elem) {
+                                if (value && (elem->enable == 0)) {
+                                        dynamic_printk_enabled |=
+                                                        (1LL << elem->hash1);
+                                        dynamic_printk_enabled2 |=
+                                                        (1LL << elem->hash2);
+                                        elem->enable = 1;
+                                        num_enabled++;
+                                        dynamic_enabled = DYNAMIC_ENABLED_SOME;
+                                        err = 0;
+                                        printk(KERN_DEBUG
+                                               "debugging enabled for module %s",
+                                               elem->name);
+                                } else if (!value && (elem->enable == 1)) {
+                                        elem->enable = 0;
+                                        num_enabled--;
+                                        if (disabled_hash(elem->hash1, true))
+                                                dynamic_printk_enabled &=
+                                                        ~(1LL << elem->hash1);
+                                        if (disabled_hash(elem->hash2, false))
+                                                dynamic_printk_enabled2 &=
+                                                        ~(1LL << elem->hash2);
+                                        if (num_enabled)
+                                                dynamic_enabled =
+                                                        DYNAMIC_ENABLED_SOME;
+                                        else
+                                                dynamic_enabled =
+                                                        DYNAMIC_ENABLED_NONE;
+                                        err = 0;
+                                        printk(KERN_DEBUG
+                                               "debugging disabled for module "
+                                               "%s", elem->name);
+                                }
+                        }
+                }
+        }
+        if (!err)
+                err = length;
+out_up:
+        up(&debug_list_mutex);
+out:
+        free_page((unsigned long)buffer);
+        return err;
+}
+
+static void *pr_debug_seq_start(struct seq_file *f, loff_t *pos)
+{
+        return (*pos < DEBUG_HASH_TABLE_SIZE) ? pos : NULL;
+}
+
+static void *pr_debug_seq_next(struct seq_file *s, void *v, loff_t *pos)
+{
+        (*pos)++;
+        if (*pos >= DEBUG_HASH_TABLE_SIZE)
+                return NULL;
+        return pos;
+}
+
+static void pr_debug_seq_stop(struct seq_file *s, void *v)
+{
+        /* Nothing to do */
+}
+
+static int pr_debug_seq_show(struct seq_file *s, void *v)
+{
+        struct hlist_head *head;
+        struct hlist_node *node;
+        struct debug_name *elem;
+        unsigned int i = *(loff_t *) v;
+
+        rcu_read_lock();
+        head = &module_table[i];
+        hlist_for_each_entry_rcu(elem, node, head, hlist) {
+                seq_printf(s, "%s enabled=%d", elem->name, elem->enable);
+                seq_printf(s, "\n");
+        }
+        rcu_read_unlock();
+        return 0;
+}
+
+static struct seq_operations pr_debug_seq_ops = {
+        .start = pr_debug_seq_start,
+        .next  = pr_debug_seq_next,
+        .stop  = pr_debug_seq_stop,
+        .show  = pr_debug_seq_show
+};
+
+static int pr_debug_open(struct inode *inode, struct file *filp)
+{
+        return seq_open(filp, &pr_debug_seq_ops);
+}
+
+static const struct file_operations pr_debug_operations = {
+        .open           = pr_debug_open,
+        .read           = seq_read,
+        .write          = pr_debug_write,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
+static int __init dynamic_printk_init(void)
+{
+        struct dentry *dir, *file;
+        struct mod_debug *iter;
+        unsigned long value;
+
+        dir = debugfs_create_dir("dynamic_printk", NULL);
+        if (!dir)
+                return -ENOMEM;
+        file = debugfs_create_file("modules", 0644, dir, NULL,
+                                        &pr_debug_operations);
+        if (!file) {
+                debugfs_remove(dir);
+                return -ENOMEM;
+        }
+        for (value = (unsigned long)__start___verbose;
+                value < (unsigned long)__stop___verbose;
+                value += sizeof(struct mod_debug)) {
+                        iter = (struct mod_debug *)value;
+                        register_dynamic_debug_module(iter->modname,
+                                iter->type,
+                                iter->logical_modname,
+                                iter->flag_names, iter->hash, iter->hash2);
+        }
+        return 0;
+}
+module_init(dynamic_printk_init);
+/* may want to move this earlier so we can get traces as early as possible */
+
+static int __init dynamic_printk_setup(char *str)
+{
+        if (str)
+                return -ENOENT;
+        set_all(true);
+        return 0;
+}
+/* Use early_param(), so we can get debug output as early as possible */
+early_param("dynamic_printk", dynamic_printk_setup);
diff --git a/lib/iommu-helper.c b/lib/iommu-helper.c
index 5d90074dca75..75dbda03f4fb 100644
--- a/lib/iommu-helper.c
+++ b/lib/iommu-helper.c
@@ -79,3 +79,12 @@ void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr)
         }
 }
 EXPORT_SYMBOL(iommu_area_free);
+
+unsigned long iommu_num_pages(unsigned long addr, unsigned long len,
+                              unsigned long io_page_size)
+{
+        unsigned long size = (addr & (io_page_size - 1)) + len;
+
+        return DIV_ROUND_UP(size, io_page_size);
+}
+EXPORT_SYMBOL(iommu_num_pages);
diff --git a/lib/kobject.c b/lib/kobject.c
index fbf0ae282376..0487d1f64806 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -387,11 +387,17 @@ EXPORT_SYMBOL_GPL(kobject_init_and_add);
  * kobject_rename - change the name of an object
  * @kobj: object in question.
  * @new_name: object's new name
+ *
+ * It is the responsibility of the caller to provide mutual
+ * exclusion between two different calls of kobject_rename
+ * on the same kobject and to ensure that new_name is valid and
+ * won't conflict with other kobjects.
  */
 int kobject_rename(struct kobject *kobj, const char *new_name)
 {
         int error = 0;
         const char *devpath = NULL;
+        const char *dup_name = NULL, *name;
         char *devpath_string = NULL;
         char *envp[2];
 
@@ -401,19 +407,6 @@ int kobject_rename(struct kobject *kobj, const char *new_name)
         if (!kobj->parent)
                 return -EINVAL;
 
-        /* see if this name is already in use */
-        if (kobj->kset) {
-                struct kobject *temp_kobj;
-                temp_kobj = kset_find_obj(kobj->kset, new_name);
-                if (temp_kobj) {
-                        printk(KERN_WARNING "kobject '%s' cannot be renamed "
-                               "to '%s' as '%s' is already in existence.\n",
-                               kobject_name(kobj), new_name, new_name);
-                        kobject_put(temp_kobj);
-                        return -EINVAL;
-                }
-        }
-
         devpath = kobject_get_path(kobj, GFP_KERNEL);
         if (!devpath) {
                 error = -ENOMEM;
@@ -428,15 +421,27 @@ int kobject_rename(struct kobject *kobj, const char *new_name)
         envp[0] = devpath_string;
         envp[1] = NULL;
 
+        name = dup_name = kstrdup(new_name, GFP_KERNEL);
+        if (!name) {
+                error = -ENOMEM;
+                goto out;
+        }
+
         error = sysfs_rename_dir(kobj, new_name);
+        if (error)
+                goto out;
+
+        /* Install the new kobject name */
+        dup_name = kobj->name;
+        kobj->name = name;
 
         /* This function is mostly/only used for network interface.
          * Some hotplug package track interfaces by their name and
          * therefore want to know when the name is changed by the user. */
-        if (!error)
-                kobject_uevent_env(kobj, KOBJ_MOVE, envp);
+        kobject_uevent_env(kobj, KOBJ_MOVE, envp);
 
 out:
+        kfree(dup_name);
         kfree(devpath_string);
         kfree(devpath);
         kobject_put(kobj);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index c399bc1093cb..cceecb6a963d 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -32,40 +32,48 @@
 /* Works only for digits and letters, but small and fast */
 #define TOLOWER(x) ((x) | 0x20)
 
+static unsigned int simple_guess_base(const char *cp)
+{
+        if (cp[0] == '0') {
+                if (TOLOWER(cp[1]) == 'x' && isxdigit(cp[2]))
+                        return 16;
+                else
+                        return 8;
+        } else {
+                return 10;
+        }
+}
+
 /**
  * simple_strtoul - convert a string to an unsigned long
  * @cp: The start of the string
  * @endp: A pointer to the end of the parsed string will be placed here
  * @base: The number base to use
  */
-unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base)
+unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
 {
-        unsigned long result = 0,value;
+        unsigned long result = 0;
 
-        if (!base) {
-                base = 10;
-                if (*cp == '0') {
-                        base = 8;
-                        cp++;
-                        if ((TOLOWER(*cp) == 'x') && isxdigit(cp[1])) {
-                                cp++;
-                                base = 16;
-                        }
-                }
-        } else if (base == 16) {
-                if (cp[0] == '0' && TOLOWER(cp[1]) == 'x')
-                        cp += 2;
-        }
-        while (isxdigit(*cp) &&
-               (value = isdigit(*cp) ? *cp-'0' : TOLOWER(*cp)-'a'+10) < base) {
-                result = result*base + value;
+        if (!base)
+                base = simple_guess_base(cp);
+
+        if (base == 16 && cp[0] == '0' && TOLOWER(cp[1]) == 'x')
+                cp += 2;
+
+        while (isxdigit(*cp)) {
+                unsigned int value;
+
+                value = isdigit(*cp) ? *cp - '0' : TOLOWER(*cp) - 'a' + 10;
+                if (value >= base)
+                        break;
+                result = result * base + value;
                 cp++;
         }
+
         if (endp)
                 *endp = (char *)cp;
         return result;
 }
-
 EXPORT_SYMBOL(simple_strtoul);
 
 /**
@@ -74,13 +82,12 @@ EXPORT_SYMBOL(simple_strtoul);
  * @endp: A pointer to the end of the parsed string will be placed here
  * @base: The number base to use
  */
-long simple_strtol(const char *cp,char **endp,unsigned int base)
+long simple_strtol(const char *cp, char **endp, unsigned int base)
 {
-        if(*cp=='-')
-                return -simple_strtoul(cp+1,endp,base);
-        return simple_strtoul(cp,endp,base);
+        if(*cp == '-')
+                return -simple_strtoul(cp + 1, endp, base);
+        return simple_strtoul(cp, endp, base);
 }
-
 EXPORT_SYMBOL(simple_strtol);
 
 /**
@@ -89,34 +96,30 @@ EXPORT_SYMBOL(simple_strtol);
  * @endp: A pointer to the end of the parsed string will be placed here
  * @base: The number base to use
  */
-unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base)
+unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
 {
-        unsigned long long result = 0,value;
+        unsigned long long result = 0;
 
-        if (!base) {
-                base = 10;
-                if (*cp == '0') {
-                        base = 8;
-                        cp++;
-                        if ((TOLOWER(*cp) == 'x') && isxdigit(cp[1])) {
-                                cp++;
-                                base = 16;
-                        }
-                }
-        } else if (base == 16) {
-                if (cp[0] == '0' && TOLOWER(cp[1]) == 'x')
-                        cp += 2;
-        }
-        while (isxdigit(*cp)
-         && (value = isdigit(*cp) ? *cp-'0' : TOLOWER(*cp)-'a'+10) < base) {
-                result = result*base + value;
+        if (!base)
+                base = simple_guess_base(cp);
+
+        if (base == 16 && cp[0] == '0' && TOLOWER(cp[1]) == 'x')
+                cp += 2;
+
+        while (isxdigit(*cp)) {
+                unsigned int value;
+
+                value = isdigit(*cp) ? *cp - '0' : TOLOWER(*cp) - 'a' + 10;
+                if (value >= base)
+                        break;
+                result = result * base + value;
                 cp++;
         }
+
         if (endp)
                 *endp = (char *)cp;
         return result;
 }
-
 EXPORT_SYMBOL(simple_strtoull);
 
 /**
@@ -125,14 +128,13 @@ EXPORT_SYMBOL(simple_strtoull);
  * @endp: A pointer to the end of the parsed string will be placed here
  * @base: The number base to use
  */
-long long simple_strtoll(const char *cp,char **endp,unsigned int base)
+long long simple_strtoll(const char *cp, char **endp, unsigned int base)
 {
         if(*cp=='-')
-                return -simple_strtoull(cp+1,endp,base);
-        return simple_strtoull(cp,endp,base);
+                return -simple_strtoull(cp + 1, endp, base);
+        return simple_strtoull(cp, endp, base);
 }
 
-
 /**
  * strict_strtoul - convert a string to an unsigned long strictly
  * @cp: The string to be converted
@@ -155,7 +157,27 @@ long long simple_strtoll(const char *cp,char **endp,unsigned int base)
  * simple_strtoul just ignores the successive invalid characters and
  * return the converted value of prefix part of the string.
  */
-int strict_strtoul(const char *cp, unsigned int base, unsigned long *res);
+int strict_strtoul(const char *cp, unsigned int base, unsigned long *res)
+{
+        char *tail;
+        unsigned long val;
+        size_t len;
+
+        *res = 0;
+        len = strlen(cp);
+        if (len == 0)
+                return -EINVAL;
+
+        val = simple_strtoul(cp, &tail, base);
+        if ((*tail == '\0') ||
+                ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
+                *res = val;
+                return 0;
+        }
+
+        return -EINVAL;
+}
+EXPORT_SYMBOL(strict_strtoul);
 
 /**
  * strict_strtol - convert a string to a long strictly
@@ -169,7 +191,20 @@ int strict_strtoul(const char *cp, unsigned int base, unsigned long *res);
  * It returns 0 if conversion is successful and *res is set to the converted
  * value, otherwise it returns -EINVAL and *res is set to 0.
  */
-int strict_strtol(const char *cp, unsigned int base, long *res);
+int strict_strtol(const char *cp, unsigned int base, long *res)
+{
+        int ret;
+        if (*cp == '-') {
+                ret = strict_strtoul(cp + 1, base, (unsigned long *)res);
+                if (!ret)
+                        *res = -(*res);
+        } else {
+                ret = strict_strtoul(cp, base, (unsigned long *)res);
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL(strict_strtol);
 
 /**
  * strict_strtoull - convert a string to an unsigned long long strictly
@@ -193,7 +228,27 @@ int strict_strtol(const char *cp, unsigned int base, long *res);
  * simple_strtoull just ignores the successive invalid characters and
  * return the converted value of prefix part of the string.
  */
-int strict_strtoull(const char *cp, unsigned int base, unsigned long long *res);
+int strict_strtoull(const char *cp, unsigned int base, unsigned long long *res)
+{
+        char *tail;
+        unsigned long long val;
+        size_t len;
+
+        *res = 0;
+        len = strlen(cp);
+        if (len == 0)
+                return -EINVAL;
+
+        val = simple_strtoull(cp, &tail, base);
+        if ((*tail == '\0') ||
+                ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
+                *res = val;
+                return 0;
+        }
+
+        return -EINVAL;
+}
+EXPORT_SYMBOL(strict_strtoull);
 
 /**
  * strict_strtoll - convert a string to a long long strictly
@@ -207,53 +262,20 @@ int strict_strtoull(const char *cp, unsigned int base, unsigned long long *res);
  * It returns 0 if conversion is successful and *res is set to the converted
  * value, otherwise it returns -EINVAL and *res is set to 0.
  */
-int strict_strtoll(const char *cp, unsigned int base, long long *res);
-
-#define define_strict_strtoux(type, valtype)                            \
-int strict_strtou##type(const char *cp, unsigned int base, valtype *res)\
-{                                                                       \
-        char *tail;                                                     \
-        valtype val;                                                    \
-        size_t len;                                                     \
-                                                                        \
-        *res = 0;                                                       \
-        len = strlen(cp);                                               \
-        if (len == 0)                                                   \
-                return -EINVAL;                                         \
-                                                                        \
-        val = simple_strtou##type(cp, &tail, base);                     \
-        if ((*tail == '\0') ||                                          \
-                ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {\
-                *res = val;                                             \
-                return 0;                                               \
-        }                                                               \
-                                                                        \
-        return -EINVAL;                                                 \
-}                                                                       \
-
-#define define_strict_strtox(type, valtype)                             \
-int strict_strto##type(const char *cp, unsigned int base, valtype *res) \
-{                                                                       \
-        int ret;                                                        \
-        if (*cp == '-') {                                               \
-                ret = strict_strtou##type(cp+1, base, res);             \
-                if (!ret)                                               \
-                        *res = -(*res);                                 \
-        } else                                                          \
-                ret = strict_strtou##type(cp, base, res);               \
-                                                                        \
-        return ret;                                                     \
-}                                                                       \
-
-define_strict_strtoux(l, unsigned long)
-define_strict_strtox(l, long)
-define_strict_strtoux(ll, unsigned long long)
-define_strict_strtox(ll, long long)
+int strict_strtoll(const char *cp, unsigned int base, long long *res)
+{
+        int ret;
+        if (*cp == '-') {
+                ret = strict_strtoull(cp + 1, base, (unsigned long long *)res);
+                if (!ret)
+                        *res = -(*res);
+        } else {
+                ret = strict_strtoull(cp, base, (unsigned long long *)res);
+        }
 
-EXPORT_SYMBOL(strict_strtoul);
-EXPORT_SYMBOL(strict_strtol);
+        return ret;
+}
 EXPORT_SYMBOL(strict_strtoll);
-EXPORT_SYMBOL(strict_strtoull);
 
 static int skip_atoi(const char **s)
 {
@@ -565,6 +587,10 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field
  * @fmt: The format string to use
  * @args: Arguments for the format string
  *
+ * This function follows C99 vsnprintf, but has some extensions:
+ * %pS output the name of a text symbol
+ * %pF output the name of a function pointer
+ *
  * The return value is the number of characters which would
  * be generated for the given input, excluding the trailing
  * '\0', as per ISO C99. If you want to have the exact
@@ -790,7 +816,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
         /* the trailing null byte doesn't count towards the total */
         return str-buf;
 }
-
 EXPORT_SYMBOL(vsnprintf);
 
 /**
@@ -806,6 +831,8 @@ EXPORT_SYMBOL(vsnprintf);
  *
  * Call this function if you are already dealing with a va_list.
  * You probably want scnprintf() instead.
+ *
+ * See the vsnprintf() documentation for format string extensions over C99.
  */
 int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
 {
@@ -814,7 +841,6 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
         i=vsnprintf(buf,size,fmt,args);
         return (i >= size) ? (size - 1) : i;
 }
-
 EXPORT_SYMBOL(vscnprintf);
 
 /**
@@ -828,6 +854,8 @@ EXPORT_SYMBOL(vscnprintf);
  * generated for the given input, excluding the trailing null,
  * as per ISO C99.  If the return is greater than or equal to
  * @size, the resulting string is truncated.
+ *
+ * See the vsnprintf() documentation for format string extensions over C99.
  */
 int snprintf(char * buf, size_t size, const char *fmt, ...)
 {
@@ -839,7 +867,6 @@ int snprintf(char * buf, size_t size, const char *fmt, ...)
         va_end(args);
         return i;
 }
-
 EXPORT_SYMBOL(snprintf);
 
 /**
@@ -877,12 +904,13 @@ EXPORT_SYMBOL(scnprintf);
  *
  * Call this function if you are already dealing with a va_list.
  * You probably want sprintf() instead.
+ *
+ * See the vsnprintf() documentation for format string extensions over C99.
  */
 int vsprintf(char *buf, const char *fmt, va_list args)
 {
         return vsnprintf(buf, INT_MAX, fmt, args);
 }
-
 EXPORT_SYMBOL(vsprintf);
 
 /**
@@ -894,6 +922,8 @@ EXPORT_SYMBOL(vsprintf);
  * The function returns the number of characters written
  * into @buf. Use snprintf() or scnprintf() in order to avoid
  * buffer overflows.
+ *
+ * See the vsnprintf() documentation for format string extensions over C99.
  */
 int sprintf(char * buf, const char *fmt, ...)
 {
@@ -905,7 +935,6 @@ int sprintf(char * buf, const char *fmt, ...)
         va_end(args);
         return i;
 }
-
 EXPORT_SYMBOL(sprintf);
 
 /**
@@ -1134,7 +1163,6 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
 
         return num;
 }
-
 EXPORT_SYMBOL(vsscanf);
 
 /**
@@ -1153,5 +1181,4 @@ int sscanf(const char * buf, const char * fmt, ...)
         va_end(args);
         return i;
 }
-
 EXPORT_SYMBOL(sscanf);