git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[safe/jmp/linux-2.6]
/
kernel
/
rtmutex-tester.c
diff --git
a/kernel/rtmutex-tester.c
b/kernel/rtmutex-tester.c
index
e3055ba
..
a56f629
100644
(file)
--- a/
kernel/rtmutex-tester.c
+++ b/
kernel/rtmutex-tester.c
@@
-297,8
+297,8
@@
static int test_func(void *data)
*
* opcode:data
*/
*
* opcode:data
*/
-static ssize_t sysfs_test_command(struct sys_device *dev,
const char *buf
,
- size_t count)
+static ssize_t sysfs_test_command(struct sys_device *dev,
struct sysdev_attribute *attr
,
+
const char *buf,
size_t count)
{
struct sched_param schedpar;
struct test_thread_data *td;
{
struct sched_param schedpar;
struct test_thread_data *td;
@@
-360,7
+360,8
@@
static ssize_t sysfs_test_command(struct sys_device *dev, const char *buf,
* @dev: thread to query
* @buf: char buffer to be filled with thread status info
*/
* @dev: thread to query
* @buf: char buffer to be filled with thread status info
*/
-static ssize_t sysfs_test_status(struct sys_device *dev, char *buf)
+static ssize_t sysfs_test_status(struct sys_device *dev, struct sysdev_attribute *attr,
+ char *buf)
{
struct test_thread_data *td;
struct task_struct *tsk;
{
struct test_thread_data *td;
struct task_struct *tsk;
@@
-394,7
+395,7
@@
static SYSDEV_ATTR(status, 0600, sysfs_test_status, NULL);
static SYSDEV_ATTR(command, 0600, NULL, sysfs_test_command);
static struct sysdev_class rttest_sysclass = {
static SYSDEV_ATTR(command, 0600, NULL, sysfs_test_command);
static struct sysdev_class rttest_sysclass = {
-
set_kset_name("rttest")
,
+
.name = "rttest"
,
};
static int init_test_thread(int id)
};
static int init_test_thread(int id)