diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-26 21:55:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-26 21:55:51 -0500 |
| commit | ff4783ce78c08d2990126ce1874250ae8e72bbd2 (patch) | |
| tree | 5c95885a4ab768101dd72942b57c238d452a7565 /arch/powerpc/kernel/exceptions-64s.S | |
| parent | 622121719934f60378279eb440d3cec2fc3176d2 (diff) | |
| parent | 203738e548cefc3fc3c2f73a9063176c9f3583d5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/sfc/rx.c
Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 3844ca7c5099..15c5a4f6de01 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -774,8 +774,8 @@ alignment_common: program_check_common: EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN) bl .save_nvgprs - addi r3,r1,STACK_FRAME_OVERHEAD DISABLE_INTS + addi r3,r1,STACK_FRAME_OVERHEAD bl .program_check_exception b .ret_from_except |