diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-04-30 22:56:00 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-04-30 22:56:00 +0200 |
| commit | b643b0fdbc59cf6bbb086974b29d2571e9e9f646 (patch) | |
| tree | 59d1a1298ffc98877183a8def5c180c0f74e568b /arch/ia64/kernel/entry.S | |
| parent | Pull error-inject into release branch (diff) | |
| parent | [IA64] relax per-cpu TLB requirement to DTC (diff) | |
| download | linux-b643b0fdbc59cf6bbb086974b29d2571e9e9f646.tar.xz linux-b643b0fdbc59cf6bbb086974b29d2571e9e9f646.zip | |
Pull percpu-dtc into release branch
Diffstat (limited to 'arch/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index e7873eeae448..55fd2d5471e1 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -767,7 +767,7 @@ ENTRY(ia64_leave_syscall) ld8.fill r15=[r3] // M0|1 restore r15 mov b6=r18 // I0 restore b6 - addl r17=THIS_CPU(ia64_phys_stacked_size_p8),r0 // A + LOAD_PHYS_STACK_REG_SIZE(r17) mov f9=f0 // F clear f9 (pKStk) br.cond.dpnt.many skip_rbs_switch // B @@ -775,7 +775,6 @@ ENTRY(ia64_leave_syscall) shr.u r18=r19,16 // I0|1 get byte size of existing "dirty" partition cover // B add current frame into dirty partition & set cr.ifs ;; -(pUStk) ld4 r17=[r17] // M0|1 r17 = cpu_data->phys_stacked_size_p8 mov r19=ar.bsp // M2 get new backing store pointer mov f10=f0 // F clear f10 @@ -953,9 +952,7 @@ GLOBAL_ENTRY(ia64_leave_kernel) shr.u r18=r19,16 // get byte size of existing "dirty" partition ;; mov r16=ar.bsp // get existing backing store pointer - addl r17=THIS_CPU(ia64_phys_stacked_size_p8),r0 - ;; - ld4 r17=[r17] // r17 = cpu_data->phys_stacked_size_p8 + LOAD_PHYS_STACK_REG_SIZE(r17) (pKStk) br.cond.dpnt skip_rbs_switch /* |