[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <157216352223.29376.4881710179306669523.tip-bot2@tip-bot2>
Date: Sun, 27 Oct 2019 08:05:22 -0000
From: "tip-bot2 for Yi Wang" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Yi Wang <wang.yi59@....com.cn>, Borislav Petkov <bp@...e.de>,
"H. Peter Anvin" <hpa@...or.com>, Ingo Molnar <mingo@...hat.com>,
Thomas Gleixner <tglx@...utronix.de>,
"x86-ml" <x86@...nel.org>, Ingo Molnar <mingo@...nel.org>,
Borislav Petkov <bp@...en8.de>, linux-kernel@...r.kernel.org
Subject: [tip: x86/cleanups] x86/apic, x86/uprobes: Correct parameter names in
kernel-doc comments
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 44eb5a7e5dc6f23d04c05c15f91bc279e0dc700d
Gitweb: https://git.kernel.org/tip/44eb5a7e5dc6f23d04c05c15f91bc279e0dc700d
Author: Yi Wang <wang.yi59@....com.cn>
AuthorDate: Sun, 27 Oct 2019 08:55:39 +01:00
Committer: Borislav Petkov <bp@...e.de>
CommitterDate: Sun, 27 Oct 2019 09:00:28 +01:00
x86/apic, x86/uprobes: Correct parameter names in kernel-doc comments
Rename parameter names to the correct ones used in the function. No
functional changes.
[ bp: Merge two patches into a single one. ]
Signed-off-by: Yi Wang <wang.yi59@....com.cn>
Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: x86-ml <x86@...nel.org>
Link: https://lkml.kernel.org/r/1571816442-22494-1-git-send-email-wang.yi59@zte.com.cn
---
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/uprobes.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 9e2dd2b..8147106 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2335,7 +2335,7 @@ static int cpuid_to_apicid[] = {
#ifdef CONFIG_SMP
/**
* apic_id_is_primary_thread - Check whether APIC ID belongs to a primary thread
- * @id: APIC ID to check
+ * @apicid: APIC ID to check
*/
bool apic_id_is_primary_thread(unsigned int apicid)
{
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index 8cd745e..15e5aad 100644
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
@@ -842,8 +842,8 @@ static int push_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn)
/**
* arch_uprobe_analyze_insn - instruction analysis including validity and fixups.
+ * @auprobe: the probepoint information.
* @mm: the probed address space.
- * @arch_uprobe: the probepoint information.
* @addr: virtual address at which to install the probepoint
* Return 0 on success or a -ve number on error.
*/
Powered by blists - more mailing lists