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

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

Merge branch 'core/percpu' into x86/core

parents f8a6b2b9 58105ef1

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -532,8 +532,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/ia64/include/asm/percpu.h

+2 −2
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ extern void *per_cpu_init(void); 


#else /* ! SMP */



#define PER_CPU_ATTRIBUTES	__attribute__((__section__(".data.percpu")))



#define per_cpu_init()				(__phys_per_cpu_start)



#endif	/* SMP */



#define PER_CPU_BASE_SECTION ".data.percpu"



/*

 * Be extremely careful when taking the address of this variable!  Due to virtual

 * remapping, it is different from the canonical address returned by __get_cpu_var(var)!

arch/ia64/include/asm/uv/uv.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#ifndef _ASM_IA64_UV_UV_H

#define _ASM_IA64_UV_UV_H



#include <asm/system.h>

#include <asm/sn/simulator.h>



static inline int is_uv_system(void)

{

	/* temporary support for running on hardware simulator */

	return IS_MEDUSA() || ia64_platform_is("uv");

}



#endif	/* _ASM_IA64_UV_UV_H */

arch/x86/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -194,6 +194,10 @@ config X86_TRAMPOLINE 
	depends on SMP || (64BIT && ACPI_SLEEP)

	default y



config X86_32_LAZY_GS

	def_bool y

	depends on X86_32 && !CC_STACKPROTECTOR



config KTIME_SCALAR

	def_bool X86_32

source "init/Kconfig"
@@ -1339,7 +1343,6 @@ config CC_STACKPROTECTOR_ALL 


config CC_STACKPROTECTOR

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

	depends on X86_64

	select CC_STACKPROTECTOR_ALL

	---help---

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

arch/x86/Makefile

+10 −7
Original line number Diff line number Diff line
@@ -70,14 +70,17 @@ else 
        # this works around some issues with generating unwind tables in older gccs

        # newer gccs do it by default

        KBUILD_CFLAGS += -maccumulate-outgoing-args

endif



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

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

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

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

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



ifdef CONFIG_CC_STACKPROTECTOR

	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh

        ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC)),y)

                stackp-y := -fstack-protector

                stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all

                KBUILD_CFLAGS += $(stackp-y)

        else

                $(warning stack protector enabled but no compiler support)

        endif

endif



# Stackpointer is addressed different for 32 bit and 64 bit x86