Commit 45179fec authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Fixes cherry picked from perf/core.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents d0caf292 509605db

tools/perf/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ endif 


CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

EXTLIBS = -lpthread -lrt -lelf -lm

ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

ALL_LDFLAGS = $(LDFLAGS)

STRIP ?= strip
@@ -168,10 +168,7 @@ endif 


### --- END CONFIGURATION SECTION ---



# Those must not be GNU-specific; they are shared with perl/ which may

# be built by a different compiler. (Note that this is an artifact now

# but it still might be nice to keep that distinction.)

BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include

BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

BASIC_LDFLAGS =



# Guard against environment variables

tools/perf/builtin-probe.c

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 *

 */

#define _GNU_SOURCE

#include <sys/utsname.h>

#include <sys/types.h>

#include <sys/stat.h>
@@ -31,7 +30,6 @@ 
#include <stdlib.h>

#include <string.h>



#undef _GNU_SOURCE

#include "perf.h"

#include "builtin.h"

#include "util/util.h"

tools/perf/builtin-top.c

+10 −3
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ void get_term_dimensions(struct winsize *ws) 


static void perf_top__update_print_entries(struct perf_top *top)

{

	top->print_entries = top->winsize.ws_row;



	if (top->print_entries > 9)

		top->print_entries -= 9;

}
@@ -100,6 +98,13 @@ static void perf_top__sig_winch(int sig __used, siginfo_t *info __used, void *ar 
	struct perf_top *top = arg;



	get_term_dimensions(&top->winsize);

	if (!top->print_entries

	    || (top->print_entries+4) > top->winsize.ws_row) {

		top->print_entries = top->winsize.ws_row;

	} else {

		top->print_entries += 4;

		top->winsize.ws_row = top->print_entries;

	}

	perf_top__update_print_entries(top);

}
@@ -453,8 +458,10 @@ static void perf_top__handle_keypress(struct perf_top *top, int c) 
				};

				perf_top__sig_winch(SIGWINCH, NULL, top);

				sigaction(SIGWINCH, &act, NULL);

			} else

			} else {

				perf_top__sig_winch(SIGWINCH, NULL, top);

				signal(SIGWINCH, SIG_DFL);

			}

			break;

		case 'E':

			if (top->evlist->nr_entries > 1) {

tools/perf/util/header.c

+1 −1
Original line number Diff line number Diff line
@@ -2105,7 +2105,7 @@ int perf_event__synthesize_event_type(struct perf_tool *tool, 
	strncpy(ev.event_type.event_type.name, name, MAX_EVENT_NAME - 1);



	ev.event_type.header.type = PERF_RECORD_HEADER_EVENT_TYPE;

	size = strlen(name);

	size = strlen(ev.event_type.event_type.name);

	size = ALIGN(size, sizeof(u64));

	ev.event_type.header.size = sizeof(ev.event_type) -

		(sizeof(ev.event_type.event_type.name) - size);

tools/perf/util/probe-event.c

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
 *

 */



#define _GNU_SOURCE

#include <sys/utsname.h>

#include <sys/types.h>

#include <sys/stat.h>
@@ -33,7 +32,6 @@ 
#include <limits.h>

#include <elf.h>



#undef _GNU_SOURCE

#include "util.h"

#include "event.h"

#include "string.h"