summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-17 03:21:36 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-17 03:21:36 +0100
commit98c4514ff6e3072288770db66f91bdb15af8b433 (patch)
treeeb5f2541e70d27144720e1735b463471025908f0 /arch/arm/mm
parentmisc: apds9802als: Fix the logic checking timeout in als_wait_for_data_ready() (diff)
parentLinux 3.7-rc6 (diff)
downloadlinux-98c4514ff6e3072288770db66f91bdb15af8b433.tar.xz
linux-98c4514ff6e3072288770db66f91bdb15af8b433.zip
Merge 3.7-rc6 into char-misc-next
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/alignment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index 023f443784ec..b820edaf3184 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -745,7 +745,7 @@ do_alignment_t32_to_handler(unsigned long *pinstr, struct pt_regs *regs,
static int
do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
{
- union offset_union offset;
+ union offset_union uninitialized_var(offset);
unsigned long instr = 0, instrptr;
int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs);
unsigned int type;