git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
eeh_event.c
diff --git
a/arch/powerpc/platforms/pseries/eeh_event.c
b/arch/powerpc/platforms/pseries/eeh_event.c
index
45ccc68
..
49037ed
100644
(file)
--- a/
arch/powerpc/platforms/pseries/eeh_event.c
+++ b/
arch/powerpc/platforms/pseries/eeh_event.c
@@
-37,8
+37,8
@@
/* EEH event workqueue setup. */
static DEFINE_SPINLOCK(eeh_eventlist_lock);
LIST_HEAD(eeh_eventlist);
/* EEH event workqueue setup. */
static DEFINE_SPINLOCK(eeh_eventlist_lock);
LIST_HEAD(eeh_eventlist);
-static void eeh_thread_launcher(
void
*);
-DECLARE_WORK(eeh_event_wq, eeh_thread_launcher
, NULL
);
+static void eeh_thread_launcher(
struct work_struct
*);
+DECLARE_WORK(eeh_event_wq, eeh_thread_launcher);
/* Serialize reset sequences for a given pci device */
DEFINE_MUTEX(eeh_event_mutex);
/* Serialize reset sequences for a given pci device */
DEFINE_MUTEX(eeh_event_mutex);
@@
-103,7
+103,7
@@
static int eeh_event_handler(void * dummy)
* eeh_thread_launcher
* @dummy - unused
*/
* eeh_thread_launcher
* @dummy - unused
*/
-static void eeh_thread_launcher(
void
*dummy)
+static void eeh_thread_launcher(
struct work_struct
*dummy)
{
if (kernel_thread(eeh_event_handler, NULL, CLONE_KERNEL) < 0)
printk(KERN_ERR "Failed to start EEH daemon\n");
{
if (kernel_thread(eeh_event_handler, NULL, CLONE_KERNEL) < 0)
printk(KERN_ERR "Failed to start EEH daemon\n");
@@
-124,11
+124,11
@@
int eeh_send_failure_event (struct device_node *dn,
{
unsigned long flags;
struct eeh_event *event;
{
unsigned long flags;
struct eeh_event *event;
- char *location;
+ c
onst c
har *location;
if (!mem_init_done) {
printk(KERN_ERR "EEH: event during early boot not handled\n");
if (!mem_init_done) {
printk(KERN_ERR "EEH: event during early boot not handled\n");
- location =
(char *)
get_property(dn, "ibm,loc-code", NULL);
+ location = get_property(dn, "ibm,loc-code", NULL);
printk(KERN_ERR "EEH: device node = %s\n", dn->full_name);
printk(KERN_ERR "EEH: PCI location = %s\n", location);
return 1;
printk(KERN_ERR "EEH: device node = %s\n", dn->full_name);
printk(KERN_ERR "EEH: PCI location = %s\n", location);
return 1;