diff options
| author | Al Viro | 2012-11-17 02:53:36 +0100 |
|---|---|---|
| committer | Al Viro | 2012-11-17 02:53:36 +0100 |
| commit | 6929039761a3414e5c71448eb3dcc1d82fc1891d (patch) | |
| tree | 49b349170dd93821c2d515fee3931a4023da35da /arch/arm/mm/alignment.c | |
| parent | arm64: get rid of fork/vfork/clone wrappers (diff) | |
| parent | arm64: elf: fix core dumping definitions for GP and FP registers (diff) | |
| download | kernel-qcow2-linux-6929039761a3414e5c71448eb3dcc1d82fc1891d.tar.gz kernel-qcow2-linux-6929039761a3414e5c71448eb3dcc1d82fc1891d.tar.xz kernel-qcow2-linux-6929039761a3414e5c71448eb3dcc1d82fc1891d.zip | |
Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64
Backmerge from mainline commit that introduced a trivial conflict in
arch/arm64/kernel/process.c - a bunch of functions removed next to the
place where kernel_thread() used to be.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/alignment.c')
| -rw-r--r-- | arch/arm/mm/alignment.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index b9f60ebe3bc4..023f443784ec 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -856,8 +856,10 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) if (thumb2_32b) { offset.un = 0; handler = do_alignment_t32_to_handler(&instr, regs, &offset); - } else + } else { + offset.un = 0; handler = do_alignment_ldmstm; + } break; default: |