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

1 files changed, 3 insertions, 6 deletions

diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
index 7910d41eb886..c4b56654349a 100644
--- a/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -124,14 +124,11 @@ SECTIONS
                 _end = .;
         }
 
+        DWARF_DEBUG
+
         /* When something in the kernel is NOT compiled as a module, the module
          * cleanup code and data are put into these segments. Both can then be
          * thrown away, as cleanup code is never called unless it's a module.
          */
-        /DISCARD/               : {
-                EXIT_DATA
-                *(.exitcall.exit)
-        }
-
-        DWARF_DEBUG
+        DISCARDS
 }