Merge branch 'merge' into next

This commit is contained in:
Benjamin Herrenschmidt
2012-05-09 10:57:57 +10:00
15 changed files with 55 additions and 104 deletions

View File

@@ -764,8 +764,8 @@ alignment_common:
std r3,_DAR(r1)
std r4,_DSISR(r1)
bl .save_nvgprs
DISABLE_INTS
addi r3,r1,STACK_FRAME_OVERHEAD
ENABLE_INTS
bl .alignment_exception
b .ret_from_except