[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.

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 307b498f7da34cb1e0a2ec4ce1eaace3b7819f03..832f396e4dce1c7f42fcb08450b4cf118ac3c36c 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1133,7 +1133,6 @@ sys_call_table:
        data8 sys_tkill
        data8 ia64_ni_syscall
        data8 ia64_ni_syscall
-       data8 ia64_ni_syscall
        data8 ia64_ni_syscall                   // 1220
        data8 ia64_ni_syscall
        data8 ia64_ni_syscall

diff --git a/include/linux/pm.h b/include/linux/pm.h
index 8cefa88e6183bdcf9ef30e345d1d05f0c038e96e..ab9305b0953ac6d1edda1e53935e15a449ee2a9a 100644 (file)
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -103,8 +103,8 @@ struct pm_dev
        void            *data;
 
        unsigned long    flags;
-       int              state;
-       int              prev_state;
+       unsigned long    state;
+       unsigned long    prev_state;
 
        struct list_head entry;
 };

diff --git a/kernel/pm.c b/kernel/pm.c
index a33e7b26ebe876370fdc0c54b73392a44863f46b..0992b66f0d4b84d008f564082b2dee81058429f0 100644 (file)
--- 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);