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 git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[pandora-kernel.git]
/
drivers
/
char
/
ipmi
/
ipmi_msghandler.c
diff --git
a/drivers/char/ipmi/ipmi_msghandler.c
b/drivers/char/ipmi/ipmi_msghandler.c
index
9f2f8fd
..
b03ddab
100644
(file)
--- a/
drivers/char/ipmi/ipmi_msghandler.c
+++ b/
drivers/char/ipmi/ipmi_msghandler.c
@@
-936,11
+936,8
@@
int ipmi_set_gets_events(ipmi_user_t user, int val)
if (val) {
/* Deliver any queued events. */
if (val) {
/* Deliver any queued events. */
- list_for_each_entry_safe(msg, msg2, &intf->waiting_events,
- link) {
- list_del(&msg->link);
- list_add_tail(&msg->link, &msgs);
- }
+ list_for_each_entry_safe(msg, msg2, &intf->waiting_events, link)
+ list_move_tail(&msg->link, &msgs);
intf->waiting_events_count = 0;
}
intf->waiting_events_count = 0;
}
@@
-3677,7
+3674,7
@@
static void send_panic_events(char *str)
}
#endif /* CONFIG_IPMI_PANIC_EVENT */
}
#endif /* CONFIG_IPMI_PANIC_EVENT */
-static int has_paniced = 0;
+static int has_panic
k
ed = 0;
static int panic_event(struct notifier_block *this,
unsigned long event,
static int panic_event(struct notifier_block *this,
unsigned long event,
@@
-3686,9
+3683,9
@@
static int panic_event(struct notifier_block *this,
int i;
ipmi_smi_t intf;
int i;
ipmi_smi_t intf;
- if (has_paniced)
+ if (has_panic
k
ed)
return NOTIFY_DONE;
return NOTIFY_DONE;
- has_paniced = 1;
+ has_panic
k
ed = 1;
/* For every registered interface, set it to run to completion. */
for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
/* For every registered interface, set it to run to completion. */
for (i = 0; i < MAX_IPMI_INTERFACES; i++) {