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

Commit ac3f4822 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus-2' of... 

Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  dma-debug: Fix the overlap() function to be correct and readable
  oprofile: reset bt_lost_no_mapping with other stats
  x86/oprofile: rename kernel parameter for architectural perfmon to arch_perfmon
  signals: declare sys_rt_tgsigqueueinfo in syscalls.h
  rcu: Mark Hierarchical RCU no longer experimental
  dma-debug: Put all hash-chain locks into the same lock class
  dma-debug: fix off-by-one error in overlap function
parents 85be928c f39d1b97

Documentation/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -1720,8 +1720,8 @@ and is between 256 and 4096 characters. It is defined in the file 
	oprofile.cpu_type=	Force an oprofile cpu type

			This might be useful if you have an older oprofile

			userland or if you want common events.

			Format: { archperfmon }

			archperfmon: [X86] Force use of architectural

			Format: { arch_perfmon }

			arch_perfmon: [X86] Force use of architectural

				perfmon on Intel CPUs instead of the

				CPU specific event set.

arch/x86/oprofile/nmi_int.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int __init p4_init(char **cpu_type) 
static int force_arch_perfmon;

static int force_cpu_type(const char *str, struct kernel_param *kp)

{

	if (!strcmp(str, "archperfmon")) {

	if (!strcmp(str, "arch_perfmon")) {

		force_arch_perfmon = 1;

		printk(KERN_INFO "oprofile: forcing architectural perfmon\n");

	}

drivers/oprofile/oprofile_stats.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ void oprofile_reset_stats(void) 
	atomic_set(&oprofile_stats.sample_lost_no_mm, 0);

	atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);

	atomic_set(&oprofile_stats.event_lost_overflow, 0);

	atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);

}

include/linux/syscalls.h

+2 −0
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ asmlinkage long sys_rt_sigtimedwait(const sigset_t __user *uthese, 
				siginfo_t __user *uinfo,

				const struct timespec __user *uts,

				size_t sigsetsize);

asmlinkage long sys_rt_tgsigqueueinfo(pid_t tgid, pid_t  pid, int sig,

		siginfo_t __user *uinfo);

asmlinkage long sys_kill(int pid, int sig);

asmlinkage long sys_tgkill(int tgid, int pid, int sig);

asmlinkage long sys_tkill(int pid, int sig);

kernel/rcutree.c

+1 −2
Original line number Diff line number Diff line
@@ -1533,7 +1533,7 @@ void __init __rcu_init(void) 
	int j;

	struct rcu_node *rnp;



	printk(KERN_WARNING "Experimental hierarchical RCU implementation.\n");

	printk(KERN_INFO "Hierarchical RCU implementation.\n");

#ifdef CONFIG_RCU_CPU_STALL_DETECTOR

	printk(KERN_INFO "RCU-based detection of stalled CPUs is enabled.\n");

#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
@@ -1546,7 +1546,6 @@ void __init __rcu_init(void) 
		rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE, (void *)(long)i);

	/* Register notifier for non-boot CPUs */

	register_cpu_notifier(&rcu_nb);

	printk(KERN_WARNING "Experimental hierarchical RCU init done.\n");

}



module_param(blimit, int, 0);