tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 529980c8 e3e3679c

+18 -14
+2 -2
arch/i386/kernel/cpu/cpufreq/longhaul.c
··· 467 467 } 468 468 469 469 if (vrmrev==0) { 470 - dprintk ("VRM 8.5 \n"); 470 + dprintk ("VRM 8.5\n"); 471 471 memcpy (voltage_table, vrm85scales, sizeof(voltage_table)); 472 472 numvscales = (voltage_table[maxvid]-voltage_table[minvid])/25; 473 473 } else { 474 - dprintk ("Mobile VRM \n"); 474 + dprintk ("Mobile VRM\n"); 475 475 memcpy (voltage_table, mobilevrmscales, sizeof(voltage_table)); 476 476 numvscales = (voltage_table[maxvid]-voltage_table[minvid])/5; 477 477 }
+10 -10
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
··· 259 259 260 260 if (model->op_points == NULL) { 261 261 /* Matched a non-match */ 262 - dprintk(KERN_INFO PFX "no table support for CPU model \"%s\": \n", 262 + dprintk(KERN_INFO PFX "no table support for CPU model \"%s\"\n", 263 263 cpu->x86_model_id); 264 264 #ifndef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI 265 265 dprintk(KERN_INFO PFX "try compiling with CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI enabled\n"); ··· 402 402 403 403 for (i=0; i<p.state_count; i++) { 404 404 if (p.states[i].control != p.states[i].status) { 405 - dprintk("Different control (%x) and status values (%x)\n", 405 + dprintk("Different control (%llu) and status values (%llu)\n", 406 406 p.states[i].control, p.states[i].status); 407 407 result = -EINVAL; 408 408 goto err_unreg; ··· 415 415 } 416 416 417 417 if (p.states[i].core_frequency > p.states[0].core_frequency) { 418 - dprintk("P%u has larger frequency (%u) than P0 (%u), skipping\n", i, 418 + dprintk("P%u has larger frequency (%llu) than P0 (%llu), skipping\n", i, 419 419 p.states[i].core_frequency, p.states[0].core_frequency); 420 420 p.states[i].core_frequency = 0; 421 421 continue; ··· 498 498 if (cpu->x86_vendor != X86_VENDOR_INTEL || !cpu_has(cpu, X86_FEATURE_EST)) 499 499 return -ENODEV; 500 500 501 - for (i = 0; i < N_IDS; i++) 502 - if (centrino_verify_cpu_id(cpu, &cpu_ids[i])) 503 - break; 504 - 505 - if (i != N_IDS) 506 - centrino_cpu[policy->cpu] = &cpu_ids[i]; 507 - 508 501 if (is_const_loops_cpu(policy->cpu)) { 509 502 centrino_driver.flags |= CPUFREQ_CONST_LOOPS; 510 503 } ··· 505 512 if (centrino_cpu_init_acpi(policy)) { 506 513 if (policy->cpu != 0) 507 514 return -ENODEV; 515 + 516 + for (i = 0; i < N_IDS; i++) 517 + if (centrino_verify_cpu_id(cpu, &cpu_ids[i])) 518 + break; 519 + 520 + if (i != N_IDS) 521 + centrino_cpu[policy->cpu] = &cpu_ids[i]; 508 522 509 523 if (!centrino_cpu[policy->cpu]) { 510 524 dprintk(KERN_INFO PFX "found unsupported CPU with "
+1 -1
arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
··· 99 99 u32 function = GET_SPEEDSTEP_FREQS; 100 100 101 101 if (!(ist_info.event & 0xFFFF)) { 102 - dprintk("bug #1422 -- can't read freqs from BIOS\n", result); 102 + dprintk("bug #1422 -- can't read freqs from BIOS\n"); 103 103 return -ENODEV; 104 104 } 105 105
+5 -1
drivers/cpufreq/cpufreq.c
··· 627 627 628 628 ret = kobject_register(&policy->kobj); 629 629 if (ret) 630 - goto err_out; 630 + goto err_out_driver_exit; 631 631 632 632 /* set up files for this cpu device */ 633 633 drv_attr = cpufreq_driver->attr; ··· 672 672 673 673 kobject_unregister(&policy->kobj); 674 674 wait_for_completion(&policy->kobj_unregister); 675 + 676 + err_out_driver_exit: 677 + if (cpufreq_driver->exit) 678 + cpufreq_driver->exit(policy); 675 679 676 680 err_out: 677 681 kfree(policy);