diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/arm/nwfpe | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/nwfpe')
| -rw-r--r-- | arch/arm/nwfpe/entry.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S index 48bca0db4607..cafa18354339 100644 --- a/arch/arm/nwfpe/entry.S +++ b/arch/arm/nwfpe/entry.S | |||
| @@ -111,12 +111,12 @@ next: | |||
| 111 | @ to fault. Emit the appropriate exception gunk to fix things up. | 111 | @ to fault. Emit the appropriate exception gunk to fix things up. |
| 112 | @ ??? For some reason, faults can happen at .Lx2 even with a | 112 | @ ??? For some reason, faults can happen at .Lx2 even with a |
| 113 | @ plain LDR instruction. Weird, but it seems harmless. | 113 | @ plain LDR instruction. Weird, but it seems harmless. |
| 114 | .section .fixup,"ax" | 114 | .pushsection .fixup,"ax" |
| 115 | .align 2 | 115 | .align 2 |
| 116 | .Lfix: mov pc, r9 @ let the user eat segfaults | 116 | .Lfix: mov pc, r9 @ let the user eat segfaults |
| 117 | .previous | 117 | .popsection |
| 118 | 118 | ||
| 119 | .section __ex_table,"a" | 119 | .pushsection __ex_table,"a" |
| 120 | .align 3 | 120 | .align 3 |
| 121 | .long .Lx1, .Lfix | 121 | .long .Lx1, .Lfix |
| 122 | .previous | 122 | .popsection |