Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Report the number of processors in PowerNow-k8 correctly
  [CPUFREQ] do not declare undefined functions
  [CPUFREQ] cleanup kconfig options
  [CPUFREQ] Longhaul - Revert Longhaul ver. 2
  [CPUFREQ] Remove deprecated /proc/acpi/processor/performance write support
  [CPUFREQ] Fix limited cpufreq when booted on battery
  Fix preemption warnings in speedstep-centrino.c
  [CPUFREQ] Longhaul - Correct PCI code
  [CPUFREQ] p4-clockmod: switch to rdmsr_on_cpu/wrmsr_on_cpu

1 files changed, 1 insertions, 45 deletions

diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 2f2e7964226d..c4efc0c17f8f 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -433,49 +433,6 @@ static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file)
                            PDE(inode)->data);
 }
 
-static ssize_t
-acpi_processor_write_performance(struct file *file,
-                                 const char __user * buffer,
-                                 size_t count, loff_t * data)
-{
-        int result = 0;
-        struct seq_file *m = file->private_data;
-        struct acpi_processor *pr = m->private;
-        struct acpi_processor_performance *perf;
-        char state_string[12] = { '\0' };
-        unsigned int new_state = 0;
-        struct cpufreq_policy policy;
-
-
-        if (!pr || (count > sizeof(state_string) - 1))
-                return -EINVAL;
-
-        perf = pr->performance;
-        if (!perf)
-                return -EINVAL;
-
-        if (copy_from_user(state_string, buffer, count))
-                return -EFAULT;
-
-        state_string[count] = '\0';
-        new_state = simple_strtoul(state_string, NULL, 0);
-
-        if (new_state >= perf->state_count)
-                return -EINVAL;
-
-        cpufreq_get_policy(&policy, pr->id);
-
-        policy.cpu = pr->id;
-        policy.min = perf->states[new_state].core_frequency * 1000;
-        policy.max = perf->states[new_state].core_frequency * 1000;
-
-        result = cpufreq_set_policy(&policy);
-        if (result)
-                return result;
-
-        return count;
-}
-
 static void acpi_cpufreq_add_file(struct acpi_processor *pr)
 {
         struct proc_dir_entry *entry = NULL;
@@ -487,10 +444,9 @@ static void acpi_cpufreq_add_file(struct acpi_processor *pr)
 
         /* add file 'performance' [R/W] */
         entry = create_proc_entry(ACPI_PROCESSOR_FILE_PERFORMANCE,
-                                  S_IFREG | S_IRUGO | S_IWUSR,
+                                  S_IFREG | S_IRUGO,
                                   acpi_device_dir(device));
         if (entry){
-                acpi_processor_perf_fops.write = acpi_processor_write_performance;
                 entry->proc_fops = &acpi_processor_perf_fops;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;