History

Merge branches 'fixes' and 'misc' into for-linus

Russell King (Oracle) committed 3 months ago

Commit 1a89abc2 parents 1039bff bb3b2cf6 files · +13 −22Browse files

Unified · Split

6 files
  1. arch/arm/kernel/entry-armv.S +10 −3
  2. arch/arm/mm/proc-arm920.S +0 −2
  3. arch/arm/mm/proc-arm922.S +0 −2
  4. arch/arm/mm/proc-arm925.S +0 −2
  5. arch/arm/mm/proc-arm926.S +0 −2
  6. arch/arm/probes/kprobes/test-core.c +3 −11
arch/arm/kernel/entry-armv.S+10−3
@@ -557,9 +557,16 @@ ENTRY(__switch_to) · 556 unmodified lines
557557 ldmia r4, {r4 - sl, fp, ip, lr} @ Load all regs saved previously
558558 #ifdef CONFIG_VMAP_STACK
559559 @
560− @ Do a dummy read from the new stack while running from the old one so
561− @ that we can rely on do_translation_fault() to fix up any stale PMD
562− @ entries covering the vmalloc region.
560+ @ For a non-lazy mm switch, check_vmalloc_seq() has ensured that
561+ @ that the active mm's page tables have mappings for the prev
562+ @ task's stack and the next task's stack.
563+ @
564+ @ For a lazy mm switch the active mm's page tables have mappings
565+ @ for the prev task's stack but might not have mappings for the
566+ @ new task's stack. Do a dummy read from the new stack while
567+ @ running from the old stack so that we can rely on
568+ @ do_translation_fault() to populate missing PMD entries covering the
569+ @ new task's stack in the old task's page tables.
563570 @
564571 ldr r2, [ip]
565572 #ifdef CONFIG_KASAN_VMALLOC
arch/arm/mm/proc-arm920.S+0−2
@@ -8,8 +8,6 @@ · 7 unmodified lines
88 *
99 * These are the low level assembler for performing cache and TLB
1010 * functions on the arm920.
11− *
12− * CONFIG_CPU_ARM920_CPU_IDLE -> nohlt
1311 */
1412 #include <linux/linkage.h>
1513 #include <linux/init.h>
arch/arm/mm/proc-arm922.S+0−2
@@ -9,8 +9,6 @@ · 8 unmodified lines
99 *
1010 * These are the low level assembler for performing cache and TLB
1111 * functions on the arm922.
12− *
13− * CONFIG_CPU_ARM922_CPU_IDLE -> nohlt
1412 */
1513 #include <linux/linkage.h>
1614 #include <linux/init.h>
arch/arm/mm/proc-arm925.S+0−2
@@ -15,8 +15,6 @@ · 14 unmodified lines
1515 * These are the low level assembler for performing cache and TLB
1616 * functions on the arm925.
1717 *
18− * CONFIG_CPU_ARM925_CPU_IDLE -> nohlt
19− *
2018 * Some additional notes based on deciphering the TI TRM on OMAP-5910:
2119 *
2220 * NOTE1: The TI925T Configuration Register bit "D-cache clean and flush
arch/arm/mm/proc-arm926.S+0−2
@@ -8,8 +8,6 @@ · 7 unmodified lines
88 *
99 * These are the low level assembler for performing cache and TLB
1010 * functions on the arm926.
11− *
12− * CONFIG_CPU_ARM926_CPU_IDLE -> nohlt
1311 */
1412 #include <linux/linkage.h>
1513 #include <linux/init.h>
arch/arm/probes/kprobes/test-core.c+3−11
@@ -1649,24 +1649,16 @@ out: · 1648 unmodified lines
16491649
16501650 return ret;
16511651 }
1652−
1652+late_initcall(run_all_tests);
16531653
16541654 /*
16551655 * Module setup
16561656 */
16571657
1658−#ifdef MODULE
1659−
16601658 static void __exit kprobe_test_exit(void)
16611659 {
16621660 }
1663−
1664−module_init(run_all_tests)
16651661 module_exit(kprobe_test_exit)
1666−MODULE_LICENSE("GPL");
16671662
1668−#else /* !MODULE */
1669−
1670−late_initcall(run_all_tests);
1671−
1672−#endif
1663+MODULE_DESCRIPTION("Test code for ARM kprobes");
1664+MODULE_LICENSE("GPL");