[ros-diffs] [gvg] 12765: Since we can load .sym files when defined(DBG) now, enable

Since we can load .sym files when defined(DBG) now, enable
/PROFILE option for defined(DBG) too.
Modified: trunk/reactos/ntoskrnl/Makefile
Modified: trunk/reactos/ntoskrnl/dbg/profile.c
Modified: trunk/reactos/ntoskrnl/kd/kdebug.c
Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c
Modified: trunk/reactos/ntoskrnl/ke/main.c
  _____  

Modified: trunk/reactos/ntoskrnl/Makefile
--- trunk/reactos/ntoskrnl/Makefile	2005-01-03 22:00:39 UTC (rev
12764)
+++ trunk/reactos/ntoskrnl/Makefile	2005-01-03 22:53:21 UTC (rev
12765)
@@ -34,7 +34,7 @@

 
 ifeq ($(KDBG), 1)
 OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o
dbg/rdebug.o \
-                dbg/i386/kdb_help.o dbg/profile.o \
+                dbg/i386/kdb_help.o \
 		../dk/w32/lib/libkjs.a dbg/i386/i386-dis.o
 CFLAGS_KDBG := -I../lib/kjs/include
 preall: all
@@ -45,7 +45,7 @@
 OBJECTS_KDBG :=
 endif
 ifeq ($(DBG_OR_KDBG), 1)
-OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_stabs.o dbg/kdb_symbols.o
+OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_stabs.o dbg/kdb_symbols.o
dbg/profile.o
 endif
 
 TARGET_ASFLAGS = -I./include
  _____  

Modified: trunk/reactos/ntoskrnl/dbg/profile.c
--- trunk/reactos/ntoskrnl/dbg/profile.c	2005-01-03 22:00:39 UTC
(rev 12764)
+++ trunk/reactos/ntoskrnl/dbg/profile.c	2005-01-03 22:53:21 UTC
(rev 12765)
@@ -16,8 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: profile.c,v 1.10 2004/10/22 20:16:47 ekohl Exp $
- *
+/* 
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/dbg/profile.c
  * PURPOSE:         Kernel profiling
  _____  

Modified: trunk/reactos/ntoskrnl/kd/kdebug.c
--- trunk/reactos/ntoskrnl/kd/kdebug.c	2005-01-03 22:00:39 UTC (rev
12764)
+++ trunk/reactos/ntoskrnl/kd/kdebug.c	2005-01-03 22:53:21 UTC (rev
12765)
@@ -1,5 +1,4 @@

-/* $Id: kdebug.c,v 1.58 2004/12/14 10:18:57 gvg Exp $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/kd/kdebug.c
@@ -243,7 +242,7 @@
 		}
 	    }
 	}
-#ifdef KDBG
+#if defined(KDBG) || defined(DBG)
     else if (!_strnicmp(p2, "PROFILE", 7)  && BootPhase > 0)
       {
         KdbInitProfiling();
  _____  

Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c
--- trunk/reactos/ntoskrnl/ke/i386/irq.c	2005-01-03 22:00:39 UTC
(rev 12764)
+++ trunk/reactos/ntoskrnl/ke/i386/irq.c	2005-01-03 22:53:21 UTC
(rev 12765)
@@ -16,8 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
- *
+/*
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/i386/irq.c
  * PURPOSE:         IRQ handling
@@ -37,7 +36,7 @@
 /* INCLUDES
****************************************************************/
 
 #include <ntoskrnl.h>
-#ifdef KDBG
+#if defined(KDBG) || defined(DBG)
 #include <../dbg/kdb.h>
 #endif /* KDBG */
 
@@ -358,7 +357,7 @@
    {
       KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame);
       KeUpdateSystemTime(&KernelTrapFrame, old_level);
-#ifdef KDBG
+#if defined(KDBG) || defined(DBG)
       KdbProfileInterrupt(Trapframe->Eip);
 #endif /* KDBG */
    }
  _____  

Modified: trunk/reactos/ntoskrnl/ke/main.c
--- trunk/reactos/ntoskrnl/ke/main.c	2005-01-03 22:00:39 UTC (rev
12764)
+++ trunk/reactos/ntoskrnl/ke/main.c	2005-01-03 22:53:21 UTC (rev
12765)
@@ -16,8 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
- *
+/*
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/main.c
  * PURPOSE:         Initalizes the kernel
@@ -705,7 +704,7 @@
     KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE);
   }
 
-#ifdef KDBG
+#if defined(KDBG) || defined(DBG)
   KdbInitProfiling2();
 #endif /* KDBG */