X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Fgeneric-2.6%2Fpatches-2.6.31%2F219-kobject_uevent.patch;fp=target%2Flinux%2Fgeneric-2.6%2Fpatches-2.6.31%2F219-kobject_uevent.patch;h=0000000000000000000000000000000000000000;hb=da1bb88a2b900f0392b731ec47c5e1bff956fd8f;hp=7e00b224cc9ecfabb476713fb077947e2f1c2481;hpb=6117c04c9416b295347fb45c37e430f01df1d0d9;p=openwrt%2Fopenwrt.git diff --git a/target/linux/generic-2.6/patches-2.6.31/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.31/219-kobject_uevent.patch deleted file mode 100644 index 7e00b224cc..0000000000 --- a/target/linux/generic-2.6/patches-2.6.31/219-kobject_uevent.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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;