9 files changed, 21 insertions, 23 deletions

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 37e0f81cada2..83650e00632d 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -430,7 +430,7 @@ static void pkt_sysfs_cleanup(void)
 /********************************************************************
   entries in debugfs
 
-  /debugfs/pktcdvd[0-7]/
+  /sys/kernel/debug/pktcdvd[0-7]/
                         info
 
  *******************************************************************/
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index c77c6c6d9d2c..6ce0e2667a85 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -105,7 +105,7 @@ int drm_debugfs_create_files(struct drm_info_list *files, int count,
                 ent = debugfs_create_file(files[i].name, S_IFREG | S_IRUGO,
                                           root, tmp, &drm_debugfs_fops);
                 if (!ent) {
-                        DRM_ERROR("Cannot create /debugfs/dri/%s/%s\n",
+                        DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s/%s\n",
                                   name, files[i].name);
                         drm_free(tmp, sizeof(struct drm_info_node),
                                  _DRM_DRIVER);
@@ -133,9 +133,9 @@ EXPORT_SYMBOL(drm_debugfs_create_files);
  * \param minor device minor number
  * \param root DRI debugfs dir entry.
  *
- * Create the DRI debugfs root entry "/debugfs/dri", the device debugfs root entry
- * "/debugfs/dri/%minor%/", and each entry in debugfs_list as
- * "/debugfs/dri/%minor%/%name%".
+ * Create the DRI debugfs root entry "/sys/kernel/debug/dri", the device debugfs root entry
+ * "/sys/kernel/debug/dri/%minor%/", and each entry in debugfs_list as
+ * "/sys/kernel/debug/dri/%minor%/%name%".
  */
 int drm_debugfs_init(struct drm_minor *minor, int minor_id,
                      struct dentry *root)
@@ -148,7 +148,7 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id,
         sprintf(name, "%d", minor_id);
         minor->debugfs_root = debugfs_create_dir(name, root);
         if (!minor->debugfs_root) {
-                DRM_ERROR("Cannot create /debugfs/dri/%s\n", name);
+                DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s\n", name);
                 return -1;
         }
 
@@ -165,7 +165,7 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id,
                 ret = dev->driver->debugfs_init(minor);
                 if (ret) {
                         DRM_ERROR("DRM: Driver failed to initialize "
-                                  "/debugfs/dri.\n");
+                                  "/sys/kernel/debug/dri.\n");
                         return ret;
                 }
         }
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 019b7c578236..1bf7efd8d334 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -339,7 +339,7 @@ static int __init drm_core_init(void)
 
         drm_debugfs_root = debugfs_create_dir("dri", NULL);
         if (!drm_debugfs_root) {
-                DRM_ERROR("Cannot create /debugfs/dri\n");
+                DRM_ERROR("Cannot create /sys/kernel/debug/dri\n");
                 ret = -1;
                 goto err_p3;
         }
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 89050684fe0d..387a8de1bc7e 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -343,7 +343,7 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int t
 #if defined(CONFIG_DEBUG_FS)
         ret = drm_debugfs_init(new_minor, minor_id, drm_debugfs_root);
         if (ret) {
-                DRM_ERROR("DRM: Failed to initialize /debugfs/dri.\n");
+                DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n");
                 goto err_g2;
         }
 #endif
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 01f282cd0989..3b6383168c69 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2206,7 +2206,7 @@ config SKGE_DEBUG
        depends on SKGE && DEBUG_FS
        help
          This option adds the ability to dump driver state for debugging.
-         The file debugfs/skge/ethX displays the state of the internal
+         The file /sys/kernel/debug/skge/ethX displays the state of the internal
          transmit and receive rings.
 
          If unsure, say N.
@@ -2232,7 +2232,7 @@ config SKY2_DEBUG
        depends on SKY2 && DEBUG_FS
        help
          This option adds the ability to dump driver state for debugging.
-         The file debugfs/sky2/ethX displays the state of the internal
+         The file /sys/kernel/debug/sky2/ethX displays the state of the internal
          transmit and receive rings.
 
          If unsure, say N.
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h
index 1fe5da4cf0a0..60330f313f27 100644
--- a/drivers/net/wimax/i2400m/i2400m.h
+++ b/drivers/net/wimax/i2400m/i2400m.h
@@ -432,7 +432,7 @@ struct i2400m {
         unsigned ready:1;               /* all probing steps done */
         unsigned rx_reorder:1;          /* RX reorder is enabled */
         u8 trace_msg_from_user;         /* echo rx msgs to 'trace' pipe */
-                                        /* typed u8 so debugfs/u8 can tweak */
+                                        /* typed u8 so /sys/kernel/debug/u8 can tweak */
         enum i2400m_system_state state;
         wait_queue_head_t state_wq;     /* Woken up when on state updates */
 
diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig
index 509b6f94f73b..daf0c83527d8 100644
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -28,11 +28,10 @@ config ATH5K_DEBUG
           Say Y, if and you will get debug options for ath5k.
           To use this, you need to mount debugfs:
 
-          mkdir /debug/
-          mount -t debugfs debug /debug/
+          mount -t debugfs debug /sys/kernel/debug
 
           You will get access to files under:
-          /debug/ath5k/phy0/
+          /sys/kernel/debug/ath5k/phy0/
 
           To enable debug, pass the debug level to the debug module
           parameter. For example:
diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README
index d860fc375752..ab6a2d518af0 100644
--- a/drivers/net/wireless/libertas/README
+++ b/drivers/net/wireless/libertas/README
@@ -72,7 +72,7 @@ rdrf
         location that is to be read.  This parameter must be specified in
         hexadecimal (its possible to preceed preceding the number with a "0x").
 
-        Path: /debugfs/libertas_wireless/ethX/registers/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/registers/
 
         Usage:
                 echo "0xa123" > rdmac ; cat rdmac
@@ -95,7 +95,7 @@ wrrf
 sleepparams
         This command is used to set the sleepclock configurations
 
-        Path: /debugfs/libertas_wireless/ethX/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
 
         Usage:
                 cat sleepparams: reads the current sleepclock configuration
@@ -115,7 +115,7 @@ subscribed_events
         The subscribed_events directory contains the interface for the
         subscribed events API.
 
-        Path: /debugfs/libertas_wireless/ethX/subscribed_events/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/subscribed_events/
 
         Each event is represented by a filename. Each filename consists of the
         following three fields:
@@ -165,7 +165,7 @@ subscribed_events
 extscan
         This command is used to do a specific scan.
 
-        Path: /debugfs/libertas_wireless/ethX/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
 
         Usage: echo "SSID" > extscan
 
@@ -179,7 +179,7 @@ getscantable
         Display the current contents of the driver scan table (ie. get the
         scan results).
 
-        Path: /debugfs/libertas_wireless/ethX/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
 
         Usage:
                 cat getscantable
@@ -188,7 +188,7 @@ setuserscan
         Initiate a customized scan and retrieve the results
 
 
-        Path: /debugfs/libertas_wireless/ethX/
+        Path: /sys/kernel/debug/libertas_wireless/ethX/
 
     Usage:
        echo "[ARGS]" > setuserscan
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 2b02b1fb39a0..8d0f0de76b63 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -53,8 +53,7 @@
  * debugfs interface
  *
  * To access this interface the user should:
- * # mkdir /debug
- * # mount -t debugfs none /debug
+ * # mount -t debugfs none /sys/kernel/debug
  *
  * The lpfc debugfs directory hierarchy is:
  * lpfc/lpfcX/vportY