Subject: linux-next: manual merge of the rr tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 6 Jan 2009 14:11:41 +1100

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in init/main.c
between commit b9ce08c01020eb28bfbfa6faf1c740281c5f418e ("kmemtrace: Core
implementation") from the ftrace tree and commit
4289941b45ac95092f80c23d08ee88ccbd7635a3
("cpualloc:expose-module-percpu-allocator") from the rr tree.

Juts trivial overlapping additions.  I fixed it up (see below) and can
carry the fix as necessary.  I wasn't actually sure if the order
matters ...
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

diff --cc init/main.c
index 240e1ef,8a2d82c..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -650,7 -650,7 +658,8 @@@ asmlinkage void __init start_kernel(voi
  	enable_debug_pagealloc();
  	cpu_hotplug_init();
  	kmem_cache_init();
+ 	percpu_alloc_init();
 +	kmemtrace_init();
  	debug_objects_mem_init();
  	idr_init_cache();
  	setup_per_cpu_pageset();