Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6313e3c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and... 

Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/pvclock: Zero last_value on resume

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf record: Fix eternal wait for stillborn child
  perf header: Don't assume there's no attr info if no sample ids is provided
  perf symbols: Figure out start address of kernel map from kallsyms
  perf symbols: Fix kallsyms kernel/module map splitting

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  nohz: Fix printk_needs_cpu() return value on offline cpus
  printk: Fix wake_up_klogd() vs cpu hotplug
parents 6dde39be e7a3481c 18483b81 61ab2544

arch/x86/include/asm/pvclock.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src); 
void pvclock_read_wallclock(struct pvclock_wall_clock *wall,

			    struct pvclock_vcpu_time_info *vcpu,

			    struct timespec *ts);

void pvclock_resume(void);



/*

 * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction,

arch/x86/kernel/pvclock.c

+5 −0
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src) 


static atomic64_t last_value = ATOMIC64_INIT(0);



void pvclock_resume(void)

{

	atomic64_set(&last_value, 0);

}



cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)

{

	struct pvclock_shadow_time shadow;

arch/x86/xen/time.c

+2 −0
Original line number Diff line number Diff line
@@ -426,6 +426,8 @@ void xen_timer_resume(void) 
{

	int cpu;



	pvclock_resume();



	if (xen_clockevent != &xen_vcpuop_clockevent)

		return;

kernel/printk.c

+3 −1
Original line number Diff line number Diff line
@@ -1082,13 +1082,15 @@ void printk_tick(void) 


int printk_needs_cpu(int cpu)

{

	if (unlikely(cpu_is_offline(cpu)))

		printk_tick();

	return per_cpu(printk_pending, cpu);

}



void wake_up_klogd(void)

{

	if (waitqueue_active(&log_wait))

		__raw_get_cpu_var(printk_pending) = 1;

		this_cpu_write(printk_pending, 1);

}



/**

tools/perf/builtin-record.c

+4 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void sig_atexit(void) 
	if (child_pid > 0)

		kill(child_pid, SIGTERM);



	if (signr == -1)

	if (signr == -1 || signr == SIGUSR1)

		return;



	signal(signr, SIG_DFL);
@@ -515,6 +515,7 @@ static int __cmd_record(int argc, const char **argv) 
	atexit(sig_atexit);

	signal(SIGCHLD, sig_handler);

	signal(SIGINT, sig_handler);

	signal(SIGUSR1, sig_handler);



	if (forks && (pipe(child_ready_pipe) < 0 || pipe(go_pipe) < 0)) {

		perror("failed to create pipes");
@@ -606,6 +607,7 @@ static int __cmd_record(int argc, const char **argv) 
			execvp(argv[0], (char **)argv);



			perror(argv[0]);

			kill(getppid(), SIGUSR1);

			exit(-1);

		}
@@ -762,7 +764,7 @@ static int __cmd_record(int argc, const char **argv) 
		}

	}



	if (quiet)

	if (quiet || signr == SIGUSR1)

		return 0;



	fprintf(stderr, "[ perf record: Woken up %ld times to write data ]\n", waking);