ARM: Fix build warning in do_alignment.

Commit Message

Russell King - ARM Linux Sept. 10, 2012, 8:40 a.m. UTC

On Mon, Sep 10, 2012 at 12:25:15PM +0900, Chanho Min wrote:
> Fix the following build warning:
> 
> arch/arm/mm/alignment.c: In function 'do_alignment':
> arch/arm/mm/alignment.c:327:15: warning: 'offset.un' may be used
> uninitialized in this function [-Wuninitialized]
> arch/arm/mm/alignment.c:749:21: note: 'offset.un' was declared here
> 
> Signed-off-by: Chanho Min <[e-mail]>

The compiler is being silly - notice that it is saying "may" not "is".
In this case, it will not be uninitialized prior to use.

What it's caused by is do_alignment_t32_to_handler(), and its assignment
through a pointer of this variable.  You can see that this is the cause
because the patch below fixes the warning.

It's all about whether gcc can prove that the variable is or is not
assigned.  It has one warning for the 'provably not assigned' case, and
another for the 'can't prove that it is always assigned' case.

Anyway, normally we don't fix warnings where the compiler is wrong (but
we encourage the compiler guys to fix the compiler instead.)

 arch/arm/mm/alignment.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index 6d6790e..5ce7733 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -699,7 +699,6 @@  do_alignment_t32_to_handler(unsigned long *pinstr, struct pt_regs *regs,
 	unsigned long instr = *pinstr;
 	u16 tinst1 = (instr >> 16) & 0xffff;
 	u16 tinst2 = instr & 0xffff;
-	poffset->un = 0;
 
 	switch (tinst1 & 0xffe0) {
 	/* A6.3.5 Load/Store multiple */
@@ -854,9 +853,10 @@  do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
 		break;
 
 	case 0x08000000:	/* ldm or stm, or thumb-2 32bit instruction */
-		if (thumb2_32b)
+		if (thumb2_32b) {
+			offset.un = 0;
 			handler = do_alignment_t32_to_handler(&instr, regs, &offset);
-		else
+		} else
 			handler = do_alignment_ldmstm;
 		break;