tunnels: do not assume mac header is set in skb_tunnel_check_pmtu()

[mirror_ubuntu-jammy-kernel.git] / mm / ksm.c

diff --git a/mm/ksm.c b/mm/ksm.c
index 025338128cd92415ba57ce989aa8b9ebba888bf7..7d5ec01385c77b5e375d8c3eeb1676d32e52ca40 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -651,10 +651,8 @@ static void remove_node_from_stable_tree(struct stable_node *stable_node)
         * from &migrate_nodes. This will verify that future list.h changes
         * don't break STABLE_NODE_DUP_HEAD. Only recent gcc can handle it.
         */
-#if defined(GCC_VERSION) && GCC_VERSION >= 40903
        BUILD_BUG_ON(STABLE_NODE_DUP_HEAD <= &migrate_nodes);
        BUILD_BUG_ON(STABLE_NODE_DUP_HEAD >= &migrate_nodes + 1);
-#endif
 
        if (stable_node->head == &migrate_nodes)
                list_del(&stable_node->list);
@@ -2417,9 +2415,14 @@ static int ksm_scan_thread(void *nothing)
 
                if (ksmd_should_run()) {
                        sleep_ms = READ_ONCE(ksm_thread_sleep_millisecs);
-                       wait_event_interruptible_timeout(ksm_iter_wait,
-                               sleep_ms != READ_ONCE(ksm_thread_sleep_millisecs),
-                               msecs_to_jiffies(sleep_ms));
+                       if (sleep_ms >= 1000)
+                               wait_event_interruptible_timeout(ksm_iter_wait,
+                                       sleep_ms != READ_ONCE(ksm_thread_sleep_millisecs),
+                                       msecs_to_jiffies(round_jiffies_relative(sleep_ms)));
+                       else
+                               wait_event_interruptible_timeout(ksm_iter_wait,
+                                       sleep_ms != READ_ONCE(ksm_thread_sleep_millisecs),
+                                       msecs_to_jiffies(sleep_ms));
                } else {
                        wait_event_freezable(ksm_thread_wait,
                                ksmd_should_run() || kthread_should_stop());