1 files changed, 12 insertions, 4 deletions

diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index 54cdbf1a40f..c02541e6e65 100644
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -120,7 +120,9 @@ int reserve_perfctr_nmi(unsigned int msr)
         unsigned int counter;
 
         counter = nmi_perfctr_msr_to_bit(msr);
-        BUG_ON(counter > NMI_MAX_COUNTER_BITS);
+        /* register not managed by the allocator? */
+        if (counter > NMI_MAX_COUNTER_BITS)
+                return 1;
 
         if (!test_and_set_bit(counter, perfctr_nmi_owner))
                 return 1;
@@ -132,7 +134,9 @@ void release_perfctr_nmi(unsigned int msr)
         unsigned int counter;
 
         counter = nmi_perfctr_msr_to_bit(msr);
-        BUG_ON(counter > NMI_MAX_COUNTER_BITS);
+        /* register not managed by the allocator? */
+        if (counter > NMI_MAX_COUNTER_BITS)
+                return;
 
         clear_bit(counter, perfctr_nmi_owner);
 }
@@ -142,7 +146,9 @@ int reserve_evntsel_nmi(unsigned int msr)
         unsigned int counter;
 
         counter = nmi_evntsel_msr_to_bit(msr);
-        BUG_ON(counter > NMI_MAX_COUNTER_BITS);
+        /* register not managed by the allocator? */
+        if (counter > NMI_MAX_COUNTER_BITS)
+                return 1;
 
         if (!test_and_set_bit(counter, evntsel_nmi_owner))
                 return 1;
@@ -154,7 +160,9 @@ void release_evntsel_nmi(unsigned int msr)
         unsigned int counter;
 
         counter = nmi_evntsel_msr_to_bit(msr);
-        BUG_ON(counter > NMI_MAX_COUNTER_BITS);
+        /* register not managed by the allocator? */
+        if (counter > NMI_MAX_COUNTER_BITS)
+                return;
 
         clear_bit(counter, evntsel_nmi_owner);
 }