[PATCH 0/2] arm64: remove some extra semicolon

[PATCH 0/2] arm64: remove some extra semicolon

[zhong jiang]

There are some extra semicolon in arm64 architecture. Just remove them.

zhong jiang (2):
  arm64/kprobes: remove an extra semicolon in arch_prepare_kprobe
  arm64:guest: remove some extra semicolon in kvm_target_cpu

 arch/arm64/kernel/probes/kprobes.c | 2 +-
 arch/arm64/kvm/guest.c             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
1.7.12.4

[PATCH 1/2] arm64/kprobes: remove an extra semicolon in arch_prepare_kprobe

[zhong jiang]

There is an extra semicolon in arch_prepare_kprobe, remove it.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
 arch/arm64/kernel/probes/kprobes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
index e78c3ef..9b65132 100644
--- a/arch/arm64/kernel/probes/kprobes.c
+++ b/arch/arm64/kernel/probes/kprobes.c
@@ -107,7 +107,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
 		if (!p->ainsn.api.insn)
 			return -ENOMEM;
 		break;
-	};
+	}
 
 	/* prepare the instruction */
 	if (p->ainsn.api.insn)
-- 
1.7.12.4

[PATCH 2/2] arm64:guest: remove some extra semicolon in kvm_target_cpu

[zhong jiang]

There are some extra semicolon in kvm_target_cpu, remove it.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
 arch/arm64/kvm/guest.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 07256b0..a74f84d 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -338,15 +338,15 @@ int __attribute_const__ kvm_target_cpu(void)
 			return KVM_ARM_TARGET_CORTEX_A53;
 		case ARM_CPU_PART_CORTEX_A57:
 			return KVM_ARM_TARGET_CORTEX_A57;
-		};
+		}
 		break;
 	case ARM_CPU_IMP_APM:
 		switch (part_number) {
 		case APM_CPU_PART_POTENZA:
 			return KVM_ARM_TARGET_XGENE_POTENZA;
-		};
+		}
 		break;
-	};
+	}
 
 	/* Return a default generic target */
 	return KVM_ARM_TARGET_GENERIC_V8;
-- 
1.7.12.4

Re: [PATCH 0/2] arm64: remove some extra semicolon

[Will Deacon]

On Thu, Aug 09, 2018 at 10:20:39PM +0800, zhong jiang wrote:
> There are some extra semicolon in arm64 architecture. Just remove them.

These are trivial but certainly not urgent, so I guess Catalin can pick
them up for 4.20.

Will

> zhong jiang (2):
>   arm64/kprobes: remove an extra semicolon in arch_prepare_kprobe
>   arm64:guest: remove some extra semicolon in kvm_target_cpu
> 
>  arch/arm64/kernel/probes/kprobes.c | 2 +-
>  arch/arm64/kvm/guest.c             | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> -- 
> 1.7.12.4
> 

Re: [PATCH 0/2] arm64: remove some extra semicolon

[zhong jiang]

On 2018/9/4 0:59, Will Deacon wrote:
> On Thu, Aug 09, 2018 at 10:20:39PM +0800, zhong jiang wrote:
>> There are some extra semicolon in arm64 architecture. Just remove them.
> These are trivial but certainly not urgent, so I guess Catalin can pick
> them up for 4.20.
Thanks,  

Catalin,  Do you can pick them up ?

Sincerely,
zhong jiang
> Will
>
>> zhong jiang (2):
>>   arm64/kprobes: remove an extra semicolon in arch_prepare_kprobe
>>   arm64:guest: remove some extra semicolon in kvm_target_cpu
>>
>>  arch/arm64/kernel/probes/kprobes.c | 2 +-
>>  arch/arm64/kvm/guest.c             | 6 +++---
>>  2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> -- 
>> 1.7.12.4
>>
> .
>

Re: [PATCH 0/2] arm64: remove some extra semicolon

[Catalin Marinas]

On Mon, Sep 03, 2018 at 05:59:35PM +0100, Will Deacon wrote:
> On Thu, Aug 09, 2018 at 10:20:39PM +0800, zhong jiang wrote:
> > There are some extra semicolon in arm64 architecture. Just remove them.
> 
> These are trivial but certainly not urgent, so I guess Catalin can pick
> them up for 4.20.
> 
> Will
> 
> > zhong jiang (2):
> >   arm64/kprobes: remove an extra semicolon in arch_prepare_kprobe
> >   arm64:guest: remove some extra semicolon in kvm_target_cpu

I picked up the first patch. I'll leave the second to Marc in case there
are any conflicts with the kvm tree.

In case it got lost in inbox, here's the second patch.

https://lore.kernel.org/lkml/1533824441-35661-3-git-send-email-zhongjiang@huawei.com/raw

-- 
Catalin

Re: [PATCH 0/2] arm64: remove some extra semicolon

[Marc Zyngier]

On 01/10/18 14:40, Catalin Marinas wrote:
> On Mon, Sep 03, 2018 at 05:59:35PM +0100, Will Deacon wrote:
>> On Thu, Aug 09, 2018 at 10:20:39PM +0800, zhong jiang wrote:
>>> There are some extra semicolon in arm64 architecture. Just remove them.
>>
>> These are trivial but certainly not urgent, so I guess Catalin can pick
>> them up for 4.20.
>>
>> Will
>>
>>> zhong jiang (2):
>>>    arm64/kprobes: remove an extra semicolon in arch_prepare_kprobe
>>>    arm64:guest: remove some extra semicolon in kvm_target_cpu
> 
> I picked up the first patch. I'll leave the second to Marc in case there
> are any conflicts with the kvm tree.
> 
> In case it got lost in inbox, here's the second patch.
> 
> https://lore.kernel.org/lkml/1533824441-35661-3-git-send-email-zhongjiang@huawei.com/raw

Ah, thanks for pointing this out. I've queued it now.

	M.
-- 
Jazz is not dead. It just smells funny...