diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
commit | d2abae71ebcc409828b24ce9da402548ecdf1311 (patch) | |
tree | 5edfafc2828d3bcebb3698520ccba374cd4328c0 /security/selinux/avc.c | |
parent | 66567fcbaecac455caa1b13643155d686b51ce63 (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) |
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/selinux/avc.c')
-rw-r--r-- | security/selinux/avc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index a99be508f93d..ecd3829996aa 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
@@ -1,3 +1,4 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Implementation of the kernel access vector cache (AVC). | 3 | * Implementation of the kernel access vector cache (AVC). |
3 | * | 4 | * |
@@ -8,10 +9,6 @@ | |||
8 | * Replaced the avc_lock spinlock by RCU. | 9 | * Replaced the avc_lock spinlock by RCU. |
9 | * | 10 | * |
10 | * Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris@redhat.com> | 11 | * Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris@redhat.com> |
11 | * | ||
12 | * This program is free software; you can redistribute it and/or modify | ||
13 | * it under the terms of the GNU General Public License version 2, | ||
14 | * as published by the Free Software Foundation. | ||
15 | */ | 12 | */ |
16 | #include <linux/types.h> | 13 | #include <linux/types.h> |
17 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |