diff options
| author | Tejun Heo <tj@kernel.org> | 2009-09-14 20:57:19 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-09-14 20:57:19 -0400 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /arch/um/kernel/uml.lds.S | |
| parent | 04a13c7c632e1fe04a5f6e6c83565d2559e37598 (diff) | |
| parent | c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8 (diff) | |
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
Diffstat (limited to 'arch/um/kernel/uml.lds.S')
| -rw-r--r-- | arch/um/kernel/uml.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S index 11b835248b86..2ebd39765db8 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S | |||
| @@ -100,4 +100,6 @@ SECTIONS | |||
| 100 | STABS_DEBUG | 100 | STABS_DEBUG |
| 101 | 101 | ||
| 102 | DWARF_DEBUG | 102 | DWARF_DEBUG |
| 103 | |||
| 104 | DISCARDS | ||
| 103 | } | 105 | } |