From: Tejun Heo <tj@kernel.org>
Date: Tue, 15 Sep 2009 00:57:19 +0000 (+0900)
Subject: Merge branch 'for-next' into for-linus
X-Git-Tag: v3.0~8007^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5579fd7e6aed8860ea0c8e3f11897493153b10ad;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'for-next' into for-linus

* 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
---

5579fd7e6aed8860ea0c8e3f11897493153b10ad
diff --cc mm/percpu.c
index 3311c89,7793392..43d8cac
--- a/mm/percpu.c
+++ b/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));
  }