projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] lockdep: annotate on-stack completions
[powerpc.git]
/
drivers
/
s390
/
s390mach.c
diff --git
a/drivers/s390/s390mach.c
b/drivers/s390/s390mach.c
index
f99e553
..
ffb3677
100644
(file)
--- a/
drivers/s390/s390mach.c
+++ b/
drivers/s390/s390mach.c
@@
-8,12
+8,12
@@
* Martin Schwidefsky (schwidefsky@de.ibm.com)
*/
* Martin Schwidefsky (schwidefsky@de.ibm.com)
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/workqueue.h>
#include <linux/time.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/workqueue.h>
#include <linux/time.h>
+#include <linux/kthread.h>
#include <asm/lowcore.h>
#include <asm/lowcore.h>
@@
-56,8
+56,6
@@
s390_collect_crw_info(void *param)
unsigned int chain;
sem = (struct semaphore *)param;
unsigned int chain;
sem = (struct semaphore *)param;
- /* Set a nice name. */
- daemonize("kmcheck");
repeat:
down_interruptible(sem);
slow = 0;
repeat:
down_interruptible(sem);
slow = 0;
@@
-380,6
+378,8
@@
s390_do_machine_check(struct pt_regs *regs)
struct mcck_struct *mcck;
int umode;
struct mcck_struct *mcck;
int umode;
+ lockdep_off();
+
mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
mcck = &__get_cpu_var(cpu_mcck);
umode = user_mode(regs);
mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
mcck = &__get_cpu_var(cpu_mcck);
umode = user_mode(regs);
@@
-484,6
+484,7
@@
s390_do_machine_check(struct pt_regs *regs)
mcck->warning = 1;
set_thread_flag(TIF_MCCK_PENDING);
}
mcck->warning = 1;
set_thread_flag(TIF_MCCK_PENDING);
}
+ lockdep_on();
}
/*
}
/*
@@
-516,7
+517,7
@@
arch_initcall(machine_check_init);
static int __init
machine_check_crw_init (void)
{
static int __init
machine_check_crw_init (void)
{
- k
ernel_thread(s390_collect_crw_info, &m_sem, CLONE_FS|CLONE_FILES
);
+ k
thread_run(s390_collect_crw_info, &m_sem, "kmcheck"
);
ctl_set_bit(14, 28); /* enable channel report MCH */
return 0;
}
ctl_set_bit(14, 28); /* enable channel report MCH */
return 0;
}