forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into next

Browse source 
Conflicts:
	include/linux/kvm.h
This commit is contained in:
Benjamin Herrenschmidt 2009-12-09 17:14:38 +11:00
commit bcd6acd51f
3651 changed files with 249180 additions and 115589 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/powerpc/kernel/exceptions-64s.S
View file

@ -190,14 +190,17 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
* prolog code of the PerformanceMonitor one. A little
* trickery is thus necessary
*/
performance_monitor_pSeries_1:
. = 0xf00
DO_KVM 0xf00
b performance_monitor_pSeries
altivec_unavailable_pSeries_1:
. = 0xf20
DO_KVM 0xf20
b altivec_unavailable_pSeries
vsx_unavailable_pSeries_1:
. = 0xf40
DO_KVM 0xf40
b vsx_unavailable_pSeries