diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-04-18 18:35:47 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-04-18 18:35:47 +0000 |
| commit | 78981f6f3c3fa003b7c9c351a1c902027fa1d1cd (patch) | |
| tree | 3d48afe764021b9292fe61bfc90efc9e44d67298 /target/linux/generic-2.6/patches-2.6.34/219-kobject_uevent.patch | |
| parent | 8c0ee9484b18f1db5fb901829706626bf5fc5a26 (diff) | |
| download | upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.tar.gz upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.tar.bz2 upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.zip | |
kernel: refresh patches with 2.6.34-rc4
SVN-Revision: 20999
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 | 6 |
1 files changed, 3 insertions, 3 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 index 7e00b224cc..1c1beaf9ae 100644 --- 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 @@ -1,6 +1,6 @@ --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c -@@ -29,7 +29,8 @@ u64 uevent_seqnum; +@@ -30,7 +30,8 @@ u64 uevent_seqnum; char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH; static DEFINE_SPINLOCK(sequence_lock); #if defined(CONFIG_NET) @@ -10,7 +10,7 @@ #endif /* the strings here must match the enum in include/linux/kobject.h */ -@@ -42,6 +43,18 @@ static const char *kobject_actions[] = { +@@ -43,6 +44,18 @@ static const char *kobject_actions[] = { [KOBJ_OFFLINE] = "offline", }; @@ -29,7 +29,7 @@ /** * kobject_action_type - translate action string to numeric type * -@@ -201,9 +214,7 @@ int kobject_uevent_env(struct kobject *k +@@ -202,9 +215,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 */ |