From 91fcf1cd7afcced3af5bd1c7d3ae908124521a43 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 14 Sep 2012 11:09:52 +0200 Subject: [PATCH] --- yaml --- r: 324109 b: refs/heads/master c: 41459d36cf0d57813017dae6080a879cc038e5fe h: refs/heads/master i: 324107: 4a2ef28b132cc7ae91da2a163090a06382373d60 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/smp.c | 2 +- trunk/arch/s390/mm/pgtable.c | 4 ++-- trunk/drivers/s390/cio/cio.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 97da870b9492..eb498c2fa458 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b563d8c26735a76d84664d1b48271c432d63983 +refs/heads/master: 41459d36cf0d57813017dae6080a879cc038e5fe diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c index 8676aab6ea6a..ea431e551c6b 100644 --- a/trunk/arch/s390/kernel/smp.c +++ b/trunk/arch/s390/kernel/smp.c @@ -126,7 +126,7 @@ static int pcpu_sigp_retry(struct pcpu *pcpu, u8 order, u32 parm) static inline int pcpu_stopped(struct pcpu *pcpu) { - u32 status; + u32 uninitialized_var(status); if (__pcpu_sigp(pcpu->address, SIGP_SENSE, 0, &status) != SIGP_CC_STATUS_STORED) diff --git a/trunk/arch/s390/mm/pgtable.c b/trunk/arch/s390/mm/pgtable.c index d83ecbf02018..b402991e43d7 100644 --- a/trunk/arch/s390/mm/pgtable.c +++ b/trunk/arch/s390/mm/pgtable.c @@ -609,8 +609,8 @@ static inline unsigned int atomic_xor_bits(atomic_t *v, unsigned int bits) */ unsigned long *page_table_alloc(struct mm_struct *mm, unsigned long vmaddr) { - struct page *page; - unsigned long *table; + unsigned long *uninitialized_var(table); + struct page *uninitialized_var(page); unsigned int mask, bit; if (mm_has_pgste(mm)) diff --git a/trunk/drivers/s390/cio/cio.c b/trunk/drivers/s390/cio/cio.c index 33d1ef703593..8e927b9f285f 100644 --- a/trunk/drivers/s390/cio/cio.c +++ b/trunk/drivers/s390/cio/cio.c @@ -1029,7 +1029,7 @@ extern void do_reipl_asm(__u32 schid); /* Make sure all subchannels are quiet before we re-ipl an lpar. */ void reipl_ccw_dev(struct ccw_dev_id *devid) { - struct subchannel_id schid; + struct subchannel_id uninitialized_var(schid); s390_reset_system(NULL, NULL); if (reipl_find_schid(devid, &schid) != 0)