/[pkgs]/rpms/kernel/F-9/disable-p4-cpufreq-ui.patch
ViewVC logotype

Contents of /rpms/kernel/F-9/disable-p4-cpufreq-ui.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Mon Jan 12 19:54:16 2009 UTC (10 months, 1 week ago) by kyle
Branch: MAIN
CVS Tags: kernel-2_6_28-1_fc9, kernel-2_6_28-2_fc9, HEAD
File MIME type: text/x-patch 
* Mon Jan 12 2009 Kyle McMartin <kyle@redhat.com>
- Rebase for Fedora 9.
- Turn off CONFIG_MAXSMP on x86_64.
1 diff -ur linux-2.6.27.noarch/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c linux-2.6.27.noarch.p4/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
2 --- linux-2.6.27.noarch/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c 2008-11-03 17:14:03.000000000 +0000
3 +++ linux-2.6.27.noarch.p4/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c 2008-11-03 17:18:38.000000000 +0000
4 @@ -274,6 +274,7 @@
5 .name = "p4-clockmod",
6 .owner = THIS_MODULE,
7 .attr = p4clockmod_attr,
8 + .hide_interface = 1,
9 };
10
11
12 diff -ur linux-2.6.27.noarch/drivers/cpufreq/cpufreq.c linux-2.6.27.noarch.p4/drivers/cpufreq/cpufreq.c
13 --- linux-2.6.27.noarch/drivers/cpufreq/cpufreq.c 2008-11-03 17:14:03.000000000 +0000
14 +++ linux-2.6.27.noarch.p4/drivers/cpufreq/cpufreq.c 2008-11-03 17:18:38.000000000 +0000
15 @@ -754,6 +754,11 @@
16 .release = cpufreq_sysfs_release,
17 };
18
19 +static struct kobj_type ktype_empty_cpufreq = {
20 + .sysfs_ops = &sysfs_ops,
21 + .release = cpufreq_sysfs_release,
22 +};
23 +
24
25 /**
26 * cpufreq_add_dev - add a CPU device
27 @@ -876,26 +881,36 @@
28 memcpy(&new_policy, policy, sizeof(struct cpufreq_policy));
29
30 /* prepare interface data */
31 - ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq, &sys_dev->kobj,
32 - "cpufreq");
33 - if (ret)
34 - goto err_out_driver_exit;
35 -
36 - /* set up files for this cpu device */
37 - drv_attr = cpufreq_driver->attr;
38 - while ((drv_attr) && (*drv_attr)) {
39 - ret = sysfs_create_file(&policy->kobj, &((*drv_attr)->attr));
40 + if (!cpufreq_driver->hide_interface) {
41 + ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq,
42 + &sys_dev->kobj, "cpufreq");
43 if (ret)
44 goto err_out_driver_exit;
45 - drv_attr++;
46 - }
47 - if (cpufreq_driver->get) {
48 - ret = sysfs_create_file(&policy->kobj, &cpuinfo_cur_freq.attr);
49 - if (ret)
50 - goto err_out_driver_exit;
51 - }
52 - if (cpufreq_driver->target) {
53 - ret = sysfs_create_file(&policy->kobj, &scaling_cur_freq.attr);
54 +
55 + /* set up files for this cpu device */
56 + drv_attr = cpufreq_driver->attr;
57 + while ((drv_attr) && (*drv_attr)) {
58 + ret = sysfs_create_file(&policy->kobj,
59 + &((*drv_attr)->attr));
60 + if (ret)
61 + goto err_out_driver_exit;
62 + drv_attr++;
63 + }
64 + if (cpufreq_driver->get) {
65 + ret = sysfs_create_file(&policy->kobj,
66 + &cpuinfo_cur_freq.attr);
67 + if (ret)
68 + goto err_out_driver_exit;
69 + }
70 + if (cpufreq_driver->target) {
71 + ret = sysfs_create_file(&policy->kobj,
72 + &scaling_cur_freq.attr);
73 + if (ret)
74 + goto err_out_driver_exit;
75 + }
76 + } else {
77 + ret = kobject_init_and_add(&policy->kobj, &ktype_empty_cpufreq,
78 + &sys_dev->kobj, "cpufreq");
79 if (ret)
80 goto err_out_driver_exit;
81 }
82 diff -ur linux-2.6.27.noarch/include/linux/cpufreq.h linux-2.6.27.noarch.p4/include/linux/cpufreq.h
83 --- linux-2.6.27.noarch/include/linux/cpufreq.h 2008-11-03 17:14:03.000000000 +0000
84 +++ linux-2.6.27.noarch.p4/include/linux/cpufreq.h 2008-11-03 17:18:38.000000000 +0000
85 @@ -234,6 +234,7 @@
86 int (*suspend) (struct cpufreq_policy *policy, pm_message_t pmsg);
87 int (*resume) (struct cpufreq_policy *policy);
88 struct freq_attr **attr;
89 + bool hide_interface;
90 };
91
92 /* flags */
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2