powerpc/pseries: Do not save the previous DTL mask value

[linux-2.6-block.git] / arch / powerpc / platforms / pseries / dtl.c

diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index ef6595153642e3af4b5f52b300cbb3dd7d6b6d1f..fb05804adb2f1a4dd77730f75bce6a75d67807e6 100644 (file)
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -40,13 +40,7 @@ struct dtl {
 };
 static DEFINE_PER_CPU(struct dtl, cpu_dtl);
 
-/*
- * Dispatch trace log event mask:
- * 0x7: 0x1: voluntary virtual processor waits
- *      0x2: time-slice preempts
- *      0x4: virtual partition memory page faults
- */
-static u8 dtl_event_mask = 0x7;
+static u8 dtl_event_mask = DTL_LOG_ALL;
 
 
 /*
@@ -61,7 +55,6 @@ struct dtl_ring {
        struct dtl_entry *write_ptr;
        struct dtl_entry *buf;
        struct dtl_entry *buf_end;
-       u8      saved_dtl_mask;
 };
 
 static DEFINE_PER_CPU(struct dtl_ring, dtl_rings);
@@ -111,7 +104,6 @@ static int dtl_start(struct dtl *dtl)
        dtlr->write_ptr = dtl->buf;
 
        /* enable event logging */
-       dtlr->saved_dtl_mask = lppaca_of(dtl->cpu).dtl_enable_mask;
        lppaca_of(dtl->cpu).dtl_enable_mask |= dtl_event_mask;
 
        dtl_consumer = consume_dtle;
@@ -129,7 +121,7 @@ static void dtl_stop(struct dtl *dtl)
        dtlr->buf = NULL;
 
        /* restore dtl_enable_mask */
-       lppaca_of(dtl->cpu).dtl_enable_mask = dtlr->saved_dtl_mask;
+       lppaca_of(dtl->cpu).dtl_enable_mask = DTL_LOG_PREEMPT;
 
        if (atomic_dec_and_test(&dtl_count))
                dtl_consumer = NULL;