Merge branch 'timers/posix-cpu-timers-for-tglx' of

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/core

Frederic sayed: "Most of these patches have been hanging around for
several month now, in -mmotm for a significant chunk. They already
missed a few releases."

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/xen/xenbus/xenbus_dev_backend.c b/drivers/xen/xenbus/xenbus_dev_backend.c
index d73000800762..a6f42fc01407 100644
--- a/drivers/xen/xenbus/xenbus_dev_backend.c
+++ b/drivers/xen/xenbus/xenbus_dev_backend.c
@@ -70,22 +70,21 @@ static long xenbus_alloc(domid_t domid)
         return err;
 }
 
-static long xenbus_backend_ioctl(struct file *file, unsigned int cmd, unsigned long data)
+static long xenbus_backend_ioctl(struct file *file, unsigned int cmd,
+                                 unsigned long data)
 {
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
         switch (cmd) {
-                case IOCTL_XENBUS_BACKEND_EVTCHN:
-                        if (xen_store_evtchn > 0)
-                                return xen_store_evtchn;
-                        return -ENODEV;
-
-                case IOCTL_XENBUS_BACKEND_SETUP:
-                        return xenbus_alloc(data);
-
-                default:
-                        return -ENOTTY;
+        case IOCTL_XENBUS_BACKEND_EVTCHN:
+                if (xen_store_evtchn > 0)
+                        return xen_store_evtchn;
+                return -ENODEV;
+        case IOCTL_XENBUS_BACKEND_SETUP:
+                return xenbus_alloc(data);
+        default:
+                return -ENOTTY;
         }
 }