aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-07 13:54:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-07 13:54:56 -0700
commitc8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea (patch)
treef09a1c627ac9b44dade9a5f6f10a8e9dfc86a9b2 /include
parent74de82ed1e49d9c7af84c3beb3759316854f54ed (diff)
parent430c62fb2948d964cf8dc7f3e2f69623c04ef62f (diff)
downloadmrst-s0i3-test-c8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea.tar.gz
mrst-s0i3-test-c8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea.tar.xz
mrst-s0i3-test-c8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea.zip
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.h1
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
struct elevator_type *elevator_type;
struct mutex sysfs_lock;
struct hlist_head *hash;
+ unsigned int registered:1;
};
/*