[NTOSKRNL]

Make KeNumberProcessors internally an UCHAR and move it into krnlinit.c instead of having it once per architecture. Fixes a bunch of MSVC warnings.

svn path=/trunk/; revision=53618
This commit is contained in:
Timo Kreuzer 2011-09-07 13:43:54 +00:00
parent 6c556c3422
commit 7c062d812b
7 changed files with 58 additions and 60 deletions

View file

@ -106,6 +106,8 @@
#define KdDebuggerNotPresent _KdDebuggerNotPresent #define KdDebuggerNotPresent _KdDebuggerNotPresent
#define NlsOemLeadByteInfo _NlsOemLeadByteInfo #define NlsOemLeadByteInfo _NlsOemLeadByteInfo
extern PUSHORT _NlsOemLeadByteInfo; extern PUSHORT _NlsOemLeadByteInfo;
#define KeNumberProcessors _KeNumberProcessors
extern UCHAR _KeNumberProcessors;
#define FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray #define FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray
#undef LEGAL_ANSI_CHARACTER_ARRAY #undef LEGAL_ANSI_CHARACTER_ARRAY
#undef NLS_MB_CODE_PAGE_TAG #undef NLS_MB_CODE_PAGE_TAG

View file

@ -35,7 +35,6 @@ ULONG KeI386MachineType;
ULONG KeI386NpxPresent = 1; ULONG KeI386NpxPresent = 1;
ULONG KeLargestCacheLine = 0x40; ULONG KeLargestCacheLine = 0x40;
ULONG KiDmaIoCoherency = 0; ULONG KiDmaIoCoherency = 0;
CHAR KeNumberProcessors = 0;
KAFFINITY KeActiveProcessors = 1; KAFFINITY KeActiveProcessors = 1;
BOOLEAN KiSMTProcessorsPresent; BOOLEAN KiSMTProcessorsPresent;

View file

@ -17,7 +17,6 @@
ULONG KeFixedTbEntries; ULONG KeFixedTbEntries;
ULONG KiDmaIoCoherency; ULONG KiDmaIoCoherency;
ULONG KeIcacheFlushCount = 0; ULONG KeIcacheFlushCount = 0;
CCHAR KeNumberProcessors;
ULONG KeDcacheFlushCount; ULONG KeDcacheFlushCount;
ULONG KeActiveProcessors; ULONG KeActiveProcessors;
ULONG KeProcessorArchitecture; ULONG KeProcessorArchitecture;

View file

@ -41,7 +41,6 @@ ULONG KeDcacheFlushCount = 0;
ULONG KeIcacheFlushCount = 0; ULONG KeIcacheFlushCount = 0;
ULONG KiDmaIoCoherency = 0; ULONG KiDmaIoCoherency = 0;
ULONG KePrefetchNTAGranularity = 32; ULONG KePrefetchNTAGranularity = 32;
CHAR KeNumberProcessors = 0;
KAFFINITY KeActiveProcessors = 1; KAFFINITY KeActiveProcessors = 1;
BOOLEAN KiI386PentiumLockErrataPresent; BOOLEAN KiI386PentiumLockErrataPresent;
BOOLEAN KiSMTProcessorsPresent; BOOLEAN KiSMTProcessorsPresent;

View file

@ -23,7 +23,6 @@ ULONG KeLargestCacheLine = 0x40;
ULONG KeDcacheFlushCount = 0; ULONG KeDcacheFlushCount = 0;
ULONG KeIcacheFlushCount = 0; ULONG KeIcacheFlushCount = 0;
ULONG KiDmaIoCoherency = 0; ULONG KiDmaIoCoherency = 0;
CHAR KeNumberProcessors;
KAFFINITY KeActiveProcessors = 1; KAFFINITY KeActiveProcessors = 1;
BOOLEAN KiSMTProcessorsPresent; BOOLEAN KiSMTProcessorsPresent;

View file

@ -645,7 +645,7 @@
@ stdcall KeLeaveCriticalRegion() _KeLeaveCriticalRegion @ stdcall KeLeaveCriticalRegion() _KeLeaveCriticalRegion
@ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion @ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion
@ extern KeLoaderBlock @ extern KeLoaderBlock
@ extern KeNumberProcessors @ extern KeNumberProcessors _KeNumberProcessors
@ stdcall KeProfileInterrupt(ptr) @ stdcall KeProfileInterrupt(ptr)
@ stdcall KeProfileInterruptWithSource(ptr long) @ stdcall KeProfileInterruptWithSource(ptr long)
@ stdcall KePulseEvent(ptr long long) @ stdcall KePulseEvent(ptr long long)

View file

@ -628,7 +628,7 @@
@ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion @ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion
@ extern KeLoaderBlock @ extern KeLoaderBlock
@ cdecl -arch=x86_64 KeLowerIrql(long) @ cdecl -arch=x86_64 KeLowerIrql(long)
@ extern KeNumberProcessors @ extern KeNumberProcessors _KeNumberProcessors
@ stdcall -arch=i386,arm KeProfileInterrupt(ptr) @ stdcall -arch=i386,arm KeProfileInterrupt(ptr)
@ stdcall KeProfileInterruptWithSource(ptr long) @ stdcall KeProfileInterruptWithSource(ptr long)
@ stdcall KePulseEvent(ptr long long) @ stdcall KePulseEvent(ptr long long)