Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 76b7fd2d838a..40a844c1dbb4 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -28,11 +28,9 @@
         dev_warn (ehci_to_hcd(ehci)->self.controller , fmt , ## args )
 
 #ifdef VERBOSE_DEBUG
-#       define vdbg dbg
 #       define ehci_vdbg ehci_dbg
 #else
-#       define vdbg(fmt,args...) do { } while (0)
-#       define ehci_vdbg(ehci, fmt, args...) do { } while (0)
+        static inline void ehci_vdbg(struct ehci_hcd *ehci, ...) {}
 #endif
 
 #ifdef  DEBUG
@@ -369,18 +367,21 @@ static const struct file_operations debug_async_fops = {
         .open           = debug_async_open,
         .read           = debug_output,
         .release        = debug_close,
+        .llseek         = default_llseek,
 };
 static const struct file_operations debug_periodic_fops = {
         .owner          = THIS_MODULE,
         .open           = debug_periodic_open,
         .read           = debug_output,
         .release        = debug_close,
+        .llseek         = default_llseek,
 };
 static const struct file_operations debug_registers_fops = {
         .owner          = THIS_MODULE,
         .open           = debug_registers_open,
         .read           = debug_output,
         .release        = debug_close,
+        .llseek         = default_llseek,
 };
 static const struct file_operations debug_lpm_fops = {
         .owner          = THIS_MODULE,
@@ -388,6 +389,7 @@ static const struct file_operations debug_lpm_fops = {
         .read           = debug_lpm_read,
         .write          = debug_lpm_write,
         .release        = debug_lpm_close,
+        .llseek         = noop_llseek,
 };
 
 static struct dentry *ehci_debug_root;
@@ -724,7 +726,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
         }
 
         /* Capability Registers */
-        i = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase));
+        i = HC_VERSION(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
         temp = scnprintf (next, size,
                 "bus %s, device %s\n"
                 "%s\n"
@@ -875,7 +877,7 @@ static int fill_buffer(struct debug_buffer *buf)
         int ret = 0;
 
         if (!buf->output_buf)
-                buf->output_buf = (char *)vmalloc(buf->alloc_size);
+                buf->output_buf = vmalloc(buf->alloc_size);
 
         if (!buf->output_buf) {
                 ret = -ENOMEM;
@@ -1063,7 +1065,7 @@ static inline void create_debug_files (struct ehci_hcd *ehci)
                                                     &debug_registers_fops))
                 goto file_error;
 
-        if (!debugfs_create_file("lpm", S_IRUGO|S_IWUGO, ehci->debug_dir, bus,
+        if (!debugfs_create_file("lpm", S_IRUGO|S_IWUSR, ehci->debug_dir, bus,
                                                     &debug_lpm_fops))
                 goto file_error;