diff options
author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-03-11 12:24:17 +0000 |
---|---|---|
committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-03-11 12:24:17 +0000 |
commit | 29fec42733aec697e4bd5edf0be9f4d803853ef1 (patch) | |
tree | da443108ade7fa374fd71cd77dd7913fc456ba1e /target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch | |
parent | 55770a36bd881e16ce586004580ea5f379a58d87 (diff) | |
download | master-187ad058-29fec42733aec697e4bd5edf0be9f4d803853ef1.tar.gz master-187ad058-29fec42733aec697e4bd5edf0be9f4d803853ef1.tar.bz2 master-187ad058-29fec42733aec697e4bd5edf0be9f4d803853ef1.zip |
generic-2.6: add 2.6.34 preliminary support (patches)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20140 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch new file mode 100644 index 0000000000..7e00b224cc --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch @@ -0,0 +1,42 @@ +--- a/lib/kobject_uevent.c ++++ b/lib/kobject_uevent.c +@@ -29,7 +29,8 @@ u64 uevent_seqnum; + char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH; + static DEFINE_SPINLOCK(sequence_lock); + #if defined(CONFIG_NET) +-static struct sock *uevent_sock; ++struct sock *uevent_sock = NULL; ++EXPORT_SYMBOL_GPL(uevent_sock); + #endif + + /* the strings here must match the enum in include/linux/kobject.h */ +@@ -42,6 +43,18 @@ static const char *kobject_actions[] = { + [KOBJ_OFFLINE] = "offline", + }; + ++u64 uevent_next_seqnum(void) ++{ ++ u64 seq; ++ ++ spin_lock(&sequence_lock); ++ seq = ++uevent_seqnum; ++ spin_unlock(&sequence_lock); ++ ++ return seq; ++} ++EXPORT_SYMBOL_GPL(uevent_next_seqnum); ++ + /** + * kobject_action_type - translate action string to numeric type + * +@@ -201,9 +214,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; |