diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:56 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:56 +0000 |
| commit | 50eba35cd397748f9f36c0592a11ab1f2598516b (patch) | |
| tree | 16c2d1206ba0d899415aeaf22a7edb269943edbd /target/linux/generic/patches-3.3/910-kobject_uevent.patch | |
| parent | 16b4cbcdd64d92f6e79d41e11eda25a178ef3b53 (diff) | |
| download | master-31e0f0ae-50eba35cd397748f9f36c0592a11ab1f2598516b.tar.gz master-31e0f0ae-50eba35cd397748f9f36c0592a11ab1f2598516b.tar.bz2 master-31e0f0ae-50eba35cd397748f9f36c0592a11ab1f2598516b.zip | |
kernel: update linux 3.3 to 3.3.1
SVN-Revision: 31223
Diffstat (limited to 'target/linux/generic/patches-3.3/910-kobject_uevent.patch')
| -rw-r--r-- | target/linux/generic/patches-3.3/910-kobject_uevent.patch | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/target/linux/generic/patches-3.3/910-kobject_uevent.patch b/target/linux/generic/patches-3.3/910-kobject_uevent.patch index f15749fa17..aa9a40f099 100644 --- a/target/linux/generic/patches-3.3/910-kobject_uevent.patch +++ b/target/linux/generic/patches-3.3/910-kobject_uevent.patch @@ -1,6 +1,6 @@ --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c -@@ -49,6 +49,18 @@ static const char *kobject_actions[] = { +@@ -50,6 +50,18 @@ static const char *kobject_actions[] = { [KOBJ_OFFLINE] = "offline", }; @@ -8,9 +8,9 @@ +{ + u64 seq; + -+ spin_lock(&sequence_lock); ++ mutex_lock(&uevent_sock_mutex); + seq = ++uevent_seqnum; -+ spin_unlock(&sequence_lock); ++ mutex_unlock(&uevent_sock_mutex); + + return seq; +} @@ -19,14 +19,3 @@ /** * kobject_action_type - translate action string to numeric type * -@@ -244,9 +256,7 @@ int kobject_uevent_env(struct kobject *k - kobj->state_remove_uevent_sent = 1; - - /* we will send an event, so request a new sequence number */ -- spin_lock(&sequence_lock); -- seq = ++uevent_seqnum; -- spin_unlock(&sequence_lock); -+ seq = uevent_next_seqnum(); - retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)seq); - if (retval) - goto exit; |