update for v2.6.17

[lttv.git] / genevent / genevent.c

diff --git a/genevent/genevent.c b/genevent/genevent.c
index 88fbde1576e54d7ba313834f880542407047ff0b..faf362e5543426dd05d4124f073e9c89435cf6de 100644 (file)
--- a/genevent/genevent.c
+++ b/genevent/genevent.c
@@ -1508,7 +1508,7 @@ int print_event_logging_function(char *basename, facility_t *fac,
        print_tabs(1, fd);
        fprintf(fd, "preempt_disable();\n");
        print_tabs(1, fd);
-       fprintf(fd, "ltt_nesting[smp_processor_id()]++;\n");
+       fprintf(fd, "current->ltt_nesting++;\n");
 
        /* Get facility index */
 
@@ -1632,7 +1632,7 @@ int print_event_logging_function(char *basename, facility_t *fac,
 
        /* Release locks */
        print_tabs(1, fd);
-       fprintf(fd, "ltt_nesting[smp_processor_id()]--;\n");
+       fprintf(fd, "current->ltt_nesting--;\n");
        print_tabs(1, fd);
        fprintf(fd, "preempt_enable_no_resched();\n");
 
@@ -2485,13 +2485,13 @@ int print_loader_header(facility_t *fac)
   fprintf(fd,"ltt_facility_t\tltt_facility_%s_%X;\n\n",
                        fac->name, fac->checksum);
 
-  fprintf(fd,"#define LTT_FACILITY_SYMBOL\t\t\t\t\t\t\tltt_facility_%s\n",
+  fprintf(fd,"#define LTT_FACILITY_SYMBOL\t\tltt_facility_%s\n",
       fac->name);
-  fprintf(fd,"#define LTT_FACILITY_CHECKSUM_SYMBOL\t\tltt_facility_%s_%X\n",
+  fprintf(fd,"#define LTT_FACILITY_CHECKSUM_SYMBOL\tltt_facility_%s_%X\n",
       fac->name, fac->checksum);
-  fprintf(fd,"#define LTT_FACILITY_CHECKSUM\t\t\t\t\t\t0x%X\n", fac->checksum);
-  fprintf(fd,"#define LTT_FACILITY_NAME\t\t\t\t\t\t\t\t\"%s\"\n", fac->name);
-  fprintf(fd,"#define LTT_FACILITY_NUM_EVENTS\t\t\t\t\tfacility_%s_num_events\n\n",
+  fprintf(fd,"#define LTT_FACILITY_CHECKSUM\t\t0x%X\n", fac->checksum);
+  fprintf(fd,"#define LTT_FACILITY_NAME\t\t\"%s\"\n", fac->name);
+  fprintf(fd,"#define LTT_FACILITY_NUM_EVENTS\tfacility_%s_num_events\n\n",
                        fac->name);
   fprintf(fd, "#endif //CONFIG_LTT\n\n");
   fprintf(fd, "#endif //_LTT_FACILITY_LOADER_%s_H_\n", fac->capname);