Merge the rest from header branch.

[reactos.git] / reactos / include / ndk / ketypes.h

diff --git a/reactos/include/ndk/ketypes.h b/reactos/include/ndk/ketypes.h
index a161d79..6798537 100644 (file)
--- a/reactos/include/ndk/ketypes.h
+++ b/reactos/include/ndk/ketypes.h
@@ -546,17 +546,6 @@ typedef enum _KAPC_ENVIRONMENT
     InsertApcEnvironment
 } KAPC_ENVIRONMENT;
 
-//
-// CPU Cache Types      
-//      
-typedef enum _PROCESSOR_CACHE_TYPE      
-{
-    CacheUnified,       
-    CacheInstruction,   
-    CacheData,          
-    CacheTrace,         
-} PROCESSOR_CACHE_TYPE;
-
 //
 // PRCB DPC Data
 //
@@ -577,18 +566,6 @@ typedef struct _PP_LOOKASIDE_LIST
     struct _GENERAL_LOOKASIDE *L;
 } PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST;
 
-//
-// CPU Cache Descriptor         
-//      
-typedef struct _CACHE_DESCRIPTOR        
-{
-    UCHAR Level;        
-    UCHAR Associativity;        
-    USHORT LineSize;    
-    ULONG Size;         
-    PROCESSOR_CACHE_TYPE Type;          
-} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR;
-
 //
 // Architectural Types
 //
@@ -957,10 +934,10 @@ typedef struct _KPROCESS
     DISPATCHER_HEADER Header;
     LIST_ENTRY ProfileListHead;
 #if (NTDDI_VERSION >= NTDDI_LONGHORN)
-    ULONG_PTR DirectoryTableBase;
-    ULONG_PTR Unused0;
+    ULONG DirectoryTableBase;
+    ULONG Unused0;
 #else
-    ULONG_PTR DirectoryTableBase[2];
+    ULONG DirectoryTableBase[2];
 #endif
 #if defined(_M_IX86)
     KGDTENTRY LdtDescriptor;