diff options
| author | Chris Wright <chris@wirex.com> | 2002-02-06 18:19:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-02-06 18:19:35 -0800 |
| commit | 4da68d0b68d5db2c10d9bbbdb6d4f3e766a4e3c0 (patch) | |
| tree | 4210566220161f4d6e918b05e23e6cdfd610f41e /kernel | |
| parent | dc83289c876a6bd3f7fefe4f2aaeb2f15429de7c (diff) | |
[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.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/pm.c b/kernel/pm.c index a33e7b26ebe8..0992b66f0d4b 100644 --- a/kernel/pm.c +++ b/kernel/pm.c @@ -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 status = 0; - int prev_state, next_state; + unsigned long prev_state, next_state; if (in_interrupt()) BUG(); @@ -163,7 +163,7 @@ int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data) case PM_SUSPEND: case PM_RESUME: prev_state = dev->state; - next_state = (int) data; + next_state = (unsigned long) data; if (prev_state != next_state) { if (dev->callback) status = (*dev->callback)(dev, rqst, data); |