Commit 4da68d0b authored by Chris Wright's avatar Chris Wright Committed by Linus Torvalds

[PATCH] tkill ia64 syscall table entry

minor nit, but it seems the tkill() patch added a sys_tkill entry without
removing an ia64_ni_syscall entry.
parent dc83289c
...@@ -1133,7 +1133,6 @@ sys_call_table: ...@@ -1133,7 +1133,6 @@ sys_call_table:
data8 sys_tkill data8 sys_tkill
data8 ia64_ni_syscall data8 ia64_ni_syscall
data8 ia64_ni_syscall data8 ia64_ni_syscall
data8 ia64_ni_syscall
data8 ia64_ni_syscall // 1220 data8 ia64_ni_syscall // 1220
data8 ia64_ni_syscall data8 ia64_ni_syscall
data8 ia64_ni_syscall data8 ia64_ni_syscall
......
...@@ -103,8 +103,8 @@ struct pm_dev ...@@ -103,8 +103,8 @@ struct pm_dev
void *data; void *data;
unsigned long flags; unsigned long flags;
int state; unsigned long state;
int prev_state; unsigned long prev_state;
struct list_head entry; struct list_head entry;
}; };
......
...@@ -154,7 +154,7 @@ void pm_unregister_all(pm_callback callback) ...@@ -154,7 +154,7 @@ void pm_unregister_all(pm_callback callback)
int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data) int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data)
{ {
int status = 0; int status = 0;
int prev_state, next_state; unsigned long prev_state, next_state;
if (in_interrupt()) if (in_interrupt())
BUG(); BUG();
...@@ -163,7 +163,7 @@ int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data) ...@@ -163,7 +163,7 @@ int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data)
case PM_SUSPEND: case PM_SUSPEND:
case PM_RESUME: case PM_RESUME:
prev_state = dev->state; prev_state = dev->state;
next_state = (int) data; next_state = (unsigned long) data;
if (prev_state != next_state) { if (prev_state != next_state) {
if (dev->callback) if (dev->callback)
status = (*dev->callback)(dev, rqst, data); status = (*dev->callback)(dev, rqst, data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment