Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 8d0f0de76b63..a80d938fafc9 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -24,6 +24,7 @@
 #include <linux/idr.h>
 #include <linux/interrupt.h>
 #include <linux/kthread.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/ctype.h>
@@ -926,7 +927,7 @@ lpfc_debugfs_dumpData_open(struct inode *inode, struct file *file)
                 goto out;
 
         /* Round to page boundry */
-        printk(KERN_ERR "BLKGRD %s: _dump_buf_data=0x%p\n",
+        printk(KERN_ERR "9059 BLKGRD:  %s: _dump_buf_data=0x%p\n",
                         __func__, _dump_buf_data);
         debug->buffer = _dump_buf_data;
         if (!debug->buffer) {
@@ -956,8 +957,8 @@ lpfc_debugfs_dumpDif_open(struct inode *inode, struct file *file)
                 goto out;
 
         /* Round to page boundry */
-        printk(KERN_ERR "BLKGRD %s: _dump_buf_dif=0x%p file=%s\n", __func__,
-               _dump_buf_dif, file->f_dentry->d_name.name);
+        printk(KERN_ERR "9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%s\n",
+                __func__, _dump_buf_dif, file->f_dentry->d_name.name);
         debug->buffer = _dump_buf_dif;
         if (!debug->buffer) {
                 kfree(debug);
@@ -1377,7 +1378,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                         debugfs_create_dir(name, phba->hba_debugfs_root);
                 if (!vport->vport_debugfs_root) {
                         lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                         "0417 Cant create debugfs");
+                                         "0417 Cant create debugfs\n");
                         goto debug_failed;
                 }
                 atomic_inc(&phba->debugfs_vport_count);
@@ -1430,7 +1431,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                  vport, &lpfc_debugfs_op_nodelist);
         if (!vport->debug_nodelist) {
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                 "0409 Cant create debugfs nodelist");
+                                 "0409 Cant create debugfs nodelist\n");
                 goto debug_failed;
         }
 debug_failed: