Em Tue, Sep 16, 2014 at 09:59:33AM +0300, Adrian Hunter escreveu: > On 09/15/2014 06:50 PM, Arnaldo Carvalho de Melo wrote: > > Em Mon, Sep 15, 2014 at 12:47:52PM -0300, Arnaldo Carvalho de Melo escreveu: > >> Em Fri, Aug 15, 2014 at 10:08:57PM +0300, Adrian Hunter escreveu: > >> > >>> perf tools copy VDSO out of memory. However, on 64-bit machines there > >>> may be 32-bit compatibility VDOs also. To copy those requires > >>> separate 32-bit executables. This patch adds to the build additional > >>> programs perf-read-vdso32 and perf-read-vdsox32 for 32-bit and x32 > >>> respectively. > >> > >>> Signed-off-by: Adrian Hunter <adrian.hun...@intel.com> > >> <SNIP> > >>> tools/perf/config/feature-checks/test-compile.c | 4 +++ > >> <SNIP> > >>> 8 files changed, 149 insertions(+), 37 deletions(-) > >> <SNIP> > >>> create mode 100644 tools/perf/config/feature-checks/test-compile.c > >> <SNIP> > >> > >> > >> In resolving conflicts that happen because I haven't merged some other > >> files (thread_stack, etC) I noticed that this patch introduces something > >> that is explicitely listed in a .gitignore file: > >> > >> [acme@zoo linux]$ git show d316f16dddd8c7780c727bbd507338e4147c9280 > >> commit d316f16dddd8c7780c727bbd507338e4147c9280 > >> Author: Alexander Shishkin <alexander.shish...@linux.intel.com> > >> Date: Fri Aug 15 22:08:59 2014 +0300 > >> > >> perf tools: Add feature checks to .gitignore > >> > >> <SNIP> > >> > >> +++ b/tools/perf/.gitignore > >> @@ -24,3 +24,4 @@ config.mak.autogen > >> *-flex.* > >> *.pyc > >> *.pyo > >> +config/feature-checks/test-* > >> [acme@zoo linux]$ > >> > >> > >> So I think we should use some different name for this test-compile.c > >> file? > > The name is ok.
Ok > >> > >> I'll leave those two csets out of this pull req, so that you can rebase > >> what is left on top of what is being merged and we can do one more > >> progress step in having all this merged, ok? > > > > Since we can't ignore all test- prefixed files there, I'm removing the > > patch that added it to .gitignore as well: > > > > commit d316f16dddd8c7780c727bbd507338e4147c9280 > > Author: Alexander Shishkin <alexander.shish...@linux.intel.com> > > Date: Fri Aug 15 22:08:59 2014 +0300 > > > > Aftewards I'll revisit this, because without this .gitignore patch I > > think your patch will be ok. > > The .gitignore patch is wrong. I picked it up because Alex had it in > his tree but it must be very old because it was superseded by: > > commit 56560ec692c142bb9ee404764e3b67999031ad19 > Author: Chunwei Chen <tux...@gmail.com> > Date: Sat Dec 21 13:48:11 2013 +0800 > > perf config: Ignore generated files in feature-checks > > 1. Rename the test-* binary files to test-*.bin for easier pattern > matching as > suggested by Ingo. > 2. Ignore *.bin and *.d files. > > Signed-off-by: Chunwei Chen <tux...@gmail.com> > Reviewed-by: Ingo Molnar <mi...@kernel.org> > Acked-by: Jiri Olsa <jo...@redhat.com> > Cc: Ingo Molnar <mi...@kernel.org> > Cc: Jiri Olsa <jo...@redhat.com> > Link: http://lkml.kernel.org/r/52b52b9b.50...@gmail.com > Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> Thanks, I'll fix this up. - Arnaldo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
