Index: /trunk/src/VBox/VMM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/Makefile.kmk	(revision 50808)
+++ /trunk/src/VBox/VMM/Makefile.kmk	(revision 50809)
@@ -107,4 +107,7 @@
 ifdef VBOX_WITH_RAW_MODE
  VBoxVMM_DEFS   += VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0
+endif
+ifdef VBOX_WITH_VMM_R0_SWITCH_STACK
+ VBoxVMM_DEFS   += VMM_R0_SWITCH_STACK
 endif
 VBoxVMM_DEFS.darwin = VMM_R0_SWITCH_STACK
@@ -399,4 +402,7 @@
 
  VMMRC_DEFS      = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0 $(VMM_COMMON_DEFS)
+ ifdef VBOX_WITH_VMM_R0_SWITCH_STACK
+  VMMRC_DEFS    += VMM_R0_SWITCH_STACK
+ endif
  ifeq ($(KBUILD_TARGET_ARCH),x86)
   VMMRC_DEFS.darwin = VMM_R0_SWITCH_STACK
@@ -515,4 +521,7 @@
   VMMR0_DEFS    += VBOX_WITH_RAW_MODE
  endif
+ ifdef VBOX_WITH_VMM_R0_SWITCH_STACK
+  VMMR0_DEFS    += VMM_R0_SWITCH_STACK
+ endif
  VMMR0_DEFS.darwin = VMM_R0_SWITCH_STACK
  VMMR0_DEFS.darwin.x86 = \