Re: [PATCH 03/32] perf tools: Kbuild source related fixies

[David Ahern]

On 6/3/14, 4:05 PM, Alexis Berlemont wrote:
> From: Jiri Olsa <jolsa@xxxxxxxxxx>
>
> Fixing several sources config dependencies to allow
> separate config builds.
>
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxxxx>
> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxx>
> Cc: Paul Mackerras <paulus@xxxxxxxxx>
> Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> Cc: Borislav Petkov <bp@xxxxxxxxx>
> Cc: Michal Marek <mmarek@xxxxxxx>
> Cc: linux-kbuild@xxxxxxxxxxxxxxx
> Cc: Stephane Eranian <eranian@xxxxxxxxxx>
> ---
>   tools/perf/builtin-lock.c        |  4 +++-
>   tools/perf/builtin-sched.c       |  2 ++
>   tools/perf/perf.c                |  6 ++++++
>   tools/perf/perf.h                |  2 ++
>   tools/perf/ui/browsers/scripts.c |  4 ++++
>   tools/perf/ui/setup.c            | 10 +++++++++-
>   6 files changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
> index c852c7a..b255c20 100644
> --- a/tools/perf/builtin-lock.c
> +++ b/tools/perf/builtin-lock.c
> @@ -992,9 +992,11 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)
>   				usage_with_options(report_usage, report_options);
>   		}
>   		rc = __cmd_report(false);
> +#ifdef CONFIG_BULTIN_SCRIPT
>   	} else if (!strcmp(argv[0], "script")) {
>   		/* Aliased to 'perf script' */
> -		return cmd_script(argc, argv, prefix);
> +		rc = cmd_script(argc, argv, prefix);
> +#endif
>   	} else if (!strcmp(argv[0], "info")) {
>   		if (argc) {
>   			argc = parse_options(argc, argv,

Since you are not adding builtin-cmds.h as an included file this change 
takes away functionality. Each patch should ensure that existing options 
continue to work after the change.

ditto for all of the other changes to other files.

David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/