diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 16:54:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 16:54:56 -0400 |
| commit | c8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea (patch) | |
| tree | f09a1c627ac9b44dade9a5f6f10a8e9dfc86a9b2 /include | |
| parent | 74de82ed1e49d9c7af84c3beb3759316854f54ed (diff) | |
| parent | 430c62fb2948d964cf8dc7f3e2f69623c04ef62f (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
elevator: fix oops on early call to elevator_change()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/elevator.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index 926b50322a4..4fd978e7eb8 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
| @@ -93,6 +93,7 @@ struct elevator_queue | |||
| 93 | struct elevator_type *elevator_type; | 93 | struct elevator_type *elevator_type; |
| 94 | struct mutex sysfs_lock; | 94 | struct mutex sysfs_lock; |
| 95 | struct hlist_head *hash; | 95 | struct hlist_head *hash; |
| 96 | unsigned int registered:1; | ||
| 96 | }; | 97 | }; |
| 97 | 98 | ||
| 98 | /* | 99 | /* |