22 files changed, 34 insertions, 38 deletions

diff --git a/arch/arm/kernel/atags.c b/arch/arm/kernel/atags.c
index e2e934c3808..64c420805e6 100644
--- a/arch/arm/kernel/atags.c
+++ b/arch/arm/kernel/atags.c
@@ -35,7 +35,7 @@ create_proc_entries(void)
 {
         struct proc_dir_entry* tags_entry;
 
-        tags_entry = create_proc_read_entry("atags", 0400, &proc_root, read_buffer, &tags_buffer);
+        tags_entry = create_proc_read_entry("atags", 0400, NULL, read_buffer, &tags_buffer);
         if (!tags_entry)
                 return -ENOMEM;
 
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c
index 5b2799eb96a..092d4b3d8f7 100644
--- a/arch/m68k/mac/iop.c
+++ b/arch/m68k/mac/iop.c
@@ -302,7 +302,7 @@ void __init iop_init(void)
 
 #if 0   /* Crashing in 2.4 now, not yet sure why.   --jmt */
 #ifdef CONFIG_PROC_FS
-        create_proc_info_entry("mac_iop", 0, &proc_root, iop_get_proc_info);
+        create_proc_info_entry("mac_iop", 0, NULL, iop_get_proc_info);
 #endif
 #endif
 }
