Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index d14e058aaeedd6e63bafc24aadce24a78127d7a6..08ffab01e76c357cc47b378fd07f2895561f6cc3 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -42,7 +42,7 @@ extern struct fs_struct init_fs;
        .cputimer       = {                                             \
                .cputime = INIT_CPUTIME,                                \
                .running = 0,                                           \
-               .lock = __SPIN_LOCK_UNLOCKED(sig.cputimer.lock),        \
+               .lock = __RAW_SPIN_LOCK_UNLOCKED(sig.cputimer.lock),    \
        },                                                              \
        .cred_guard_mutex =                                             \
                 __MUTEX_INITIALIZER(sig.cred_guard_mutex),             \