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

Commit bfe2a3c3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/percpu' into perfcounters/core 



Conflicts:
	arch/x86/include/asm/hardirq_32.h
	arch/x86/include/asm/hardirq_64.h

Semantic merge:
	arch/x86/include/asm/hardirq.h
	[ added apic_perf_irqs field. ]

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 77835492 35d266a2

arch/ia64/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void build_cpu_to_node_map(void); 
	.child			= NULL,			\

	.groups			= NULL,			\

	.min_interval		= 8,			\

	.max_interval		= 8*(min(num_online_cpus(), 32)), \

	.max_interval		= 8*(min(num_online_cpus(), 32U)), \

	.busy_factor		= 64,			\

	.imbalance_pct		= 125,			\

	.cache_nice_tries	= 2,			\

arch/x86/Kconfig

+17 −13
Original line number Diff line number Diff line
@@ -391,6 +391,13 @@ config X86_RDC321X 
	  as R-8610-(G).

	  If you don't have one of these chips, you should say N here.



config X86_UV

	bool "SGI Ultraviolet"

	depends on X86_64

	help

	  This option is needed in order to support SGI Ultraviolet systems.

	  If you don't have one of these, you should say N here.



config SCHED_OMIT_FRAME_POINTER

	def_bool y

	prompt "Single-depth WCHAN output"
@@ -1341,13 +1348,17 @@ config SECCOMP 


	  If unsure, say Y. Only embedded should say N here.



config CC_STACKPROTECTOR_ALL

	bool



config CC_STACKPROTECTOR

	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"

	depends on X86_64 && EXPERIMENTAL && BROKEN

	depends on X86_64

	select CC_STACKPROTECTOR_ALL

	help

          This option turns on the -fstack-protector GCC feature. This

	  feature puts, at the beginning of critical functions, a canary

	  value on the stack just before the return address, and validates

	  feature puts, at the beginning of functions, a canary value on

	  the stack just before the return address, and validates

	  the value just before actually returning.  Stack based buffer

	  overflows (that need to overwrite this return address) now also

	  overwrite the canary, which gets detected and the attack is then
@@ -1355,15 +1366,8 @@ config CC_STACKPROTECTOR 


	  This feature requires gcc version 4.2 or above, or a distribution

	  gcc with the feature backported. Older versions are automatically

	  detected and for those versions, this configuration option is ignored.



config CC_STACKPROTECTOR_ALL

	bool "Use stack-protector for all functions"

	depends on CC_STACKPROTECTOR

	help

	  Normally, GCC only inserts the canary value protection for

	  functions that use large-ish on-stack buffers. By enabling

	  this option, GCC will be asked to do this for ALL functions.

	  detected and for those versions, this configuration option is

	  ignored. (and a warning is printed during bootup)



source kernel/Kconfig.hz

arch/x86/Kconfig.cpu

+4 −6
Original line number Diff line number Diff line
@@ -292,25 +292,23 @@ config X86_CPU 
# Define implied options from the CPU selection here

config X86_L1_CACHE_BYTES

	int

	default "128" if GENERIC_CPU || MPSC

	default "64" if MK8 || MCORE2

	depends on X86_64

	default "128" if MPSC

	default "64" if GENERIC_CPU || MK8 || MCORE2 || X86_32



config X86_INTERNODE_CACHE_BYTES

	int

	default "4096" if X86_VSMP

	default X86_L1_CACHE_BYTES if !X86_VSMP

	depends on X86_64



config X86_CMPXCHG

	def_bool X86_64 || (X86_32 && !M386)



config X86_L1_CACHE_SHIFT

	int

	default "7" if MPENTIUM4 || X86_GENERIC || GENERIC_CPU || MPSC

	default "7" if MPENTIUM4 || MPSC

	default "4" if X86_ELAN || M486 || M386 || MGEODEGX1

	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX

	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MVIAC7

	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MVIAC7 || X86_GENERIC || GENERIC_CPU



config X86_XADD

	def_bool y

arch/x86/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ config DEBUG_RODATA 
config DEBUG_RODATA_TEST

	bool "Testcase for the DEBUG_RODATA feature"

	depends on DEBUG_RODATA

	default y

	help

	  This option enables a testcase for the DEBUG_RODATA

	  feature as well as for the change_page_attr() infrastructure.

arch/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ else 


        stackp := $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh

        stackp-$(CONFIG_CC_STACKPROTECTOR) := $(shell $(stackp) \

                "$(CC)" -fstack-protector )

                "$(CC)" "-fstack-protector -DGCC_HAS_SP" )

        stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(stackp) \

                "$(CC)" -fstack-protector-all )