diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:24:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:25:03 -0400 |
| commit | bfefb7a0c6e08736f2d5917c468467f134bf28bb (patch) | |
| tree | 7aa7084114dc083fe5b4d7b532901bdeb67188e7 /arch/ia64/kernel/relocate_kernel.S | |
| parent | 8d0cc631f6dd0a9283ceb7d61d8b85ecbcd355ea (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Bring in changes that the next patch will depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/kernel/relocate_kernel.S')
| -rw-r--r-- | arch/ia64/kernel/relocate_kernel.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/relocate_kernel.S b/arch/ia64/kernel/relocate_kernel.S index 903babd22d62..32f6fc131fbe 100644 --- a/arch/ia64/kernel/relocate_kernel.S +++ b/arch/ia64/kernel/relocate_kernel.S | |||
| @@ -52,7 +52,7 @@ GLOBAL_ENTRY(relocate_new_kernel) | |||
| 52 | srlz.i | 52 | srlz.i |
| 53 | ;; | 53 | ;; |
| 54 | mov ar.rnat=r18 | 54 | mov ar.rnat=r18 |
| 55 | rfi | 55 | rfi // note: this unmask MCA/INIT (psr.mc) |
| 56 | ;; | 56 | ;; |
| 57 | 1: | 57 | 1: |
| 58 | //physical mode code begin | 58 | //physical mode code begin |