---

yaml
---
r: 348351
b: refs/heads/master
c: b5811bc
h: refs/heads/master
i:
  348349: 2cf4971
  348347: 6af9ba2
  348343: 981674b
  348335: b2c6b57
  348319: 159d53f
  348287: bd41351
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56836fb4dab8fe906b934b231b04c33c180f8da5
+refs/heads/master: b5811bc469c0dbebb4f947800b9b234a9c0a68dc

trunk/drivers/cpufreq/longhaul.c

@@ -77,7 +77,7 @@ static unsigned int longhaul_index;
 static int scale_voltage;
 static int disable_acpi_c3;
 static int revid_errata;
-
+static int enable;
 
 /* Clock ratios multiplied by 10 */
 static int mults[32];
@@ -965,6 +965,10 @@ static int __init longhaul_init(void)
 	if (!x86_match_cpu(longhaul_id))
 		return -ENODEV;
 
+	if (!enable) {
+		printk(KERN_ERR PFX "Option \"enable\" not set. Aborting.\n");
+		return -ENODEV;
+	}
 #ifdef CONFIG_SMP
 	if (num_online_cpus() > 1) {
 		printk(KERN_ERR PFX "More than 1 CPU detected, "
@@ -1021,6 +1025,10 @@ MODULE_PARM_DESC(scale_voltage, "Scale voltage of processor");
  * such. */
 module_param(revid_errata, int, 0644);
 MODULE_PARM_DESC(revid_errata, "Ignore CPU Revision ID");
+/* By default driver is disabled to prevent incompatible
+ * system freeze. */
+module_param(enable, int, 0644);
+MODULE_PARM_DESC(enable, "Enable driver");
 
 MODULE_AUTHOR("Dave Jones <davej@redhat.com>");
 MODULE_DESCRIPTION("Longhaul driver for VIA Cyrix processors.");