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

Conflicts:

	arch/x86/include/asm/topology.h
	drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index ced39f602292..3cffce90f82a 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -183,10 +183,6 @@ static int __init oprofile_init(void)
 {
         int err;
 
-        err = buffer_sync_init();
-        if (err)
-                return err;
-
         err = oprofile_arch_init(&oprofile_ops);
 
         if (err < 0 || timer) {
@@ -195,10 +191,8 @@ static int __init oprofile_init(void)
         }
 
         err = oprofilefs_register();
-        if (err) {
+        if (err)
                 oprofile_arch_exit();
-                buffer_sync_cleanup();
-        }
 
         return err;
 }
@@ -208,7 +202,6 @@ static void __exit oprofile_exit(void)
 {
         oprofilefs_unregister();
         oprofile_arch_exit();
-        buffer_sync_cleanup();
 }