4 files changed, 21 insertions, 17 deletions

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index eda5b0ca4af2..17bbf6f91fbe 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -312,6 +312,7 @@ good_area:
         }
         if (ret & VM_FAULT_MAJOR) {
                 current->maj_flt++;
+                perf_swcounter_event(PERF_COUNT_PAGE_FAULTS_MAJ, 1, 0, regs);
 #ifdef CONFIG_PPC_SMLPAR
                 if (firmware_has_feature(FW_FEATURE_CMO)) {
                         preempt_disable();
@@ -319,8 +320,10 @@ good_area:
                         preempt_enable();
                 }
 #endif
-        } else
+        } else {
                 current->min_flt++;
+                perf_swcounter_event(PERF_COUNT_PAGE_FAULTS_MIN, 1, 0, regs);
+        }
         up_read(&mm->mmap_sem);
         return 0;
 
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index c8725752b6cd..f2d3324d9215 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -1140,10 +1140,13 @@ good_area:
                 return;
         }
 
-        if (fault & VM_FAULT_MAJOR)
+        if (fault & VM_FAULT_MAJOR) {
                 tsk->maj_flt++;
-        else
+                perf_swcounter_event(PERF_COUNT_PAGE_FAULTS_MAJ, 1, 0, regs);
+        } else {
                 tsk->min_flt++;
+                perf_swcounter_event(PERF_COUNT_PAGE_FAULTS_MIN, 1, 0, regs);
+        }
 
         check_v8086_mode(regs, address, tsk);
 
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 3fefc3b8150d..4b14a8e9dbf5 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -49,8 +49,10 @@ enum hw_event_types {
         PERF_COUNT_PAGE_FAULTS          = -3,
         PERF_COUNT_CONTEXT_SWITCHES     = -4,
         PERF_COUNT_CPU_MIGRATIONS       = -5,
+        PERF_COUNT_PAGE_FAULTS_MIN      = -6,
+        PERF_COUNT_PAGE_FAULTS_MAJ      = -7,
 
-        PERF_SW_EVENTS_MIN              = -6,
+        PERF_SW_EVENTS_MIN              = -8,
 };
 
 /*
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 1773c5d7427d..68950a3a52bf 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1503,6 +1503,12 @@ static void perf_swcounter_disable(struct perf_counter *counter)
         perf_swcounter_update(counter);
 }
 
+static const struct hw_perf_counter_ops perf_ops_generic = {
+        .enable         = perf_swcounter_enable,
+        .disable        = perf_swcounter_disable,
+        .read           = perf_swcounter_read,
+};
+
 /*
  * Software counter: cpu wall time clock
  */
@@ -1604,16 +1610,6 @@ static const struct hw_perf_counter_ops perf_ops_task_clock = {
 };
 
 /*
- * Software counter: page faults
- */
-
-static const struct hw_perf_counter_ops perf_ops_page_faults = {
-        .enable         = perf_swcounter_enable,
-        .disable        = perf_swcounter_disable,
-        .read           = perf_swcounter_read,
-};
-
-/*
  * Software counter: context switches
  */
 
@@ -1753,9 +1749,9 @@ sw_perf_counter_init(struct perf_counter *counter)
                         hw_ops = &perf_ops_cpu_clock;
                 break;
         case PERF_COUNT_PAGE_FAULTS:
-                if (!(counter->hw_event.exclude_user ||
-                      counter->hw_event.exclude_kernel))
-                        hw_ops = &perf_ops_page_faults;
+        case PERF_COUNT_PAGE_FAULTS_MIN:
+        case PERF_COUNT_PAGE_FAULTS_MAJ:
+                hw_ops = &perf_ops_generic;
                 break;
         case PERF_COUNT_CONTEXT_SWITCHES:
                 if (!counter->hw_event.exclude_kernel)