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

Commit 1b95b1a0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'locking/urgent' into locking/core, to pick up dependent fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3cded417 1be5d4fa

arch/tile/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -218,8 +218,8 @@ void do_timer_interrupt(struct pt_regs *regs, int fault_num) 
 */

unsigned long long sched_clock(void)

{

	return clocksource_cyc2ns(get_cycles(),

				  sched_clock_mult, SCHED_CLOCK_SHIFT);

	return mult_frac(get_cycles(),

			 sched_clock_mult, 1ULL << SCHED_CLOCK_SHIFT);

}



int setup_profiling_timer(unsigned int multiplier)

arch/x86/boot/compressed/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ GCOV_PROFILE := n 
UBSAN_SANITIZE :=n



LDFLAGS := -m elf_$(UTS_MACHINE)

ifeq ($(CONFIG_RELOCATABLE),y)

# If kernel is relocatable, build compressed kernel as PIE.

# Compressed kernel should be built as PIE since it may be loaded at any

# address by the bootloader.

ifeq ($(CONFIG_X86_32),y)

LDFLAGS += $(call ld-option, -pie) $(call ld-option, --no-dynamic-linker)

else
@@ -51,7 +51,6 @@ else 
LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \

	&& echo "-z noreloc-overflow -pie --no-dynamic-linker")

endif

endif

LDFLAGS_vmlinux := -T



hostprogs-y	:= mkpiggy

arch/x86/boot/cpu.c

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,12 @@ int validate_cpu(void) 
		return -1;

	}



	if (CONFIG_X86_MINIMUM_CPU_FAMILY <= 4 && !IS_ENABLED(CONFIG_M486) &&

	    !has_eflag(X86_EFLAGS_ID)) {

		printf("This kernel requires a CPU with the CPUID instruction.  Build with CONFIG_M486=y to run on this CPU.\n");

		return -1;

	}



	if (err_flags) {

		puts("This kernel requires the following features "

		     "not present on the CPU:\n");

arch/x86/events/amd/core.c

+7 −1
Original line number Diff line number Diff line
@@ -662,7 +662,13 @@ static int __init amd_core_pmu_init(void) 
		pr_cont("Fam15h ");

		x86_pmu.get_event_constraints = amd_get_event_constraints_f15h;

		break;



	case 0x17:

		pr_cont("Fam17h ");

		/*

		 * In family 17h, there are no event constraints in the PMC hardware.

		 * We fallback to using default amd_get_event_constraints.

		 */

		break;

	default:

		pr_err("core perfctr but no constraints; unknown hardware!\n");

		return -ENODEV;

arch/x86/events/core.c

+2 −8
Original line number Diff line number Diff line
@@ -2352,7 +2352,7 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent 
		frame.next_frame     = 0;

		frame.return_address = 0;



		if (!access_ok(VERIFY_READ, fp, 8))

		if (!valid_user_frame(fp, sizeof(frame)))

			break;



		bytes = __copy_from_user_nmi(&frame.next_frame, fp, 4);
@@ -2362,9 +2362,6 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent 
		if (bytes != 0)

			break;



		if (!valid_user_frame(fp, sizeof(frame)))

			break;



		perf_callchain_store(entry, cs_base + frame.return_address);

		fp = compat_ptr(ss_base + frame.next_frame);

	}
@@ -2413,7 +2410,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs 
		frame.next_frame	     = NULL;

		frame.return_address = 0;



		if (!access_ok(VERIFY_READ, fp, sizeof(*fp) * 2))

		if (!valid_user_frame(fp, sizeof(frame)))

			break;



		bytes = __copy_from_user_nmi(&frame.next_frame, fp, sizeof(*fp));
@@ -2423,9 +2420,6 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs 
		if (bytes != 0)

			break;



		if (!valid_user_frame(fp, sizeof(frame)))

			break;



		perf_callchain_store(entry, frame.return_address);

		fp = (void __user *)frame.next_frame;

	}