mirror of
https://github.com/torvalds/linux.git
synced 2026-09-23 13:14:02 +02:00
apparmor: fix net.h and policy.h circular include pattern
While the #ifdef guards prevent the circular include from blowing up, policy.h does not actually need anything from net.h. Remove, that include and instead include net.h in the other files that need it. Signed-off-by: Ryan Lee <ryan.lee@canonical.com> Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
parent
dc59e4fea9
commit
622ec01756
|
|
@ -20,6 +20,7 @@
|
|||
#include "include/apparmor.h"
|
||||
#include "include/file.h"
|
||||
#include "include/label.h"
|
||||
#include "include/net.h"
|
||||
#include "include/path.h"
|
||||
#include "include/policy.h"
|
||||
#include "include/cred.h"
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
#include "include/crypto.h"
|
||||
#include "include/ipc.h"
|
||||
#include "include/label.h"
|
||||
#include "include/net.h"
|
||||
#include "include/lib.h"
|
||||
#include "include/policy.h"
|
||||
#include "include/policy_ns.h"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#include "file.h"
|
||||
#include "lib.h"
|
||||
#include "label.h"
|
||||
#include "net.h"
|
||||
#include "perms.h"
|
||||
#include "resource.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@
|
|||
#include "include/file.h"
|
||||
#include "include/ipc.h"
|
||||
#include "include/match.h"
|
||||
#include "include/net.h"
|
||||
#include "include/path.h"
|
||||
#include "include/policy.h"
|
||||
#include "include/policy_ns.h"
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include "include/crypto.h"
|
||||
#include "include/file.h"
|
||||
#include "include/match.h"
|
||||
#include "include/net.h"
|
||||
#include "include/path.h"
|
||||
#include "include/policy.h"
|
||||
#include "include/policy_unpack.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user