mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-23 19:43:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy _KeNumberProcessors hack. While we are at it fix its type (CCHAR not UCHAR) and remove it from the NDK as it is a public global provided by the DDK (where we properly define it with the "__CREATE_NTOS_DATA_IMPORT_ALIAS" fix when needed. Also, the variable KeActiveProcessors is not even exported from NTOS so move it to an internal header. Fix missed fix in UDFS as well in uncompiled file.

Browse Source 
svn path=/trunk/; revision=69416
This commit is contained in:
Stefan Ginsberg 2015-09-29 18:34:33 +00:00
parent 1129e7a935
commit 0fbe4b9b8e
8 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reactos/drivers/filesystems/udfs/dldetect.cpp
View File

@ -50,7 +50,7 @@ THREAD_REC_BLOCK DLDThreadAcquireChain[DLD_MAX_REC_LEVEL];
/// Initialize deadlock detector
VOID DLDInit(ULONG MaxThrdCount /// Maximum supported number of threads
) {
if (*KeNumberProcessors>1) {
if (KeNumberProcessors>1) {
KdPrint(("Deadlock Detector is designed for uniprocessor machines only!\n"));
BrutePoint();
}

2
reactos/drivers/network/ndis/ndis/misc.c
View File

@ -324,7 +324,7 @@ EXPORT
NdisSystemProcessorCount(
VOID)
{
return (CCHAR)KeNumberProcessors;
return KeNumberProcessors;
}

11
reactos/include/ndk/ketypes.h
View File

@ -1480,17 +1480,6 @@ extern struct _LOADER_PARAMETER_BLOCK NTSYSAPI *KeLoaderBlock;
//
// Exported Hardware Data
//
extern KAFFINITY NTSYSAPI KeActiveProcessors;
#if (NTDDI_VERSION >= NTDDI_LONGHORN)
extern volatile CCHAR NTSYSAPI KeNumberProcessors;
#else
#if (NTDDI_VERSION >= NTDDI_WINXP)
extern CCHAR NTSYSAPI KeNumberProcessors;
#else
//extern PCCHAR KeNumberProcessors;
extern NTSYSAPI CCHAR KeNumberProcessors; //FIXME: Note to Alex: I won't fix this atm, since I prefer to discuss this with you first.
#endif
#endif
extern ULONG NTSYSAPI KiDmaIoCoherency;
extern ULONG NTSYSAPI KeMaximumIncrement;
extern ULONG NTSYSAPI KeMinimumIncrement;

1
reactos/ntoskrnl/include/internal/ke.h
View File

@ -78,6 +78,7 @@ typedef PCHAR
IN ULONG Length
);
extern KAFFINITY KeActiveProcessors;
extern PKNMI_HANDLER_CALLBACK KiNmiCallbackListHead;
extern KSPIN_LOCK KiNmiCallbackListLock;
extern PVOID KeUserApcDispatcher;

5
reactos/ntoskrnl/include/ntoskrnl.h
View File

@ -88,11 +88,6 @@
/* PNP GUIDs */
#include <umpnpmgr/sysguid.h>
//
// Define the internal versions of external and public global data
//
#define KeNumberProcessors _KeNumberProcessors
extern UCHAR _KeNumberProcessors;
#define ExRaiseStatus RtlRaiseStatus
//

2
reactos/ntoskrnl/ke/amd64/kiinit.c
View File

@ -385,7 +385,7 @@ KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
KeLoaderBlock = LoaderBlock;
/* Get the current CPU number */
Cpu = (CCHAR)KeNumberProcessors++; // FIXME
Cpu = KeNumberProcessors++; // FIXME
/* LoaderBlock initialization for Cpu 0 */
if (Cpu == 0)

2
reactos/ntoskrnl/ke/krnlinit.c
View File

@ -32,7 +32,7 @@ PLOADER_PARAMETER_BLOCK KeLoaderBlock;
PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS];
/* Number of processors */
UCHAR KeNumberProcessors = 0;
CCHAR KeNumberProcessors = 0;
/* NUMA Node Support */
KNODE KiNode0;

2
reactos/ntoskrnl/ntoskrnl.spec
View File

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