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

Commit 297ea1b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull cleanup patchlet from Thomas Gleixner:
 "A single commit removing a bunch of bogus double semicolons all over
  the tree"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  treewide/trivial: Remove ';;$' typo noise
parents c89be524 ed7158ba

arch/arc/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static void arc_chk_core_config(void) 
{

	struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];

	int saved = 0, present = 0;

	char *opt_nm = NULL;;

	char *opt_nm = NULL;



	if (!cpu->extn.timer0)

		panic("Timer0 is not present!\n");

arch/arc/kernel/unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static void init_unwind_hdr(struct unwind_table *table, 
	return;



ret_err:

	panic("Attention !!! Dwarf FDE parsing errors\n");;

	panic("Attention !!! Dwarf FDE parsing errors\n");

}



#ifdef CONFIG_MODULES

arch/arm/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void dummy_clock_access(struct timespec64 *ts) 
}



static clock_access_fn __read_persistent_clock = dummy_clock_access;

static clock_access_fn __read_boot_clock = dummy_clock_access;;

static clock_access_fn __read_boot_clock = dummy_clock_access;



void read_persistent_clock64(struct timespec64 *ts)

{

arch/arm64/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -1419,7 +1419,7 @@ static int compat_ptrace_hbp_get(unsigned int note_type, 
	u64 addr = 0;

	u32 ctrl = 0;



	int err, idx = compat_ptrace_hbp_num_to_idx(num);;

	int err, idx = compat_ptrace_hbp_num_to_idx(num);



	if (num & 1) {

		err = ptrace_hbp_get_addr(note_type, tsk, idx, &addr);

arch/powerpc/kvm/book3s_xive.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int xive_provision_queue(struct kvm_vcpu *vcpu, u8 prio) 
	if (!qpage) {

		pr_err("Failed to allocate queue %d for VCPU %d\n",

		       prio, xc->server_num);

		return -ENOMEM;;

		return -ENOMEM;

	}

	memset(qpage, 0, 1 << xive->q_order);