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

Commit 7c730ccd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'percpu-cpumask-x86-for-linus-2' of... 

Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (682 commits)
  percpu: fix spurious alignment WARN in legacy SMP percpu allocator
  percpu: generalize embedding first chunk setup helper
  percpu: more flexibility for @dyn_size of pcpu_setup_first_chunk()
  percpu: make x86 addr <-> pcpu ptr conversion macros generic
  linker script: define __per_cpu_load on all SMP capable archs
  x86: UV: remove uv_flush_tlb_others() WARN_ON
  percpu: finer grained locking to break deadlock and allow atomic free
  percpu: move fully free chunk reclamation into a work
  percpu: move chunk area map extension out of area allocation
  percpu: replace pcpu_realloc() with pcpu_mem_alloc() and pcpu_mem_free()
  x86, percpu: setup reserved percpu area for x86_64
  percpu, module: implement reserved allocation and use it for module percpu variables
  percpu: add an indirection ptr for chunk page map access
  x86: make embedding percpu allocator return excessive free space
  percpu: use negative for auto for pcpu_setup_first_chunk() arguments
  percpu: improve first chunk initial area map handling
  percpu: cosmetic renames in pcpu_setup_first_chunk()
  percpu: clean up percpu constants
  x86: un-__init fill_pud/pmd/pte
  x86: remove vestigial fix_ioremap prototypes
  ...

Manually merge conflicts in arch/ia64/kernel/irq_ia64.c
parents 8d735b41 82268da1

Documentation/cputopology.txt

+3 −3
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ For an architecture to support this feature, it must define some of 
these macros in include/asm-XXX/topology.h:

#define topology_physical_package_id(cpu)

#define topology_core_id(cpu)

#define topology_thread_siblings(cpu)

#define topology_core_siblings(cpu)

#define topology_thread_cpumask(cpu)

#define topology_core_cpumask(cpu)



The type of **_id is int.

The type of siblings is cpumask_t.

The type of siblings is (const) struct cpumask *.



To be consistent on all architectures, include/linux/topology.h

provides default definitions for any of the above macros that are

Documentation/kernel-parameters.txt

+6 −1
Original line number Diff line number Diff line
@@ -1325,8 +1325,13 @@ and is between 256 and 4096 characters. It is defined in the file 


	memtest=	[KNL,X86] Enable memtest

			Format: <integer>

			range: 0,4 : pattern number

			default : 0 <disable>

			Specifies the number of memtest passes to be

			performed. Each pass selects another test

			pattern from a given set of patterns. Memtest

			fills the memory with this pattern, validates

			memory contents and reserves bad memory

			regions that are detected.



	meye.*=		[HW] Set MotionEye Camera parameters

			See Documentation/video4linux/meye.txt.

Documentation/x86/boot.txt

+11 −7
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ Offset Proto Name Meaning 
0202/4	2.00+	header		Magic signature "HdrS"

0206/2	2.00+	version		Boot protocol version supported

0208/4	2.00+	realmode_swtch	Boot loader hook (see below)

020C/2	2.00+	start_sys	The load-low segment (0x1000) (obsolete)

020C/2	2.00+	start_sys_seg	The load-low segment (0x1000) (obsolete)

020E/2	2.00+	kernel_version	Pointer to kernel version string

0210/1	2.00+	type_of_loader	Boot loader identifier

0211/1	2.00+	loadflags	Boot protocol option flags
@@ -170,10 +170,11 @@ Offset Proto Name Meaning 
0224/2	2.01+	heap_end_ptr	Free memory after setup end

0226/2	N/A	pad1		Unused

0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line

022C/4	2.03+	initrd_addr_max	Highest legal initrd address

022C/4	2.03+	ramdisk_max	Highest legal initrd address

0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not

0235/3	N/A	pad2		Unused

0235/1	N/A	pad2		Unused

0236/2	N/A	pad3		Unused

0238/4	2.06+	cmdline_size	Maximum size of the kernel command line

023C/4	2.07+	hardware_subarch Hardware subarchitecture

0240/8	2.07+	hardware_subarch_data Subarchitecture-specific data
@@ -299,14 +300,14 @@ Protocol: 2.00+ 
  e.g. 0x0204 for version 2.04, and 0x0a11 for a hypothetical version

  10.17.



Field name:	readmode_swtch

Field name:	realmode_swtch

Type:		modify (optional)

Offset/size:	0x208/4

Protocol:	2.00+



  Boot loader hook (see ADVANCED BOOT LOADER HOOKS below.)



Field name:	start_sys

Field name:	start_sys_seg

Type:		read

Offset/size:	0x20c/2

Protocol:	2.00+
@@ -468,7 +469,7 @@ Protocol: 2.02+ 
  zero, the kernel will assume that your boot loader does not support

  the 2.02+ protocol.



Field name:	initrd_addr_max

Field name:	ramdisk_max

Type:		read

Offset/size:	0x22c/4

Protocol:	2.03+
@@ -542,7 +543,10 @@ Protocol: 2.08+ 


  The payload may be compressed. The format of both the compressed and

  uncompressed data should be determined using the standard magic

  numbers. Currently only gzip compressed ELF is used.

  numbers.  The currently supported compression formats are gzip

  (magic numbers 1F 8B or 1F 9E), bzip2 (magic number 42 5A) and LZMA

  (magic number 5D 00).  The uncompressed payload is currently always ELF

  (magic number 7F 45 4C 46).

  

Field name:	payload_length

Type:		read

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -533,8 +533,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN}) 
endif



# Force gcc to behave correct even for buggy distributions

# Arch Makefiles may override this setting

ifndef CONFIG_CC_STACKPROTECTOR

KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)

endif



ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

arch/alpha/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int irq_select_affinity(unsigned int irq) 
		cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);

	last_cpu = cpu;



	irq_desc[irq].affinity = cpumask_of_cpu(cpu);

	cpumask_copy(irq_desc[irq].affinity, cpumask_of(cpu));

	irq_desc[irq].chip->set_affinity(irq, cpumask_of(cpu));

	return 0;

}