diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-04-19 15:20:44 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-04-19 15:20:44 +0000 |
commit | 127d15a775b51296ab6eda47e9b116f988bebd7c (patch) | |
tree | 63364c73ceef57da30ee5a6669865d095b09c5bc /target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch | |
parent | bdd7f3c7baeeb20ff5838ca685a3305de7d818ba (diff) | |
download | upstream-127d15a775b51296ab6eda47e9b116f988bebd7c.tar.gz upstream-127d15a775b51296ab6eda47e9b116f988bebd7c.tar.bz2 upstream-127d15a775b51296ab6eda47e9b116f988bebd7c.zip |
add proper 2.6.25 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10865 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch new file mode 100644 index 0000000000..a3d5ee2c70 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch @@ -0,0 +1,42 @@ +--- linux-2.6.24/lib/kobject_uevent.c 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24-owrt/lib/kobject_uevent.c 2008-01-28 12:01:41.000000000 +0100 +@@ -27,7 +27,8 @@ + 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 */ +@@ -40,6 +41,18 @@ + [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 + * +@@ -173,9 +186,7 @@ + } + + /* 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; |