Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8c500c2 authored by Pekka Enberg's avatar Pekka Enberg
Browse files

Merge branch 'slub/lockless' into for-linus 

Conflicts:
	include/linux/slub_def.h
parents c53badd0 a24c5a0e

arch/alpha/kernel/vmlinux.lds.S

+3 −2
Original line number Diff line number Diff line 
#include <asm-generic/vmlinux.lds.h>

#include <asm/thread_info.h>

#include <asm/cache.h>

#include <asm/page.h>



OUTPUT_FORMAT("elf64-alpha")
@@ -38,7 +39,7 @@ SECTIONS 
	__init_begin = ALIGN(PAGE_SIZE);

	INIT_TEXT_SECTION(PAGE_SIZE)

	INIT_DATA_SECTION(16)

	PERCPU(PAGE_SIZE)

	PERCPU(L1_CACHE_BYTES, PAGE_SIZE)

	/* Align to THREAD_SIZE rather than PAGE_SIZE here so any padding page

	   needed for the THREAD_SIZE aligned init_task gets freed after init */

	. = ALIGN(THREAD_SIZE);
@@ -46,7 +47,7 @@ SECTIONS 
	/* Freed after init ends here */



	_data = .;

	RW_DATA_SECTION(64, PAGE_SIZE, THREAD_SIZE)

	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)



	.got : {

		*(.got)

arch/arm/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ SECTIONS 
#endif

	}



	PERCPU(PAGE_SIZE)

	PERCPU(32, PAGE_SIZE)



#ifndef CONFIG_XIP_KERNEL

	. = ALIGN(PAGE_SIZE);

arch/blackfin/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ SECTIONS 


	. = ALIGN(16);

	INIT_DATA_SECTION(16)

	PERCPU(4)

	PERCPU(32, 4)



	.exit.data :

	{

arch/cris/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ SECTIONS 
#endif

	__vmlinux_end = .;		/* Last address of the physical file. */

#ifdef CONFIG_ETRAX_ARCH_V32

	PERCPU(PAGE_SIZE)

	PERCPU(32, PAGE_SIZE)



	.init.ramfs : {

		INIT_RAM_FS

arch/frv/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ SECTIONS 
  _einittext = .;



  INIT_DATA_SECTION(8)

  PERCPU(4096)

  PERCPU(L1_CACHE_BYTES, 4096)



  . = ALIGN(PAGE_SIZE);

  __init_end = .;