From 5b941962ea9e69deb11fcd51c9acd7f0e51cbb5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Bilski?= Date: Sat, 15 Dec 2012 00:45:02 +0100 Subject: [PATCH] --- yaml --- r: 348351 b: refs/heads/master c: b5811bc469c0dbebb4f947800b9b234a9c0a68dc h: refs/heads/master i: 348349: 2cf4971e8bd231bcd0da303058de21548eec6d4e 348347: 6af9ba28938b3aec348710b2cb45d828f25d1b6d 348343: 981674b89d0617ccf24ee3dc5f13209ccdbce802 348335: b2c6b579a97d273d091ad999a157e40d17c6107b 348319: 159d53fa69483afc014ca77cf0da2a21096f0740 348287: bd413513a0ea119d3e09d5510d2ca64837c71b83 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/longhaul.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d5b259d1506b..2f06fa1a1ad0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56836fb4dab8fe906b934b231b04c33c180f8da5 +refs/heads/master: b5811bc469c0dbebb4f947800b9b234a9c0a68dc diff --git a/trunk/drivers/cpufreq/longhaul.c b/trunk/drivers/cpufreq/longhaul.c index f1fa500ac105..1180d536d1eb 100644 --- a/trunk/drivers/cpufreq/longhaul.c +++ b/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 "); MODULE_DESCRIPTION("Longhaul driver for VIA Cyrix processors.");