Skip to contentSkip to conversation

x86/idt: Make idt_descr static

PATCH Applied Jason Andryuk 2 participants 2 messages Jun 19, 2020 – Jun 20, 2020 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/idt: Make idt_descr static

Commit 3e77abda65b1 ("x86/idt: Consolidate idt functionality")'s commit message stated idt_descr could be made static, but it did not actually make the change. Make it static now.

Fixes 3e77abda65b1 ("x86/idt: Consolidate idt functionality")
---
 arch/x86/kernel/idt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/idt.c +1 -1
index 0db21206f2f3..7ecf9babf0cb 100644
@@ -160,7 +160,7 @@ static const __initconst struct idt_data apic_idts[] = {
 /* Must be page-aligned because the real IDT is used in the cpu entry area */
 static gate_desc idt_table[IDT_ENTRIES] __page_aligned_bss;
 
-struct desc_ptr idt_descr __ro_after_init = {
+static struct desc_ptr idt_descr __ro_after_init = {
 	.size		= IDT_TABLE_SIZE - 1,
 	.address	= (unsigned long) idt_table,
 };
Signature · 1 line
2.25.1
merge bot Applied
#1 lore raw
The following commit has been merged into the x86/cleanups branch of tip:

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     286d966b21587b6303081b902f5c5e30b691baf5
Gitweb:        https://git.kernel.org/tip/286d966b21587b6303081b902f5c5e30b691baf5
Author:        Jason Andryuk <[email protected]>
AuthorDate:    Fri, 19 Jun 2020 16:51:02 -04:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Sat, 20 Jun 2020 11:47:35 +02:00

x86/idt: Make idt_descr static

Commit

3e77abda65b1 ("x86/idt: Consolidate idt functionality")

states that idt_descr could be made static, but it did not actually make the change. Make it static now.

Fixes 3e77abda65b1 ("x86/idt: Consolidate idt functionality")
---
 arch/x86/kernel/idt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/idt.c +1 -1
index 0db2120..7ecf9ba 100644
@@ -160,7 +160,7 @@ static const __initconst struct idt_data apic_idts[] = {
 /* Must be page-aligned because the real IDT is used in the cpu entry area */
 static gate_desc idt_table[IDT_ENTRIES] __page_aligned_bss;
 
-struct desc_ptr idt_descr __ro_after_init = {
+static struct desc_ptr idt_descr __ro_after_init = {
 	.size		= IDT_TABLE_SIZE - 1,
 	.address	= (unsigned long) idt_table,
 };