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

Commit 62326650 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  alpha: fix x86.git merge build error
  ia64: on UP percpu variables are not small memory model
  x86: fix arch/x86/kernel/test_nx.c modular build bug
  s390: use generic percpu linux-2.6.git
  POWERPC: use generic per cpu
  ia64: use generic percpu
  SPARC64: use generic percpu
  percpu: change Kconfig to HAVE_SETUP_PER_CPU_AREA
  modules: fold percpu_modcopy into module.c
  x86: export copy_from_user_ll_nocache[_nozero]
  x86: fix duplicated TIF on 64-bit
parents 94ed294c c18d1250

arch/ia64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ config GENERIC_TIME_VSYSCALL 
	bool

	default y



config ARCH_SETS_UP_PER_CPU_AREA

config HAVE_SETUP_PER_CPU_AREA

	def_bool y



config DMI

arch/ia64/kernel/module.c

+0 −11
Original line number Diff line number Diff line
@@ -940,14 +940,3 @@ module_arch_cleanup (struct module *mod) 
	if (mod->arch.core_unw_table)

		unw_remove_unwind_table(mod->arch.core_unw_table);

}
 


#ifdef CONFIG_SMP

void

percpu_modcopy (void *pcpudst, const void *src, unsigned long size)

{

	unsigned int i;

	for_each_possible_cpu(i) {

		memcpy(pcpudst + per_cpu_offset(i), src, size);

	}

}

#endif /* CONFIG_SMP */

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ config GENERIC_HARDIRQS 
	bool

	default y



config ARCH_SETS_UP_PER_CPU_AREA

config HAVE_SETUP_PER_CPU_AREA

	def_bool PPC64



config IRQ_PER_CPU

arch/sparc64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ config AUDIT_ARCH 
	bool

	default y



config ARCH_SETS_UP_PER_CPU_AREA

config HAVE_SETUP_PER_CPU_AREA

	def_bool y



config ARCH_NO_VIRT_TO_BUS

arch/sparc64/mm/init.c

+5 −0
Original line number Diff line number Diff line
@@ -1328,6 +1328,11 @@ pgd_t swapper_pg_dir[2048]; 
static void sun4u_pgprot_init(void);

static void sun4v_pgprot_init(void);



/* Dummy function */

void __init setup_per_cpu_areas(void)

{

}



void __init paging_init(void)

{

	unsigned long end_pfn, pages_avail, shift, phys_base;