浏览代码

perf tools: remove unneeded include of network header files

perf does not have networking related functionality, and the inclusion
of these headers is one of the causes of compile failures for Android:

  https://lkml.org/lkml/2012/8/23/316
  https://lkml.org/lkml/2012/8/28/293

So, remove them.

Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1346255732-93246-1-git-send-email-dsahern@gmail.com
[ committer note: fix trace-event-perl.c compile failure by reordering includes ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
David Ahern 12 年之前
父节点
当前提交
1204609916
共有 2 个文件被更改,包括 4 次插入9 次删除
  1. 4 4
      tools/perf/util/scripting-engines/trace-event-perl.c
  2. 0 5
      tools/perf/util/util.h

+ 4 - 4
tools/perf/util/scripting-engines/trace-event-perl.c

@@ -25,16 +25,16 @@
 #include <ctype.h>
 #include <ctype.h>
 #include <errno.h>
 #include <errno.h>
 
 
-#include "../../perf.h"
 #include "../util.h"
 #include "../util.h"
+#include <EXTERN.h>
+#include <perl.h>
+
+#include "../../perf.h"
 #include "../thread.h"
 #include "../thread.h"
 #include "../event.h"
 #include "../event.h"
 #include "../trace-event.h"
 #include "../trace-event.h"
 #include "../evsel.h"
 #include "../evsel.h"
 
 
-#include <EXTERN.h>
-#include <perl.h>
-
 void boot_Perf__Trace__Context(pTHX_ CV *cv);
 void boot_Perf__Trace__Context(pTHX_ CV *cv);
 void boot_DynaLoader(pTHX_ CV *cv);
 void boot_DynaLoader(pTHX_ CV *cv);
 typedef PerlInterpreter * INTERP;
 typedef PerlInterpreter * INTERP;

+ 0 - 5
tools/perf/util/util.h

@@ -69,11 +69,6 @@
 #include <sys/poll.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/ioctl.h>
-#include <sys/select.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <inttypes.h>
 #include <inttypes.h>
 #include "../../../include/linux/magic.h"
 #include "../../../include/linux/magic.h"
 #include "types.h"
 #include "types.h"