Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-2.6-microblaze.git] / kernel / cred.c

diff --git a/kernel/cred.c b/kernel/cred.c
index 933155c..e10c15f 100644 (file)
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -870,7 +870,7 @@ static void dump_invalid_creds(const struct cred *cred, const char *label,
 /*
  * report use of invalid credentials
  */
-void __invalid_creds(const struct cred *cred, const char *file, unsigned line)
+void __noreturn __invalid_creds(const struct cred *cred, const char *file, unsigned line)
 {
        printk(KERN_ERR "CRED: Invalid credentials\n");
        printk(KERN_ERR "CRED: At %s:%u\n", file, line);