diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
| commit | 2fe5de9ce7d57498abc14b375cad2fcf8c3ee6cc (patch) | |
| tree | 9478e8cf470c1d5bdb2d89b57a7e35919ab95e72 /include/linux/kobject.h | |
| parent | 08f8aeb55d7727d644dbbbbfb798fe937d47751d (diff) | |
| parent | 2b4cfe64dee0d84506b951d81bf55d9891744d25 (diff) | |
Merge branch 'sched/urgent' into sched/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 926afb6f6b5f..f896a33e8341 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
| @@ -119,6 +119,7 @@ struct kobj_type { | |||
| 119 | }; | 119 | }; |
| 120 | 120 | ||
| 121 | struct kobj_uevent_env { | 121 | struct kobj_uevent_env { |
| 122 | char *argv[3]; | ||
| 122 | char *envp[UEVENT_NUM_ENVP]; | 123 | char *envp[UEVENT_NUM_ENVP]; |
| 123 | int envp_idx; | 124 | int envp_idx; |
| 124 | char buf[UEVENT_BUFFER_SIZE]; | 125 | char buf[UEVENT_BUFFER_SIZE]; |