Merge tag 'timers-core-2020-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / kernel / scs.c

diff --git a/kernel/scs.c b/kernel/scs.c
index 222a7a9..4ff4a7b 100644 (file)
--- a/kernel/scs.c
+++ b/kernel/scs.c
@@ -17,7 +17,7 @@ static void __scs_account(void *s, int account)
 {
        struct page *scs_page = virt_to_page(s);
 
-       mod_zone_page_state(page_zone(scs_page), NR_KERNEL_SCS_KB,
+       mod_node_page_state(page_pgdat(scs_page), NR_KERNEL_SCS_KB,
                            account * (SCS_SIZE / SZ_1K));
 }
 
@@ -74,7 +74,7 @@ static void scs_check_usage(struct task_struct *tsk)
        for (p = task_scs(tsk); p < __scs_magic(tsk); ++p) {
                if (!READ_ONCE_NOCHECK(*p))
                        break;
-               used++;
+               used += sizeof(*p);
        }
 
        while (used > curr) {