diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2011-01-29 15:50:52 -0500 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2011-02-01 16:53:21 -0500 |
commit | 7f0bd4c213ff8dca0eb3bdd887f5c62c8d30fab5 (patch) | |
tree | 99b45b5466dc27308e6d65751baf5e109eb37385 /litmus/sched_plugin.c | |
parent | fab768a4cdc49ad7886cac0d0361f8432965a817 (diff) |
fdso: pass userpsace config argument to object constructor
As Glenn pointed out, it is useful for some protocols (e.g.,
k-exclusion protocols) to know the userspace configuration at object
creation time. This patch changes the fdso API to pass the parameter
to the object constructor, which is then in turn passed to the lock
allocater. The return code from the lock allocater is passed to
userspace in return.
This also fixes some null pointer dereferences in the FDSO code found
by the test suite in liblitmus.
Diffstat (limited to 'litmus/sched_plugin.c')
-rw-r--r-- | litmus/sched_plugin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/litmus/sched_plugin.c b/litmus/sched_plugin.c index 2f8f399b195f..d54886df1f57 100644 --- a/litmus/sched_plugin.c +++ b/litmus/sched_plugin.c | |||
@@ -123,7 +123,8 @@ static long litmus_dummy_deactivate_plugin(void) | |||
123 | 123 | ||
124 | #ifdef CONFIG_LITMUS_LOCKING | 124 | #ifdef CONFIG_LITMUS_LOCKING |
125 | 125 | ||
126 | static long litmus_dummy_allocate_lock(struct litmus_lock **lock, int type) | 126 | static long litmus_dummy_allocate_lock(struct litmus_lock **lock, int type, |
127 | void* __user config) | ||
127 | { | 128 | { |
128 | return -ENXIO; | 129 | return -ENXIO; |
129 | } | 130 | } |