Merge branch 'for-next' into for-linus
Tejun Heo [Tue, 15 Sep 2009 00:57:19 +0000 (09:57 +0900)]
* pcpu_chunk_page_occupied() doesn't exist in for-next.
* pcpu_chunk_addr_search() updated to use raw_smp_processor_id().

Conflicts:
mm/percpu.c

1  2 
mm/percpu.c

diff --cc mm/percpu.c
@@@ -309,7 -347,7 +347,7 @@@ static struct pcpu_chunk *pcpu_chunk_ad
         * space.  Note that any possible cpu id can be used here, so
         * there's no need to worry about preemption or cpu hotplug.
         */
-       addr += raw_smp_processor_id() * pcpu_unit_size;
 -      addr += pcpu_unit_offsets[smp_processor_id()];
++      addr += pcpu_unit_offsets[raw_smp_processor_id()];
        return pcpu_get_page_chunk(vmalloc_to_page(addr));
  }