From 7a2a27b1b9244e6951c341844568fadff0ace6d3 Mon Sep 17 00:00:00 2001
From: Aiken Harris <harraiken91@gmail.com>
Date: Thu, 14 May 2026 18:00:56 +0200
Subject: [PATCH] Consolidate ProcessorBlock and ProcessorNumber into
 ProcessorStructures

---
 sdk/xtadk/amd64/ke.cc    | 3 +--
 sdk/xtadk/i686/ke.cc     | 3 +--
 sdk/xtdk/amd64/ketypes.h | 3 +--
 sdk/xtdk/i686/ketypes.h  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sdk/xtadk/amd64/ke.cc b/sdk/xtadk/amd64/ke.cc
index e28ab7b..b481521 100644
--- a/sdk/xtadk/amd64/ke.cc
+++ b/sdk/xtadk/amd64/ke.cc
@@ -85,8 +85,7 @@ GenerateAssemblyDefinitions(VOID)
     ADK_OFFSET(PROCESSOR_START_BLOCK, Cr3);
     ADK_OFFSET(PROCESSOR_START_BLOCK, Cr4);
     ADK_OFFSET(PROCESSOR_START_BLOCK, EntryPoint);
-    ADK_OFFSET(PROCESSOR_START_BLOCK, ProcessorBlock);
-    ADK_OFFSET(PROCESSOR_START_BLOCK, ProcessorNumber);
+    ADK_OFFSET(PROCESSOR_START_BLOCK, ProcessorStructures);
     ADK_OFFSET(PROCESSOR_START_BLOCK, Stack);
     ADK_OFFSET(PROCESSOR_START_BLOCK, Started);
 }
diff --git a/sdk/xtadk/i686/ke.cc b/sdk/xtadk/i686/ke.cc
index bc3db83..671e9ce 100644
--- a/sdk/xtadk/i686/ke.cc
+++ b/sdk/xtadk/i686/ke.cc
@@ -59,8 +59,7 @@ GenerateAssemblyDefinitions(VOID)
     ADK_OFFSET(PROCESSOR_START_BLOCK, Cr3);
     ADK_OFFSET(PROCESSOR_START_BLOCK, Cr4);
     ADK_OFFSET(PROCESSOR_START_BLOCK, EntryPoint);
-    ADK_OFFSET(PROCESSOR_START_BLOCK, ProcessorBlock);
-    ADK_OFFSET(PROCESSOR_START_BLOCK, ProcessorNumber);
+    ADK_OFFSET(PROCESSOR_START_BLOCK, ProcessorStructures);
     ADK_OFFSET(PROCESSOR_START_BLOCK, Stack);
     ADK_OFFSET(PROCESSOR_START_BLOCK, Started);
 }
diff --git a/sdk/xtdk/amd64/ketypes.h b/sdk/xtdk/amd64/ketypes.h
index 5c972a1..b2d4a37 100644
--- a/sdk/xtdk/amd64/ketypes.h
+++ b/sdk/xtdk/amd64/ketypes.h
@@ -476,8 +476,7 @@ typedef struct _PROCESSOR_START_BLOCK
     ULONG_PTR Cr3;
     ULONG_PTR Cr4;
     PVOID EntryPoint;
-    PVOID ProcessorBlock;
-    ULONG ProcessorNumber;
+    PVOID ProcessorStructures;
     PVOID Stack;
     BOOLEAN Started;
 } PROCESSOR_START_BLOCK, *PPROCESSOR_START_BLOCK;
diff --git a/sdk/xtdk/i686/ketypes.h b/sdk/xtdk/i686/ketypes.h
index b02b98b..1c5b0b3 100644
--- a/sdk/xtdk/i686/ketypes.h
+++ b/sdk/xtdk/i686/ketypes.h
@@ -437,8 +437,7 @@ typedef struct _PROCESSOR_START_BLOCK
     ULONG_PTR Cr3;
     ULONG_PTR Cr4;
     PVOID EntryPoint;
-    PVOID ProcessorBlock;
-    ULONG ProcessorNumber;
+    PVOID ProcessorStructures;
     PVOID Stack;
     BOOLEAN Started;
 } PROCESSOR_START_BLOCK, *PPROCESSOR_START_BLOCK;