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

Commit 13b102bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull Sparc fixes from David Miller:
 "Sparc bug fixes, one of which was preventing successful SMP boots with
  mainline"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix pcr_ops initialization and usage bugs.
  sparc64: Do not disable interrupts in nmi_cpu_busy()
  sparc: Hook up seccomp and getrandom system calls.
  sparc: fix decimal printf format specifiers prefixed with 0x
parents 81c02a21 8bccf5b3

arch/sparc/include/uapi/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -411,8 +411,10 @@ 
#define __NR_sched_setattr	343

#define __NR_sched_getattr	344

#define __NR_renameat2		345

#define __NR_seccomp		346

#define __NR_getrandom		347



#define NR_syscalls		346

#define NR_syscalls		348



/* Bitmask values returned from kern_features system call.  */

#define KERN_FEATURE_MIXED_MODE_STACK	0x00000001

arch/sparc/kernel/nmi.c

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ static inline unsigned int get_nmi_count(int cpu) 


static __init void nmi_cpu_busy(void *data)

{

	local_irq_enable_in_hardirq();

	while (endflag == 0)

		mb();

}

arch/sparc/kernel/perf_event.c

+5 −2
Original line number Diff line number Diff line
@@ -1671,9 +1671,12 @@ static bool __init supported_pmu(void) 


static int __init init_hw_perf_events(void)

{

	int err;



	pr_info("Performance events: ");



	if (!supported_pmu()) {

	err = pcr_arch_init();

	if (err || !supported_pmu()) {

		pr_cont("No support for PMU type '%s'\n", sparc_pmu_type);

		return 0;

	}
@@ -1685,7 +1688,7 @@ static int __init init_hw_perf_events(void) 


	return 0;

}

early_initcall(init_hw_perf_events);

pure_initcall(init_hw_perf_events);



void perf_callchain_kernel(struct perf_callchain_entry *entry,

			   struct pt_regs *regs)

arch/sparc/kernel/process_64.c

+3 −0
Original line number Diff line number Diff line
@@ -312,6 +312,9 @@ static void __global_pmu_self(int this_cpu) 
	struct global_pmu_snapshot *pp;

	int i, num;



	if (!pcr_ops)

		return;



	pp = &global_cpu_snapshot[this_cpu].pmu;



	num = 1;

arch/sparc/kernel/smp_32.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void smp_store_cpu_info(int id) 
	mid = cpu_get_hwmid(cpu_node);



	if (mid < 0) {

		printk(KERN_NOTICE "No MID found for CPU%d at node 0x%08d", id, cpu_node);

		printk(KERN_NOTICE "No MID found for CPU%d at node 0x%08x", id, cpu_node);

		mid = 0;

	}

	cpu_data(id).mid = mid;