Merge commit 'v2.6.30-rc5' into core/iommu

Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 13 deletions

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index dcfb93337e9a..d87247d2641f 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -15,19 +15,6 @@
 extern struct files_struct init_files;
 extern struct fs_struct init_fs;
 
-#define INIT_KIOCTX(name, which_mm) \
-{                                                       \
-        .users          = ATOMIC_INIT(1),               \
-        .dead           = 0,                            \
-        .mm             = &which_mm,                    \
-        .user_id        = 0,                            \
-        .next           = NULL,                         \
-        .wait           = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait), \
-        .ctx_lock       = __SPIN_LOCK_UNLOCKED(name.ctx_lock), \
-        .reqs_active    = 0U,                           \
-        .max_reqs       = ~0U,                          \
-}
-
 #define INIT_MM(name) \
 {                                                               \
         .mm_rb          = RB_ROOT,                              \