diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/pm.c | 37 | ||||
-rw-r--r-- | kernel/resource.c | 2 | ||||
-rw-r--r-- | kernel/sys.c | 2 |
3 files changed, 1 insertions, 40 deletions
diff --git a/kernel/power/pm.c b/kernel/power/pm.c index 84063ac8fc..c50d15266c 100644 --- a/kernel/power/pm.c +++ b/kernel/power/pm.c | |||
@@ -75,42 +75,6 @@ struct pm_dev *pm_register(pm_dev_t type, | |||
75 | return dev; | 75 | return dev; |
76 | } | 76 | } |
77 | 77 | ||
78 | static void __pm_unregister(struct pm_dev *dev) | ||
79 | { | ||
80 | if (dev) { | ||
81 | list_del(&dev->entry); | ||
82 | kfree(dev); | ||
83 | } | ||
84 | } | ||
85 | |||
86 | /** | ||
87 | * pm_unregister_all - unregister all devices with matching callback | ||
88 | * @callback: callback function pointer | ||
89 | * | ||
90 | * Unregister every device that would call the callback passed. This | ||
91 | * is primarily meant as a helper function for loadable modules. It | ||
92 | * enables a module to give up all its managed devices without keeping | ||
93 | * its own private list. | ||
94 | */ | ||
95 | |||
96 | void pm_unregister_all(pm_callback callback) | ||
97 | { | ||
98 | struct list_head *entry; | ||
99 | |||
100 | if (!callback) | ||
101 | return; | ||
102 | |||
103 | mutex_lock(&pm_devs_lock); | ||
104 | entry = pm_devs.next; | ||
105 | while (entry != &pm_devs) { | ||
106 | struct pm_dev *dev = list_entry(entry, struct pm_dev, entry); | ||
107 | entry = entry->next; | ||
108 | if (dev->callback == callback) | ||
109 | __pm_unregister(dev); | ||
110 | } | ||
111 | mutex_unlock(&pm_devs_lock); | ||
112 | } | ||
113 | |||
114 | /** | 78 | /** |
115 | * pm_send - send request to a single device | 79 | * pm_send - send request to a single device |
116 | * @dev: device to send to | 80 | * @dev: device to send to |
@@ -239,7 +203,6 @@ int pm_send_all(pm_request_t rqst, void *data) | |||
239 | } | 203 | } |
240 | 204 | ||
241 | EXPORT_SYMBOL(pm_register); | 205 | EXPORT_SYMBOL(pm_register); |
242 | EXPORT_SYMBOL(pm_unregister_all); | ||
243 | EXPORT_SYMBOL(pm_send_all); | 206 | EXPORT_SYMBOL(pm_send_all); |
244 | EXPORT_SYMBOL(pm_active); | 207 | EXPORT_SYMBOL(pm_active); |
245 | 208 | ||
diff --git a/kernel/resource.c b/kernel/resource.c index 129cf046e5..0dd3a85757 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
@@ -404,8 +404,6 @@ int insert_resource(struct resource *parent, struct resource *new) | |||
404 | return result; | 404 | return result; |
405 | } | 405 | } |
406 | 406 | ||
407 | EXPORT_SYMBOL(insert_resource); | ||
408 | |||
409 | /* | 407 | /* |
410 | * Given an existing resource, change its start and size to match the | 408 | * Given an existing resource, change its start and size to match the |
411 | * arguments. Returns -EBUSY if it can't fit. Existing children of | 409 | * arguments. Returns -EBUSY if it can't fit. Existing children of |
diff --git a/kernel/sys.c b/kernel/sys.c index dbb3b9c7ea..e236f98f7e 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -1983,7 +1983,7 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, | |||
1983 | error = current->mm->dumpable; | 1983 | error = current->mm->dumpable; |
1984 | break; | 1984 | break; |
1985 | case PR_SET_DUMPABLE: | 1985 | case PR_SET_DUMPABLE: |
1986 | if (arg2 < 0 || arg2 > 2) { | 1986 | if (arg2 < 0 || arg2 > 1) { |
1987 | error = -EINVAL; | 1987 | error = -EINVAL; |
1988 | break; | 1988 | break; |
1989 | } | 1989 | } |