Skip to content

Commit eaa54b1

Browse files
committed
Merge tag 'x86_cleanups_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Borislav Petkov: - Remove a misleading message and an unused function * tag 'x86_cleanups_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/nmi: Remove the 'strange power saving mode' hint from unknown NMI handler x86/pat: Remove the unused set_pages_array_wt() function
2 parents 6b9bfb1 + d4c9df2 commit eaa54b1

3 files changed

Lines changed: 0 additions & 8 deletions

File tree

arch/x86/include/asm/set_memory.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ int set_memory_global(unsigned long addr, int numpages);
5353

5454
int set_pages_array_uc(struct page **pages, int addrinarray);
5555
int set_pages_array_wc(struct page **pages, int addrinarray);
56-
int set_pages_array_wt(struct page **pages, int addrinarray);
5756
int set_pages_array_wb(struct page **pages, int addrinarray);
5857

5958
/*

arch/x86/kernel/nmi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
292292
pr_emerg("Uhhuh. NMI received for unknown reason %02x on CPU %d.\n",
293293
reason, smp_processor_id());
294294

295-
pr_emerg("Do you have a strange power saving mode enabled?\n");
296295
if (unknown_nmi_panic || panic_on_unrecovered_nmi)
297296
nmi_panic(regs, "NMI: Not continuing");
298297

arch/x86/mm/pat/set_memory.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,12 +2124,6 @@ int set_pages_array_wc(struct page **pages, int numpages)
21242124
}
21252125
EXPORT_SYMBOL(set_pages_array_wc);
21262126

2127-
int set_pages_array_wt(struct page **pages, int numpages)
2128-
{
2129-
return _set_pages_array(pages, numpages, _PAGE_CACHE_MODE_WT);
2130-
}
2131-
EXPORT_SYMBOL_GPL(set_pages_array_wt);
2132-
21332127
int set_pages_wb(struct page *page, int numpages)
21342128
{
21352129
unsigned long addr = (unsigned long)page_address(page);

0 commit comments

Comments
 (0)