Skip to content

Commit

Permalink
xnu-517.9.5
Browse files Browse the repository at this point in the history 
Imported from https://opensource.apple.com/tarballs/xnu/xnu-517.9.5.tar.gz
  • Loading branch information
@das
Darwin authored and das committed Jun 4, 2017
1 parent ed48e98 commit c10cb70
Show file tree
Hide file tree
Showing 21 changed files with 81 additions and 102 deletions.
2 changes: 1 addition & 1 deletion bsd/conf/version.minor
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6
7
8 changes: 4 additions & 4 deletions config/System.kext/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleGetInfoString</key>
<string>System Resource Pseudoextension, Apple Computer Inc, 7.6.0</string>
<string>System Resource Pseudoextension, Apple Computer Inc, 7.7.0</string>
<key>CFBundleIdentifier</key>
<string>com.apple.kernel</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -15,13 +15,13 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleCompatibleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleRequired</key>
<string>Root</string>
<key>OSKernelResource</key>
Expand Down
6 changes: 3 additions & 3 deletions config/System.kext/PlugIns/AppleNMI.kext/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleGetInfoString</key>
<string>AppleNMI Pseudoextension, Apple Computer Inc, 7.6.0</string>
<string>AppleNMI Pseudoextension, Apple Computer Inc, 7.7.0</string>
<key>CFBundleIdentifier</key>
<string>com.apple.driver.AppleNMI</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleRequired</key>
<string>Root</string>
<key>OSKernelResource</key>
Expand Down
6 changes: 3 additions & 3 deletions config/System.kext/PlugIns/ApplePlatformFamily.kext/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleGetInfoString</key>
<string>Apple Platform Family Pseudoextension, Apple Computer Inc, 7.6.0</string>
<string>Apple Platform Family Pseudoextension, Apple Computer Inc, 7.7.0</string>
<key>CFBundleIdentifier</key>
<string>com.apple.iokit.ApplePlatformFamily</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleCompatibleVersion</key>
<string>1.0</string>
<key>OSBundleRequired</key>
Expand Down
6 changes: 3 additions & 3 deletions config/System.kext/PlugIns/BSDKernel.kext/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>BSDKernel</string>
<key>CFBundleGetInfoString</key>
<string>BSD Kernel Pseudoextension, Apple Computer Inc, 7.6.0</string>
<string>BSD Kernel Pseudoextension, Apple Computer Inc, 7.7.0</string>
<key>CFBundleIdentifier</key>
<string>com.apple.kpi.bsd</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleCompatibleVersion</key>
<string>7.0</string>
<key>OSBundleRequired</key>
Expand Down
6 changes: 3 additions & 3 deletions config/System.kext/PlugIns/IOKit.kext/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>IOKit</string>
<key>CFBundleGetInfoString</key>
<string>I/O Kit Pseudoextension, Apple Computer Inc, 7.6.0</string>
<string>I/O Kit Pseudoextension, Apple Computer Inc, 7.7.0</string>
<key>CFBundleIdentifier</key>
<string>com.apple.kpi.iokit</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleCompatibleVersion</key>
<string>7.0</string>
<key>OSBundleRequired</key>
Expand Down
6 changes: 3 additions & 3 deletions config/System.kext/PlugIns/IONVRAMFamily.kext/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleGetInfoString</key>
<string>AppleNMI Pseudoextension, Apple Computer Inc, 7.6.0</string>
<string>AppleNMI Pseudoextension, Apple Computer Inc, 7.7.0</string>
<key>CFBundleIdentifier</key>
<string>com.apple.iokit.IONVRAMFamily</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleCompatibleVersion</key>
<string>1.1</string>
<key>OSBundleRequired</key>
Expand Down
6 changes: 3 additions & 3 deletions config/System.kext/PlugIns/IOSystemManagement.kext/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleGetInfoString</key>
<string>System Management Pseudoextension, Apple Computer Inc, 7.6.0</string>
<string>System Management Pseudoextension, Apple Computer Inc, 7.7.0</string>
<key>CFBundleIdentifier</key>
<string>com.apple.iokit.IOSystemManagementFamily</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleCompatibleVersion</key>
<string>1.0.0b1</string>
<key>OSBundleRequired</key>
Expand Down
6 changes: 3 additions & 3 deletions config/System.kext/PlugIns/Libkern.kext/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Libkern</string>
<key>CFBundleGetInfoString</key>
<string>Libkern Pseudoextension, Apple Computer Inc, 7.6.0</string>
<string>Libkern Pseudoextension, Apple Computer Inc, 7.7.0</string>
<key>CFBundleIdentifier</key>
<string>com.apple.kpi.libkern</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleCompatibleVersion</key>
<string>7.0</string>
<key>OSBundleRequired</key>
Expand Down
6 changes: 3 additions & 3 deletions config/System.kext/PlugIns/Mach.kext/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Mach</string>
<key>CFBundleGetInfoString</key>
<string>Mach Kernel Pseudoextension, Apple Computer Inc, 7.6.0</string>
<string>Mach Kernel Pseudoextension, Apple Computer Inc, 7.7.0</string>
<key>CFBundleIdentifier</key>
<string>com.apple.kpi.mach</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>7.6.0</string>
<string>7.7.0</string>
<key>OSBundleCompatibleVersion</key>
<string>7.0</string>
<key>OSBundleRequired</key>
Expand Down
18 changes: 9 additions & 9 deletions iokit/KernelConfigTables.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
*/
const char * gIOKernelKmods =
"{"
" 'com.apple.kernel' = '7.6.0';"
" 'com.apple.kpi.bsd' = '7.6.0';"
" 'com.apple.kpi.iokit' = '7.6.0';"
" 'com.apple.kpi.libkern' = '7.6.0';"
" 'com.apple.kpi.mach' = '7.6.0';"
" 'com.apple.iokit.IONVRAMFamily' = '7.6.0';"
" 'com.apple.driver.AppleNMI' = '7.6.0';"
" 'com.apple.iokit.IOSystemManagementFamily' = '7.6.0';"
" 'com.apple.iokit.ApplePlatformFamily' = '7.6.0';"
" 'com.apple.kernel' = '7.7.0';"
" 'com.apple.kpi.bsd' = '7.7.0';"
" 'com.apple.kpi.iokit' = '7.7.0';"
" 'com.apple.kpi.libkern' = '7.7.0';"
" 'com.apple.kpi.mach' = '7.7.0';"
" 'com.apple.iokit.IONVRAMFamily' = '7.7.0';"
" 'com.apple.driver.AppleNMI' = '7.7.0';"
" 'com.apple.iokit.IOSystemManagementFamily' = '7.7.0';"
" 'com.apple.iokit.ApplePlatformFamily' = '7.7.0';"
" 'com.apple.kernel.6.0' = '6.9.9';"
" 'com.apple.kernel.bsd' = '6.9.9';"
" 'com.apple.kernel.iokit' = '6.9.9';"
Expand Down
2 changes: 1 addition & 1 deletion iokit/conf/version.minor
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6
7
2 changes: 1 addition & 1 deletion libkern/conf/version.minor
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6
7
2 changes: 1 addition & 1 deletion libsa/conf/version.minor
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6
7
2 changes: 1 addition & 1 deletion osfmk/conf/kernelversion.minor
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6
7
2 changes: 1 addition & 1 deletion osfmk/conf/version.minor
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6
7
42 changes: 0 additions & 42 deletions osfmk/ppc/chud/chud_spr.h.rej
View file

