diff options
author | Hamish Guthrie <hcg@openwrt.org> | 2009-05-28 10:00:48 +0000 |
---|---|---|
committer | Hamish Guthrie <hcg@openwrt.org> | 2009-05-28 10:00:48 +0000 |
commit | 7adb67f18469e51cecb83a0c2efbf22494acb244 (patch) | |
tree | fe225b163b00d82bf2dfa88ec105309675690049 /target/linux/generic-2.6/patches-2.6.29/219-kobject_uevent.patch | |
parent | 52d975c359b8330e2844d3bb942588bd5afd73e6 (diff) | |
download | upstream-7adb67f18469e51cecb83a0c2efbf22494acb244.tar.gz upstream-7adb67f18469e51cecb83a0c2efbf22494acb244.tar.bz2 upstream-7adb67f18469e51cecb83a0c2efbf22494acb244.zip |
revert 15922 - add back 2.6.29 kernel support
SVN-Revision: 16127
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29/219-kobject_uevent.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/219-kobject_uevent.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.29/219-kobject_uevent.patch new file mode 100644 index 0000000000..279665e869 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.29/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 + * +@@ -194,9 +207,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; |