Merge tag 'v3.15' into next

Linux 3.15

1 files changed, 1 insertions, 1 deletions

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 4257b7e2796b..998100093332 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -751,7 +751,7 @@ module_param_named(enabled, apparmor_enabled, bool, S_IRUGO);
 static int __init apparmor_enabled_setup(char *str)
 {
         unsigned long enabled;
-        int error = strict_strtoul(str, 0, &enabled);
+        int error = kstrtoul(str, 0, &enabled);
         if (!error)
                 apparmor_enabled = enabled ? 1 : 0;
         return 1;