diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /arch/ia64/kernel/head.S | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'arch/ia64/kernel/head.S')
| -rw-r--r-- | arch/ia64/kernel/head.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S index 561b8f1d3bc7..29236f0c62b5 100644 --- a/arch/ia64/kernel/head.S +++ b/arch/ia64/kernel/head.S | |||
| @@ -853,7 +853,6 @@ END(__ia64_init_fpu) | |||
| 853 | */ | 853 | */ |
| 854 | GLOBAL_ENTRY(ia64_switch_mode_phys) | 854 | GLOBAL_ENTRY(ia64_switch_mode_phys) |
| 855 | { | 855 | { |
| 856 | alloc r2=ar.pfs,0,0,0,0 | ||
| 857 | rsm psr.i | psr.ic // disable interrupts and interrupt collection | 856 | rsm psr.i | psr.ic // disable interrupts and interrupt collection |
| 858 | mov r15=ip | 857 | mov r15=ip |
| 859 | } | 858 | } |
| @@ -902,7 +901,6 @@ END(ia64_switch_mode_phys) | |||
| 902 | */ | 901 | */ |
| 903 | GLOBAL_ENTRY(ia64_switch_mode_virt) | 902 | GLOBAL_ENTRY(ia64_switch_mode_virt) |
| 904 | { | 903 | { |
| 905 | alloc r2=ar.pfs,0,0,0,0 | ||
| 906 | rsm psr.i | psr.ic // disable interrupts and interrupt collection | 904 | rsm psr.i | psr.ic // disable interrupts and interrupt collection |
| 907 | mov r15=ip | 905 | mov r15=ip |
| 908 | } | 906 | } |