diff --git a/arch/mips/basler/excite/excite_procfs.c b/arch/mips/basler/excite/excite_procfs.c
index 9ee67a95f6b..6c08b386fda 100644
--- a/arch/mips/basler/excite/excite_procfs.c
+++ b/arch/mips/basler/excite/excite_procfs.c
@@ -65,7 +65,7 @@ excite_bootrom_read(char *page, char **start, off_t off, int count,
 void excite_procfs_init(void)
 {
         /* Create & populate /proc/excite */
-        struct proc_dir_entry * const pdir = proc_mkdir("excite", &proc_root);
+        struct proc_dir_entry * const pdir = proc_mkdir("excite", NULL);
         if (pdir) {
                 struct proc_dir_entry * e;
 
diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c
index 984f80e668c..6540d2c9fbb 100644
--- a/arch/um/kernel/exitcode.c
+++ b/arch/um/kernel/exitcode.c
@@ -59,7 +59,7 @@ static int make_proc_exitcode(void)
 {
         struct proc_dir_entry *ent;
 
-        ent = create_proc_entry("exitcode", 0600, &proc_root);
+        ent = create_proc_entry("exitcode", 0600, NULL);
         if (ent == NULL) {
                 printk(KERN_WARNING "make_proc_exitcode : Failed to register "
                        "/proc/exitcode\n");
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index e8cb9ff183e..83603cfbde8 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -364,7 +364,7 @@ int __init make_proc_sysemu(void)
         if (!sysemu_supported)
                 return 0;
 
-        ent = create_proc_entry("sysemu", 0600, &proc_root);
+        ent = create_proc_entry("sysemu", 0600, NULL);
 
         if (ent == NULL)
         {
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index 1960f1985e5..84c480bb371 100644
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -424,7 +424,7 @@ static int __init mtrr_if_init(void)
                 return -ENODEV;
 
         proc_root_mtrr =
-                proc_create("mtrr", S_IWUSR | S_IRUGO, &proc_root, &mtrr_fops);
+                proc_create("mtrr", S_IWUSR | S_IRUGO, NULL, &mtrr_fops);
 
         if (proc_root_mtrr)
                 proc_root_mtrr->owner = THIS_MODULE;
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index b1d6cad8428..a784f5e22ee 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -423,7 +423,7 @@ cleanup_module(void)
         }
         put_tty_driver(ip2_tty_driver);
         unregister_chrdev(IP2_IPL_MAJOR, pcIpl);
-        remove_proc_entry("ip2mem", &proc_root);
+        remove_proc_entry("ip2mem", NULL);
 
         // free memory
         for (i = 0; i < IP2_MAX_BOARDS; i++) {
@@ -695,7 +695,7 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
                 }
         }
         /* Register the read_procmem thing */
-        if (!create_proc_info_entry("ip2mem",0,&proc_root,ip2_read_procmem)) {
+        if (!create_proc_info_entry("ip2mem",0,NULL,ip2_read_procmem)) {
                 printk(KERN_ERR "IP2: failed to register read_procmem\n");
         } else {
 
diff --git a/drivers/mca/mca-proc.c b/drivers/mca/mca-proc.c
index 33d5e0820cc..81ea0d377bf 100644
--- a/drivers/mca/mca-proc.c
+++ b/drivers/mca/mca-proc.c
@@ -183,7 +183,7 @@ void __init mca_do_proc_init(void)
         struct proc_dir_entry* node = NULL;
         struct mca_device *mca_dev;
 
-        proc_mca = proc_mkdir("mca", &proc_root);
+        proc_mca = proc_mkdir("mca", NULL);
         create_proc_read_entry("pos",0,proc_mca,get_mca_info,NULL);
         create_proc_read_entry("machine",0,proc_mca,get_mca_machine_info,NULL);
 
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
index 302e92418bb..154155c9b63 100644
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c
@@ -210,7 +210,7 @@ static int hdpu_cpustate_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        proc_de = create_proc_entry("sky_cpustate", 0666, &proc_root);
+        proc_de = create_proc_entry("sky_cpustate", 0666, NULL);
         if (!proc_de) {
                 printk(KERN_WARNING "sky_cpustate: "
                        "Unable to create proc entry\n");
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 2fa36f7a6eb..e92b7efccc7 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -102,8 +102,8 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
                 printk(KERN_ERR "sky_nexus: Could not map slot id\n");
         }
 
-        hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, &proc_root);
-        if (!hdpu_slot_id) {
+        hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, NULL);
+        if (!hdpu_slot_id)
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_slot_id\n");
         } else {
@@ -111,8 +111,8 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
                 hdpu_slot_id->owner = THIS_MODULE;
         }
 
-        hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, &proc_root);
-        if (!hdpu_chassis_id) {
+        hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, NULL);
+        if (!hdpu_chassis_id)
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_chassis_id\n");
         } else {
@@ -128,8 +128,8 @@ static int hdpu_nexus_remove(struct platform_device *pdev)
         slot_id = -1;
         chassis_id = -1;
 
-        remove_proc_entry("sky_slot_id", &proc_root);
-        remove_proc_entry("sky_chassis_id", &proc_root);
+        remove_proc_entry("sky_slot_id", NULL);
+        remove_proc_entry("sky_chassis_id", NULL);
 
         hdpu_slot_id = 0;
         hdpu_chassis_id = 0;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 556063e8f7a..8ae9406b10a 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -311,7 +311,7 @@ out_error:
 int
 dasd_proc_init(void)
 {
-        dasd_proc_root_entry = proc_mkdir("dasd", &proc_root);
+        dasd_proc_root_entry = proc_mkdir("dasd", NULL);
         if (!dasd_proc_root_entry)
                 goto out_nodasd;
         dasd_proc_root_entry->owner = THIS_MODULE;
@@ -335,7 +335,7 @@ dasd_proc_init(void)
  out_nostatistics:
         remove_proc_entry("devices", dasd_proc_root_entry);
  out_nodevices:
-        remove_proc_entry("dasd", &proc_root);
+        remove_proc_entry("dasd", NULL);
  out_nodasd:
         return -ENOENT;
 }
@@ -345,5 +345,5 @@ dasd_proc_exit(void)
 {
         remove_proc_entry("devices", dasd_proc_root_entry);
         remove_proc_entry("statistics", dasd_proc_root_entry);
-        remove_proc_entry("dasd", &proc_root);
+        remove_proc_entry("dasd", NULL);
 }
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c
index c9b96d51b28..0c39636b217 100644
--- a/drivers/s390/char/tape_proc.c
+++ b/drivers/s390/char/tape_proc.c
@@ -125,7 +125,7 @@ tape_proc_init(void)
 {
         tape_proc_devices =
                 create_proc_entry ("tapedevices", S_IFREG | S_IRUGO | S_IWUSR,
-                                   &proc_root);
+                                   NULL);
         if (tape_proc_devices == NULL) {
                 PRINT_WARN("tape: Cannot register procfs entry tapedevices\n");
                 return;
@@ -141,5 +141,5 @@ void
 tape_proc_cleanup(void)
 {
         if (tape_proc_devices != NULL)
-                remove_proc_entry ("tapedevices", &proc_root);
+                remove_proc_entry ("tapedevices", NULL);
 }
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index e8597ec9224..ef33d5df222 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -375,7 +375,7 @@ cio_ignore_proc_init (void)
         struct proc_dir_entry *entry;
 
         entry = create_proc_entry ("cio_ignore", S_IFREG | S_IRUGO | S_IWUSR,
-                                   &proc_root);
+                                   NULL);
         if (!entry)
                 return -ENOENT;
 
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 10aa1e78080..43876e28737 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -3632,7 +3632,7 @@ qdio_add_procfs_entry(void)
 {
         proc_perf_file_registration=0;
         qdio_perf_proc_file=create_proc_entry(QDIO_PERF,
-                                              S_IFREG|0444,&proc_root);
+                                              S_IFREG|0444,NULL);
         if (qdio_perf_proc_file) {
                 qdio_perf_proc_file->read_proc=&qdio_perf_procfile_read;
         } else proc_perf_file_registration=-1;
@@ -3647,7 +3647,7 @@ static void
 qdio_remove_procfs_entry(void)
 {
         if (!proc_perf_file_registration) /* means if it went ok earlier */
-                remove_proc_entry(QDIO_PERF,&proc_root);
+                remove_proc_entry(QDIO_PERF,NULL);
 }
 
 /**
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index b135a1ed4b2..18551aaf5e0 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -4996,7 +4996,7 @@ static int __init megaraid_init(void)
                 max_mbox_busy_wait = MBOX_BUSY_WAIT;
 
 #ifdef CONFIG_PROC_FS
-        mega_proc_dir_entry = proc_mkdir("megaraid", &proc_root);
+        mega_proc_dir_entry = proc_mkdir("megaraid", NULL);
         if (!mega_proc_dir_entry) {
                 printk(KERN_WARNING
                                 "megaraid: failed to create megaraid root\n");
@@ -5005,7 +5005,7 @@ static int __init megaraid_init(void)
         error = pci_register_driver(&megaraid_pci_driver);
         if (error) {
 #ifdef CONFIG_PROC_FS
-                remove_proc_entry("megaraid", &proc_root);
+                remove_proc_entry("megaraid", NULL);
 #endif
                 return error;
         }
@@ -5035,7 +5035,7 @@ static void __exit megaraid_exit(void)
         pci_unregister_driver(&megaraid_pci_driver);
 
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("megaraid", &proc_root);
+        remove_proc_entry("megaraid", NULL);
 #endif
 }
 
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 17b5267f44d..9f8a389dc7a 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -381,7 +381,7 @@ int __init clps711xfb_init(void)
 
         /* Register the /proc entries. */
         clps7111fb_backlight_proc_entry = create_proc_entry("backlight", 0444,
-                &proc_root);
+                NULL);
         if (clps7111fb_backlight_proc_entry == NULL) {
                 printk("Couldn't create the /proc entry for the backlight.\n");
                 return -EINVAL;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index b1d6df671ed..28cbca80590 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -11,6 +11,7 @@
 
 #include <linux/proc_fs.h>
 
+extern struct proc_dir_entry proc_root;
 #ifdef CONFIG_PROC_SYSCTL
 extern int proc_sys_init(void);
 #else
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index c4137bb94a9..48bcf20cec2 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -854,7 +854,7 @@ void __init proc_misc_init(void)
 
         /* And now for trickier ones */
 #ifdef CONFIG_PRINTK
-        proc_create("kmsg", S_IRUSR, &proc_root, &proc_kmsg_operations);
+        proc_create("kmsg", S_IRUSR, NULL, &proc_kmsg_operations);
 #endif
         proc_create("locks", 0, NULL, &proc_locks_operations);
         proc_create("devices", 0, NULL, &proc_devinfo_operations);
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 5e93e9b0124..c741b45a550 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -232,4 +232,3 @@ EXPORT_SYMBOL(proc_mkdir);
 EXPORT_SYMBOL(create_proc_entry);
 EXPORT_SYMBOL(proc_create);
 EXPORT_SYMBOL(remove_proc_entry);
-EXPORT_SYMBOL(proc_root);
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index f56205cbebc..2183ffdc548 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -96,7 +96,6 @@ struct vmcore {
 
 #ifdef CONFIG_PROC_FS
 
-extern struct proc_dir_entry proc_root;
 extern struct proc_dir_entry *proc_root_kcore;
 
 extern spinlock_t proc_subdir_lock;
@@ -243,8 +242,6 @@ struct tty_driver;
 static inline void proc_tty_register_driver(struct tty_driver *driver) {};
 static inline void proc_tty_unregister_driver(struct tty_driver *driver) {};
 
-extern struct proc_dir_entry proc_root;
-
 static inline int pid_ns_prepare_proc(struct pid_namespace *ns)
 {
         return 0;
diff --git a/kernel/configs.c b/kernel/configs.c
index e84d3f9c6c7..d3a4b82a8a9 100644
--- a/kernel/configs.c
+++ b/kernel/configs.c
@@ -79,8 +79,7 @@ static int __init ikconfig_init(void)
         struct proc_dir_entry *entry;
 
         /* create the current config file */
-        entry = create_proc_entry("config.gz", S_IFREG | S_IRUGO,
-                                  &proc_root);
+        entry = create_proc_entry("config.gz", S_IFREG | S_IRUGO, NULL);
         if (!entry)
                 return -ENOMEM;
 
@@ -95,7 +94,7 @@ static int __init ikconfig_init(void)
 
 static void __exit ikconfig_cleanup(void)
 {
-        remove_proc_entry("config.gz", &proc_root);
+        remove_proc_entry("config.gz", NULL);
 }
 
 module_init(ikconfig_init);
diff --git a/sound/core/info.c b/sound/core/info.c
index 9977ec2eace..cb5ead3e202 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -544,7 +544,7 @@ int __init snd_info_init(void)
 {
         struct proc_dir_entry *p;
 
-        p = snd_create_proc_entry("asound", S_IFDIR | S_IRUGO | S_IXUGO, &proc_root);
+        p = snd_create_proc_entry("asound", S_IFDIR | S_IRUGO | S_IXUGO, NULL);
         if (p == NULL)
                 return -ENOMEM;
         snd_proc_root = p;
@@ -594,7 +594,7 @@ int __exit snd_info_done(void)
 #ifdef CONFIG_SND_OSSEMUL
                 snd_info_free_entry(snd_oss_root);
 #endif
-                snd_remove_proc_entry(&proc_root, snd_proc_root);
+                snd_remove_proc_entry(NULL, snd_proc_root);
         }
         return 0;
 }