This file was deleted.

26 changes: 15 additions & 11 deletions osfmk/ppc/hw_vm.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3655,15 +3655,16 @@ hpfTLBIE32: lwarx r0,0,r9 ; Get the TLBIE lock

tlbie r12 ; Invalidate it everywhere

stw r0,tlbieLock(0) ; Clear the tlbie lock

beq- hpfNoTS32 ; Can not have MP on this machine...

eieio ; Make sure that the tlbie happens first
tlbsync ; Wait for everyone to catch up
sync ; Make sure of it all

hpfNoTS32: stw r7,hwSteals(r4) ; Save the steal count
hpfNoTS32:
stw r0,tlbieLock(0) ; Clear the tlbie lock

stw r7,hwSteals(r4) ; Save the steal count
bgt cr5,hpfInser32 ; We just stole a block mapping...

lwz r4,4(r19) ; Get the RC of the just invalidated PTE
Expand Down Expand Up @@ -3839,8 +3840,6 @@ hpfTLBIE64: lwarx r0,0,r9 ; Get the TLBIE lock

tlbie r11 ; Invalidate it everywhere

stw r0,tlbieLock(0) ; Clear the tlbie lock

mr r7,r8 ; Get a copy of the space ID
eieio ; Make sure that the tlbie happens first
rldimi r7,r7,14,36 ; Copy address space to make hash value
Expand All @@ -3850,6 +3849,9 @@ hpfTLBIE64: lwarx r0,0,r9 ; Get the TLBIE lock
srdi r2,r6,26 ; Shift original segment down to bottom

ptesync ; Make sure of it all

stw r0,tlbieLock(0) ; Clear the tlbie lock

xor r7,r7,r2 ; Compute original segment

stw r10,hwSteals(r4) ; Save the steal count
Expand Down Expand Up @@ -5058,15 +5060,16 @@ mITLBIE32: lwarx r0,0,r8 ; Get the TLBIE lock

tlbie r5 ; Invalidate it everywhere

stw r0,tlbieLock(0) ; Clear the tlbie lock

beq- mINoTS32 ; Can not have MP on this machine...

eieio ; Make sure that the tlbie happens first
tlbsync ; Wait for everyone to catch up
sync ; Make sure of it all

mINoTS32: lwz r5,4(r3) ; Get the real part
mINoTS32:
stw r0,tlbieLock(0) ; Clear the tlbie lock

lwz r5,4(r3) ; Get the real part
srwi r10,r5,12 ; Change physical address to a ppnum

mINmerge: lbz r11,mpFlags+1(r31) ; Get the offset to the physical entry table
Expand Down Expand Up @@ -5148,14 +5151,15 @@ mITLBIE64: lwarx r0,0,r8 ; Get the TLBIE lock

tlbie r2 ; Invalidate it everywhere

stw r0,tlbieLock(0) ; Clear the tlbie lock

eieio ; Make sure that the tlbie happens first
tlbsync ; Wait for everyone to catch up
isync
ptesync ; Wait for quiet again

mINoTS64: sync ; Make sure of it all
mINoTS64:
stw r0,tlbieLock(0) ; Clear the tlbie lock

sync ; Make sure of it all

ld r5,8(r3) ; Get the real part
srdi r10,r5,12 ; Change physical address to a ppnum
Expand Down
Loading

0 comments on commit c10cb70

Please sign in to comment.