From: Robert Richter <robert.richter@amd.com>
Date: Wed, 24 Sep 2008 09:25:31 +0000 (+0200)
Subject: Merge commit 'v2.6.27-rc5' into tip/oprofile
X-Git-Tag: v2.6.28-rc1~35^2~15^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f78e80209cf143be49f268c340431ae9fa3abb74;p=linux-2.6-omap-h63xx.git

Merge commit 'v2.6.27-rc5' into tip/oprofile

Conflicts:
	arch/x86/oprofile/nmi_int.c
---

f78e80209cf143be49f268c340431ae9fa3abb74
diff --cc arch/x86/oprofile/nmi_int.c
index 287513a0981,0227694f7da..d9885741074
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@@ -468,7 -488,11 +494,10 @@@ int __init op_nmi_init(struct oprofile_
  		return -ENODEV;
  	}
  
 -	init_sysfs();
+ #ifdef CONFIG_SMP
+ 	register_cpu_notifier(&oprofile_cpu_nb);
+ #endif
 -	using_nmi = 1;
 +	/* default values, can be overwritten by model */
  	ops->create_files = nmi_create_files;
  	ops->setup = nmi_setup;
  	ops->shutdown = nmi_shutdown;
@@@ -489,8 -505,10 +518,12 @@@
  
  void op_nmi_exit(void)
  {
- 	if (using_nmi)
+ 	if (using_nmi) {
  		exit_sysfs();
+ #ifdef CONFIG_SMP
+ 		unregister_cpu_notifier(&oprofile_cpu_nb);
+ #endif
+ 	}
 +	if (model->exit)
 +		model->exit();
  }