diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-08 14:15:26 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-08 14:15:29 -0500 |
| commit | 8e9255e6a2141e050d51bc4d96dbef494a87d653 (patch) | |
| tree | f190b142830153eaab05555a93c4f71a144ba3d4 /arch/arm/vfp/vfphw.S | |
| parent | 5091faa449ee0b7d73bc296a93bca9540fc51d0a (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/vfp/vfphw.S')
| -rw-r--r-- | arch/arm/vfp/vfphw.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S index d66cead97d28..9897dcfc16d6 100644 --- a/arch/arm/vfp/vfphw.S +++ b/arch/arm/vfp/vfphw.S | |||
| @@ -206,6 +206,7 @@ ENTRY(vfp_save_state) | |||
| 206 | mov pc, lr | 206 | mov pc, lr |
| 207 | ENDPROC(vfp_save_state) | 207 | ENDPROC(vfp_save_state) |
| 208 | 208 | ||
| 209 | .align | ||
| 209 | last_VFP_context_address: | 210 | last_VFP_context_address: |
| 210 | .word last_VFP_context | 211 | .word last_VFP_context |
| 211 | 212 | ||