git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
alignment.c
diff --git
a/arch/arm/mm/alignment.c
b/arch/arm/mm/alignment.c
index
724ba3b
..
be7c638
100644
(file)
--- a/
arch/arm/mm/alignment.c
+++ b/
arch/arm/mm/alignment.c
@@
-727,6
+727,9
@@
do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
int isize = 4;
int thumb2_32b = 0;
+ if (interrupts_enabled(regs))
+ local_irq_enable();
+
instrptr = instruction_pointer(regs);
fs = get_fs();