From mboxrd@z Thu Jan  1 00:00:00 1970
From: Zhenwen Xu <helight.xu@gmail.com>
Subject: [PATCH] remove duplicated include <linux/audit.h>
Date: Wed, 29 Apr 2009 17:54:38 +0800
Message-ID: <20090429095438.GA4072@helight>
Reply-To: Zhenwen Xu <helight.xu@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner+glk-linux-kernel-3=40m.gmane.org-S1753794AbZD2J4e@vger.kernel.org>
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
To: linux-kernel@vger.kernel.org
Cc: viro@zeniv.linux.org.uk, linux-audit@redhat.com
List-Id: linux-audit@redhat.com


 The <linux/audit.h> was included in kernel/audit.h, and 
kernel/audit.c, kernel/auditfilter.c, and kernel/auditsc.c
already include the file kernel/audit.h, so it's unnecessary
to include <linux/audit.h> again.


kernel/audit.c
	|
	--#include <linux/audit.h>  ---------------------
	|						|
	--#include "audit.h"				|--duplicated
			|				|
			--#include <linux/audit.h>-------

Signed-off-by: Zhenwen Xu <helight.xu@gmail.com>
---
 kernel/audit.c       |    2 --
 kernel/auditfilter.c |    2 +-
 kernel/auditsc.c     |    1 -
 3 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 9442c35..a04786e 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -49,8 +49,6 @@
 #include <linux/err.h>
 #include <linux/kthread.h>
 
-#include <linux/audit.h>
-
 #include <net/sock.h>
 #include <net/netlink.h>
 #include <linux/skbuff.h>
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index a6fe71f..b7e9fec 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -20,7 +20,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/audit.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
 #include <linux/fs.h>
@@ -29,6 +28,7 @@
 #include <linux/sched.h>
 #include <linux/inotify.h>
 #include <linux/security.h>
+
 #include "audit.h"
 
 /*
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 7d6ac7c..efe06bf 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -52,7 +52,6 @@
 #include <linux/mount.h>
 #include <linux/socket.h>
 #include <linux/mqueue.h>
-#include <linux/audit.h>
 #include <linux/personality.h>
 #include <linux/time.h>
 #include <linux/netlink.h>
-- 
1.5.6.5

-- 
---------------------------------
Zhenwen Xu - Open and Free
Home Page:	http://zhwen.org
My Studio:	http://dim4.cn

----- End forwarded message -----

-- 
--------------------------------
http://zhwen.org - Open and Free