5 files changed, 7 insertions, 6 deletions

diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index a1808022ea19..2452c6fbe992 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -278,7 +278,7 @@ void efi_memmap_walk(efi_freemem_callback_t callback, void *arg)
         struct range {
                 unsigned long start;
                 unsigned long end;
-        } prev, curr;
+        } uninitialized_var(prev), curr;
         efi_memory_desc_t *md;
         unsigned long start, end;
         void *p;
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index f04c7aa834cb..004c2abbc732 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1867,7 +1867,8 @@ static ssize_t ocfs2_file_buffered_write(struct file *file, loff_t *ppos,
         loff_t pos;
         const struct iovec *cur_iov = iov;
         struct page *user_page, *page;
-        char *buf, *dst;
+        char * uninitialized_var(buf);
+        char *dst;
         void *fsdata;
 
         /*
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 6658afb41cc7..d6a504f5d758 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1356,7 +1356,7 @@ udf_load_partition(struct super_block *sb, kernel_lb_addr *fileset)
                         case UDF_VIRTUAL_MAP15:
                         case UDF_VIRTUAL_MAP20:
                         {
-                                kernel_lb_addr ino;
+                                kernel_lb_addr uninitialized_var(ino);
 
                                 if (!UDF_SB_LASTBLOCK(sb))
                                 {
diff --git a/ipc/msg.c b/ipc/msg.c
index cbd27e519943..a03fcb522fff 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -385,7 +385,7 @@ copy_msqid_from_user(struct msq_setbuf *out, void __user *buf, int version)
 asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf)
 {
         struct kern_ipc_perm *ipcp;
-        struct msq_setbuf setbuf;
+        struct msq_setbuf uninitialized_var(setbuf);
         struct msg_queue *msq;
         int err, version;
         struct ipc_namespace *ns;
@@ -509,7 +509,7 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf)
         err = audit_ipc_obj(ipcp);
         if (err)
                 goto out_unlock_up;
-        if (cmd==IPC_SET) {
+        if (cmd == IPC_SET) {
                 err = audit_ipc_set_perm(setbuf.qbytes, setbuf.uid, setbuf.gid,
                                          setbuf.mode);
                 if (err)
diff --git a/ipc/sem.c b/ipc/sem.c
index 89bfdffb38d8..b676fef6d208 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -856,7 +856,7 @@ static int semctl_down(struct ipc_namespace *ns, int semid, int semnum,
 {
         struct sem_array *sma;
         int err;
-        struct sem_setbuf setbuf;
+        struct sem_setbuf uninitialized_var(setbuf);
         struct kern_ipc_perm *ipcp;
 
         if(cmd == IPC_SET) {