diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/powerpc/kernel/exceptions-64s.S | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index fc3ead066ce..e3be98ffe2a 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S | |||
| @@ -190,14 +190,17 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE) | |||
| 190 | * prolog code of the PerformanceMonitor one. A little | 190 | * prolog code of the PerformanceMonitor one. A little |
| 191 | * trickery is thus necessary | 191 | * trickery is thus necessary |
| 192 | */ | 192 | */ |
| 193 | performance_monitor_pSeries_1: | ||
| 193 | . = 0xf00 | 194 | . = 0xf00 |
| 194 | DO_KVM 0xf00 | 195 | DO_KVM 0xf00 |
| 195 | b performance_monitor_pSeries | 196 | b performance_monitor_pSeries |
| 196 | 197 | ||
| 198 | altivec_unavailable_pSeries_1: | ||
| 197 | . = 0xf20 | 199 | . = 0xf20 |
| 198 | DO_KVM 0xf20 | 200 | DO_KVM 0xf20 |
| 199 | b altivec_unavailable_pSeries | 201 | b altivec_unavailable_pSeries |
| 200 | 202 | ||
| 203 | vsx_unavailable_pSeries_1: | ||
| 201 | . = 0xf40 | 204 | . = 0xf40 |
| 202 | DO_KVM 0xf40 | 205 | DO_KVM 0xf40 |
| 203 | b vsx_unavailable_pSeries | 206 | b vsx_unavailable_pSeries |