git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'imx/compile-fixes' of git://git.linaro.org/people/shawnguo/linux-2...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
iseries
/
lpevents.c
diff --git
a/arch/powerpc/platforms/iseries/lpevents.c
b/arch/powerpc/platforms/iseries/lpevents.c
index
275f494
..
202e227
100644
(file)
--- a/
arch/powerpc/platforms/iseries/lpevents.c
+++ b/
arch/powerpc/platforms/iseries/lpevents.c
@@
-13,7
+13,7
@@
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/proc_fs.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/proc_fs.h>
-#include <linux/
module
.h>
+#include <linux/
export
.h>
#include <asm/system.h>
#include <asm/paca.h>
#include <asm/system.h>
#include <asm/paca.h>
@@
-239,7
+239,7
@@
int HvLpEvent_unregisterHandler(HvLpEvent_Type eventType)
* other CPUs, and that the deleted handler isn't
* still running on another CPU when we return.
*/
* other CPUs, and that the deleted handler isn't
* still running on another CPU when we return.
*/
- synchronize_
rcu
();
+ synchronize_
sched
();
return 0;
}
}
return 0;
}
}
@@
-330,15
+330,11
@@
static const struct file_operations proc_lpevents_operations = {
static int __init proc_lpevents_init(void)
{
static int __init proc_lpevents_init(void)
{
- struct proc_dir_entry *e;
-
if (!firmware_has_feature(FW_FEATURE_ISERIES))
return 0;
if (!firmware_has_feature(FW_FEATURE_ISERIES))
return 0;
- e = create_proc_entry("iSeries/lpevents", S_IFREG|S_IRUGO, NULL);
- if (e)
- e->proc_fops = &proc_lpevents_operations;
-
+ proc_create("iSeries/lpevents", S_IFREG|S_IRUGO, NULL,
+ &proc_lpevents_operations);
return 0;
}
__initcall(proc_lpevents_init);
return 0;
}
__initcall(proc_lpevents_init);