Merge commit 'v2.6.27-rc5' into tip/oprofile
Robert Richter [Wed, 24 Sep 2008 09:25:31 +0000 (11:25 +0200)]
Conflicts:
arch/x86/oprofile/nmi_int.c

1  2 
arch/x86/oprofile/nmi_int.c
drivers/oprofile/cpu_buffer.c
include/linux/pci_ids.h

@@@ -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;
  
  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();
  }
Simple merge
Simple merge