| From ce7eebe5c3deef8e19c177c24ee75843256e69ca Mon Sep 17 00:00:00 2001 |
| From: Vinson Lee <vlee@twitter.com> |
| Date: Wed, 18 Sep 2013 16:16:40 -0700 |
| Subject: tools lib lk: Uninclude linux/magic.h in debugfs.c |
| |
| From: Vinson Lee <vlee@twitter.com> |
| |
| commit ce7eebe5c3deef8e19c177c24ee75843256e69ca upstream. |
| |
| The compilation only looks for linux/magic.h from the default include |
| paths, which does not include the source tree. This results in a build |
| error if linux/magic.h is not available or not installed. |
| |
| For example, this build error occurs on CentOS 5. |
| |
| $ make -C tools/lib/lk V=1 |
| [...] |
| gcc -o debugfs.o -c -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 |
| -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement |
| -Wformat-security -Wformat-y2k -Winit-self -Wmissing-declarations |
| -Wmissing-prototypes -Wnested-externs -Wno-system-headers |
| -Wold-style-definition -Wpacked -Wredundant-decls -Wshadow |
| -Wstrict-aliasing=3 -Wstrict-prototypes -Wswitch-default -Wswitch-enum |
| -Wundef -Wwrite-strings -Wformat -fPIC -D_LARGEFILE64_SOURCE |
| -D_FILE_OFFSET_BITS=64 debugfs.c |
| debugfs.c:8:25: error: linux/magic.h: No such file or directory |
| |
| The only symbol from linux/magic.h needed by debugfs.c is DEBUGFS_MAGIC, |
| and that is already defined in debugfs.h. linux/magic.h isn't providing |
| any extra symbols and can unincluded. This is similar to the approach by |
| perf, which has its own magic.h wrapper at |
| tools/perf/util/include/linux/magic.h |
| |
| Signed-off-by: Vinson Lee <vlee@twitter.com> |
| Acked-by: Borislav Petkov <bp@suse.de> |
| Cc: Borislav Petkov <bp@suse.de> |
| Cc: Vinson Lee <vlee@freedesktop.org> |
| Link: http://lkml.kernel.org/r/1379546200-17028-1-git-send-email-vlee@freedesktop.org |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/lib/lk/debugfs.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- a/tools/lib/lk/debugfs.c |
| +++ b/tools/lib/lk/debugfs.c |
| @@ -5,7 +5,6 @@ |
| #include <stdbool.h> |
| #include <sys/vfs.h> |
| #include <sys/mount.h> |
| -#include <linux/magic.h> |
| #include <linux/kernel.h> |
| |
| #include "debugfs.h" |
