2019-07-19 08:16:57

by Cao jin

[permalink] [raw]
Subject: [PATCH] x86/irq/64: fix the missing update on comment

Commit e6401c130931 ("x86/irq/64: Split the IRQ stack into its own pages")
missed to update one piece of comment as it did to its peer in Xen, which
will confuse people who still need to read comment.

A bonus fix to identation in ZO's linker script: spaces -> tab.

Signed-off-by: Cao jin <[email protected]>
---
arch/x86/boot/compressed/vmlinux.lds.S | 4 ++--
arch/x86/kernel/head_64.S | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/boot/compressed/vmlinux.lds.S b/arch/x86/boot/compressed/vmlinux.lds.S
index 508cfa6828c5..23100c52a7d0 100644
--- a/arch/x86/boot/compressed/vmlinux.lds.S
+++ b/arch/x86/boot/compressed/vmlinux.lds.S
@@ -64,8 +64,8 @@ SECTIONS
_ebss = .;
}
#ifdef CONFIG_X86_64
- . = ALIGN(PAGE_SIZE);
- .pgtable : {
+ . = ALIGN(PAGE_SIZE);
+ .pgtable : {
_pgtable = . ;
*(.pgtable)
_epgtable = . ;
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index bcd206c8ac90..cba94468795e 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -195,10 +195,10 @@ ENTRY(secondary_startup_64)

/* Set up %gs.
*
- * The base of %gs always points to the bottom of the irqstack
- * union. If the stack protector canary is enabled, it is
- * located at %gs:40. Note that, on SMP, the boot cpu uses
- * init data section till per cpu areas are set up.
+ * The base of %gs always points to fixed_percpu_data. If the
+ * stack protector canary is enabled, it is located at %gs:40.
+ * Note that, on SMP, the boot cpu uses init data section till
+ * per cpu areas are set up.
*/
movl $MSR_GS_BASE,%ecx
movl initial_gs(%rip),%eax
--
2.17.0




2019-07-22 09:38:00

by Thomas Gleixner

[permalink] [raw]
Subject: Re: [PATCH] x86/irq/64: fix the missing update on comment

Cao,

On Fri, 19 Jul 2019, Cao jin wrote:

> Commit e6401c130931 ("x86/irq/64: Split the IRQ stack into its own pages")
> missed to update one piece of comment as it did to its peer in Xen, which
> will confuse people who still need to read comment.
>
> A bonus fix to identation in ZO's linker script: spaces -> tab.

Please don't add 'bonus' changes. A patch which fixes a stale comment has
nothing to do with a indentation change in an unrelated file.

Thanks,

tglx

Subject: [tip:x86/urgent] x86/irq/64: Update stale comment

Commit-ID: 385065734cd417b9d7739b2ebb62c960aeb3ccb5
Gitweb: https://git.kernel.org/tip/385065734cd417b9d7739b2ebb62c960aeb3ccb5
Author: Cao jin <[email protected]>
AuthorDate: Fri, 19 Jul 2019 16:16:35 +0800
Committer: Thomas Gleixner <[email protected]>
CommitDate: Mon, 22 Jul 2019 10:54:27 +0200

x86/irq/64: Update stale comment

Commit e6401c130931 ("x86/irq/64: Split the IRQ stack into its own pages")
missed to update one piece of comment as it did to its peer in Xen, which
will confuse people who still need to read comment.

Signed-off-by: Cao jin <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]

---
arch/x86/kernel/head_64.S | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index a6342c899be5..f3d3e9646a99 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -193,10 +193,10 @@ ENTRY(secondary_startup_64)

/* Set up %gs.
*
- * The base of %gs always points to the bottom of the irqstack
- * union. If the stack protector canary is enabled, it is
- * located at %gs:40. Note that, on SMP, the boot cpu uses
- * init data section till per cpu areas are set up.
+ * The base of %gs always points to fixed_percpu_data. If the
+ * stack protector canary is enabled, it is located at %gs:40.
+ * Note that, on SMP, the boot cpu uses init data section until
+ * the per cpu areas are set up.
*/
movl $MSR_GS_BASE,%ecx
movl initial_gs(%rip),%eax

2019-07-22 11:08:50

by Cao jin

[permalink] [raw]
Subject: Re: [PATCH] x86/irq/64: fix the missing update on comment

On 7/22/19 4:53 PM, Thomas Gleixner wrote:
> Cao,
>
> On Fri, 19 Jul 2019, Cao jin wrote:
>
>> Commit e6401c130931 ("x86/irq/64: Split the IRQ stack into its own pages")
>> missed to update one piece of comment as it did to its peer in Xen, which
>> will confuse people who still need to read comment.
>>
>> A bonus fix to identation in ZO's linker script: spaces -> tab.
>
> Please don't add 'bonus' changes. A patch which fixes a stale comment has
> nothing to do with a indentation change in an unrelated file.
>

Kept that in mind. Sorry for the inconvenience.

--
Sincerely,
Cao jin