projects
/
powerpc.git
/ 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://one.firstfloor.org/home/andi/git/linux-2.6
[powerpc.git]
/
arch
/
s390
/
appldata
/
appldata_base.c
diff --git
a/arch/s390/appldata/appldata_base.c
b/arch/s390/appldata/appldata_base.c
index
2b1e6c9
..
b8c2372
100644
(file)
--- a/
arch/s390/appldata/appldata_base.c
+++ b/
arch/s390/appldata/appldata_base.c
@@
-92,8
+92,8
@@
static int appldata_timer_active;
* Work queue
*/
static struct workqueue_struct *appldata_wq;
* Work queue
*/
static struct workqueue_struct *appldata_wq;
-static void appldata_work_fn(
void *data
);
-static DECLARE_WORK(appldata_work, appldata_work_fn
, NULL
);
+static void appldata_work_fn(
struct work_struct *work
);
+static DECLARE_WORK(appldata_work, appldata_work_fn);
/*
/*
@@
-109,7
+109,7
@@
static LIST_HEAD(appldata_ops_list);
*
* schedule work and reschedule timer
*/
*
* schedule work and reschedule timer
*/
-static void appldata_timer_function(unsigned long data
, struct pt_regs *regs
)
+static void appldata_timer_function(unsigned long data)
{
P_DEBUG(" -= Timer =-\n");
P_DEBUG("CPU: %i, expire_count: %i\n", smp_processor_id(),
{
P_DEBUG(" -= Timer =-\n");
P_DEBUG("CPU: %i, expire_count: %i\n", smp_processor_id(),
@@
-125,7
+125,7
@@
static void appldata_timer_function(unsigned long data, struct pt_regs *regs)
*
* call data gathering function for each (active) module
*/
*
* call data gathering function for each (active) module
*/
-static void appldata_work_fn(
void *data
)
+static void appldata_work_fn(
struct work_struct *work
)
{
struct list_head *lh;
struct appldata_ops *ops;
{
struct list_head *lh;
struct appldata_ops *ops;
@@
-310,6
+310,7
@@
appldata_interval_handler(ctl_table *ctl, int write, struct file *filp,
if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len)) {
return -EFAULT;
}
if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len)) {
return -EFAULT;
}
+ interval = 0;
sscanf(buf, "%i", &interval);
if (interval <= 0) {
P_ERROR("Timer CPU interval has to be > 0!\n");
sscanf(buf, "%i", &interval);
if (interval <= 0) {
P_ERROR("Timer CPU interval has to be > 0!\n");
@@
-560,7
+561,6
@@
appldata_offline_cpu(int cpu)
spin_unlock(&appldata_timer_lock);
}
spin_unlock(&appldata_timer_lock);
}
-#ifdef CONFIG_HOTPLUG_CPU
static int __cpuinit
appldata_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
static int __cpuinit
appldata_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
@@
-581,7
+581,6
@@
appldata_cpu_notify(struct notifier_block *self,
static struct notifier_block appldata_nb = {
.notifier_call = appldata_cpu_notify,
};
static struct notifier_block appldata_nb = {
.notifier_call = appldata_cpu_notify,
};
-#endif
/*
* appldata_init()
/*
* appldata_init()