Commit 99ebcf82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v28-timers-for-linus' of... 

Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (36 commits)
  fix documentation of sysrq-q really
  Fix documentation of sysrq-q
  timer_list: add base address to clock base
  timer_list: print cpu number of clockevents device
  timer_list: print real timer address
  NOHZ: restart tick device from irq_enter()
  NOHZ: split tick_nohz_restart_sched_tick()
  NOHZ: unify the nohz function calls in irq_enter()
  timers: fix itimer/many thread hang, fix
  timers: fix itimer/many thread hang, v3
  ntp: improve adjtimex frequency rounding
  timekeeping: fix rounding problem during clock update
  ntp: let update_persistent_clock() sleep
  hrtimer: reorder struct hrtimer to save 8 bytes on 64bit builds
  posix-timers: lock_timer: make it readable
  posix-timers: lock_timer: kill the bogus ->it_id check
  posix-timers: kill ->it_sigev_signo and ->it_sigev_value
  posix-timers: sys_timer_create: cleanup the error handling
  posix-timers: move the initialization of timer->sigq from send to create path
  posix-timers: sys_timer_create: simplify and s/tasklist/rcu/
  ...

Fix trivial conflicts due to sysrq-q description clahes in
Documentation/sysrq.txt and drivers/char/sysrq.c
parents 72558dde c465a76a

Documentation/sysrq.txt

+3 −2
Original line number Diff line number Diff line
@@ -95,8 +95,9 @@ On all - write a character to /proc/sysrq-trigger. e.g.: 


'p'     - Will dump the current registers and flags to your console.



'q'     - Will dump a list of all running hrtimers.

	  WARNING: Does not cover any other timers

'q'     - Will dump per CPU lists of all armed hrtimers (but NOT regular

          timer_list timers) and detailed information about all

          clockevent devices.



'r'     - Turns off keyboard raw mode and sets it to XLATE.

drivers/char/sysrq.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void sysrq_handle_show_timers(int key, struct tty_struct *tty) 
static struct sysrq_key_op sysrq_show_timers_op = {

	.handler	= sysrq_handle_show_timers,

	.help_msg	= "show-all-timers(Q)",

	.action_msg	= "Show pending hrtimers (no others)",

	.action_msg	= "Show clockevent devices & pending hrtimers (no others)",

};



static void sysrq_handle_mountro(int key, struct tty_struct *tty)

drivers/clocksource/acpi_pm.c

+5 −2
Original line number Diff line number Diff line
@@ -237,9 +237,12 @@ static int __init parse_pmtmr(char *arg) 


	if (strict_strtoul(arg, 16, &base))

		return -EINVAL;



#ifdef CONFIG_X86_64

	if (base > UINT_MAX)

		return -ERANGE;

#endif

	printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n",

	       (unsigned int)pmtmr_ioport, base);

	       pmtmr_ioport, base);

	pmtmr_ioport = base;



	return 1;

fs/binfmt_elf.c

+7 −12
Original line number Diff line number Diff line
@@ -1341,20 +1341,15 @@ static void fill_prstatus(struct elf_prstatus *prstatus, 
	prstatus->pr_pgrp = task_pgrp_vnr(p);

	prstatus->pr_sid = task_session_vnr(p);

	if (thread_group_leader(p)) {

		struct task_cputime cputime;



		/*

		 * This is the record for the group leader.  Add in the

		 * cumulative times of previous dead threads.  This total

		 * won't include the time of each live thread whose state

		 * is included in the core dump.  The final total reported

		 * to our parent process when it calls wait4 will include

		 * those sums as well as the little bit more time it takes

		 * this and each other thread to finish dying after the

		 * core dump synchronization phase.

		 * This is the record for the group leader.  It shows the

		 * group-wide total, not its individual thread total.

		 */

		cputime_to_timeval(cputime_add(p->utime, p->signal->utime),

				   &prstatus->pr_utime);

		cputime_to_timeval(cputime_add(p->stime, p->signal->stime),

				   &prstatus->pr_stime);

		thread_group_cputime(p, &cputime);

		cputime_to_timeval(cputime.utime, &prstatus->pr_utime);

		cputime_to_timeval(cputime.stime, &prstatus->pr_stime);

	} else {

		cputime_to_timeval(p->utime, &prstatus->pr_utime);

		cputime_to_timeval(p->stime, &prstatus->pr_stime);

fs/proc/array.c

+4 −4
Original line number Diff line number Diff line
@@ -388,20 +388,20 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, 


		/* add up live thread stats at the group level */

		if (whole) {

			struct task_cputime cputime;

			struct task_struct *t = task;

			do {

				min_flt += t->min_flt;

				maj_flt += t->maj_flt;

				utime = cputime_add(utime, task_utime(t));

				stime = cputime_add(stime, task_stime(t));

				gtime = cputime_add(gtime, task_gtime(t));

				t = next_thread(t);

			} while (t != task);



			min_flt += sig->min_flt;

			maj_flt += sig->maj_flt;

			utime = cputime_add(utime, sig->utime);

			stime = cputime_add(stime, sig->stime);

			thread_group_cputime(task, &cputime);

			utime = cputime.utime;

			stime = cputime.stime;

			gtime = cputime_add(gtime, sig->gtime);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE