From: Russell King <rmk@arm.linux.org.uk>
To: Adrian Bunk <bunk@fs.tum.de>
Cc: Dominik Brodowski <linux@brodo.de>,
Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: 2.5.64: cpufreq "userspace" governor doesn't compile
Date: Thu, 6 Mar 2003 17:28:03 +0000 [thread overview]
Message-ID: <20030306172803.D838@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20030305195311.GH20423@fs.tum.de>; from bunk@fs.tum.de on Wed, Mar 05, 2003 at 08:53:12PM +0100
On Wed, Mar 05, 2003 at 08:53:12PM +0100, Adrian Bunk wrote:
> gcc -Wp,-MD,drivers/cpufreq/.userspace.o.d -D__KERNEL__ -Iinclude
> -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing
> -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6
> -Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include
> -DKBUILD_BASENAME=userspace -DKBUILD_MODNAME=userspace -c -o
> drivers/cpufreq/userspace.o drivers/cpufreq/userspace.c
> drivers/cpufreq/userspace.c: In function `cpufreq_governor_userspace':
> drivers/cpufreq/userspace.c:514: structure has no member named `intf'
> drivers/cpufreq/userspace.c:523: structure has no member named `intf'
> make[2]: *** [drivers/cpufreq/userspace.o] Error 1
Dominik sent this patch to the cpufreq list to fix this. I'm not
sure if it fixes this exact problem, but from reading the patch I
think its worth a try. (its currently building here.)
--- Dominik's message follows ---
Forgot to cc the cpufreq list...: I just sent this patch to Linus:
- update the userspace governor sysfs interface to get along with the
new "device interface" model
drivers/cpufreq/userspace.c | 29 ++++++++++++-----------------
include/linux/cpufreq.h | 10 +++++++++-
kernel/cpufreq.c | 6 ------
3 files changed, 21 insertions(+), 24 deletions(-)
Please apply,
Dominik
diff -ruN linux-original/drivers/cpufreq/userspace.c linux/drivers/cpufreq/userspace.c
--- linux-original/drivers/cpufreq/userspace.c 2003-03-04 22:27:01.000000000 +0100
+++ linux/drivers/cpufreq/userspace.c 2003-03-04 22:45:43.000000000 +0100
@@ -23,6 +23,7 @@
#include <linux/sysctl.h>
#include <linux/types.h>
#include <linux/fs.h>
+#include <linux/sysfs.h>
#include <asm/uaccess.h>
@@ -465,23 +466,14 @@
/************************** sysfs interface ************************/
-static inline int to_cpu_nr (struct device *dev)
+static ssize_t show_speed (struct cpufreq_policy *policy, char *buf)
{
- struct sys_device * cpu_sys_dev = container_of(dev, struct sys_device, dev);
- return (cpu_sys_dev->id);
-}
-
-static ssize_t show_speed (struct device *dev, char *buf)
-{
- unsigned int cpu = to_cpu_nr(dev);
-
- return sprintf (buf, "%u\n", cpu_cur_freq[cpu]);
+ return sprintf (buf, "%u\n", cpu_cur_freq[policy->cpu]);
}
static ssize_t
-store_speed (struct device *dev, const char *buf, size_t count)
+store_speed (struct cpufreq_policy *policy, const char *buf, size_t count)
{
- unsigned int cpu = to_cpu_nr(dev);
unsigned int freq = 0;
unsigned int ret;
@@ -489,13 +481,16 @@
if (ret != 1)
return -EINVAL;
- cpufreq_set(freq, cpu);
+ cpufreq_set(freq, policy->cpu);
return count;
}
-static DEVICE_ATTR(scaling_setspeed, (S_IRUGO | S_IWUSR), show_speed, store_speed);
-
+static struct freq_attr freq_attr_scaling_setspeed = {
+ .attr = { .name = "scaling_setspeed", .mode = 0644 },
+ .show = show_speed,
+ .store = store_speed,
+};
static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
unsigned int event)
@@ -511,7 +506,7 @@
cpu_min_freq[cpu] = policy->min;
cpu_max_freq[cpu] = policy->max;
cpu_cur_freq[cpu] = policy->cur;
- device_create_file (policy->intf.dev, &dev_attr_scaling_setspeed);
+ sysfs_create_file (&policy->kobj, &freq_attr_scaling_setspeed.attr);
memcpy (¤t_policy[cpu], policy, sizeof(struct cpufreq_policy));
up(&userspace_sem);
break;
@@ -520,7 +515,7 @@
cpu_is_managed[cpu] = 0;
cpu_min_freq[cpu] = 0;
cpu_max_freq[cpu] = 0;
- device_remove_file (policy->intf.dev, &dev_attr_scaling_setspeed);
+ sysfs_remove_file (&policy->kobj, &freq_attr_scaling_setspeed.attr);
up(&userspace_sem);
module_put(THIS_MODULE);
break;
diff -ruN linux-original/include/linux/cpufreq.h linux/include/linux/cpufreq.h
--- linux-original/include/linux/cpufreq.h 2003-03-04 22:27:20.000000000 +0100
+++ linux/include/linux/cpufreq.h 2003-03-04 22:46:14.000000000 +0100
@@ -18,7 +18,8 @@
#include <linux/notifier.h>
#include <linux/threads.h>
#include <linux/device.h>
-
+#include <linux/kobject.h>
+#include <linux/sysfs.h>
#define CPUFREQ_NAME_LEN 16
@@ -194,6 +195,13 @@
return;
}
+struct freq_attr {
+ struct attribute attr;
+ ssize_t (*show)(struct cpufreq_policy *, char *);
+ ssize_t (*store)(struct cpufreq_policy *, const char *, size_t count);
+};
+
+
/*********************************************************************
* CPUFREQ 2.6. INTERFACE *
*********************************************************************/
diff -ruN linux-original/kernel/cpufreq.c linux/kernel/cpufreq.c
--- linux-original/kernel/cpufreq.c 2003-03-04 22:54:45.000000000 +0100
+++ linux/kernel/cpufreq.c 2003-03-04 22:40:40.000000000 +0100
@@ -256,12 +256,6 @@
}
-struct freq_attr {
- struct attribute attr;
- ssize_t (*show)(struct cpufreq_policy *, char *);
- ssize_t (*store)(struct cpufreq_policy *, const char *, size_t count);
-};
-
#define define_one_ro(_name) \
struct freq_attr _name = { \
.attr = { .name = __stringify(_name), .mode = 0444 }, \
--
Russell King (rmk@arm.linux.org.uk) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html
next prev parent reply other threads:[~2003-03-06 17:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-05 3:48 Linux 2.5.64 Linus Torvalds
2003-03-05 14:36 ` Christoph Hellwig
2003-03-05 17:19 ` Dave Jones
2003-03-06 1:06 ` Alan Cox
2003-03-06 0:42 ` Dave Jones
2003-03-05 19:53 ` 2.5.64: cpufreq "userspace" governor doesn't compile Adrian Bunk
2003-03-06 17:28 ` Russell King [this message]
2003-03-06 17:16 ` Patrick Mochel
2003-03-06 23:31 ` [PATCH] cpufreq (2/7): fix userspace governor [Was: Re: 2.5.64: cpufreq "userspace" governor doesn't compile] Dominik Brodowski
2003-03-05 22:13 ` [2.5 patch] remove EXPORT_NO_SYMBOLS from amd7xx_tco Adrian Bunk
2003-03-05 23:57 ` Dave Jones
2003-03-05 23:49 ` Linux 2.5.64 John Cherry
2003-03-06 10:39 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030306172803.D838@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=bunk@fs.tum.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@brodo.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).