Merge branch 'master' into memmgr

xtoskrnl/includes/ar/amd64/asmsup.h

@@ -56,6 +56,8 @@
 #define TrapSegEs                               330
 #define TrapSegFs                               332
 #define TrapSegGs                               334
+#define TrapRsp                                 496
+#define TrapSegSs                               504
 
 /* KTRAP_FRAME length related definitions */
 #define TRAP_FRAME_SIZE                         512

xtoskrnl/includes/ar/i686/asmsup.h

@@ -24,9 +24,11 @@
 #define TrapSegEs                               38
 #define TrapSegFs                               40
 #define TrapSegGs                               42
+#define TrapEsp                                 92
+#define TrapSegSs                               96
 
 /* KTRAP_FRAME length related definitions */
 #define TRAP_FRAME_SIZE                         100
 #define TRAP_REGISTERS_SIZE                     56
 
-#endif /* __XTOSKRNL_AMD64_ASMSUP_H */
+#endif /* __XTOSKRNL_I686_ASMSUP_H */

xtoskrnl/includes/ke/spinlock.hh

@@ -69,17 +69,18 @@ namespace KE
     class SpinLockGuard
     {
         private:
-            PKSPIN_LOCK SpinLock;
+            PKSPIN_LOCK Lock;
 
         public:
             SpinLockGuard(IN OUT PKSPIN_LOCK SpinLock)
             {
-                KE::SpinLock::AcquireSpinLock(SpinLock);
+                Lock = SpinLock;
+                KE::SpinLock::AcquireSpinLock(Lock);
             }
 
             ~SpinLockGuard()
             {
-                KE::SpinLock::ReleaseSpinLock(SpinLock);
+                KE::SpinLock::ReleaseSpinLock(Lock);
             }
 
             SpinLockGuard(const SpinLockGuard&) = delete;