From: Juergen Gross Date: Wed, 24 Jul 2024 10:03:26 +0000 (+0200) Subject: mini-os: mm: don't have two large arrays of the same kind X-Git-Tag: xen-RELEASE-4.20.0~6 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=27782562cb0558ce651031b4921931c33e6f7c71;p=mini-os.git mini-os: mm: don't have two large arrays of the same kind In the CONFIG_PARAVIRT case there are two identical static arrays of more than 8kB size with function scope. As the two functions never nest, a single array of file scope can replace the two existing instances. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- diff --git a/arch/x86/mm.c b/arch/x86/mm.c index be1cf0c..7ddf16e 100644 --- a/arch/x86/mm.c +++ b/arch/x86/mm.c @@ -198,6 +198,10 @@ static void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, *pt_pfn += 1; } +#ifdef CONFIG_PARAVIRT +static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; +#endif + /* * Build the initial pagetable. */ @@ -209,7 +213,6 @@ static void build_pagetable(unsigned long *start_pfn, unsigned long *max_pfn) unsigned long pt_mfn = pfn_to_mfn(virt_to_pfn(pt_base)); unsigned long offset; #ifdef CONFIG_PARAVIRT - static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; int count = 0; int rc; #endif @@ -323,7 +326,6 @@ static void set_readonly(void *text, void *etext) unsigned long offset; unsigned long page_size = PAGE_SIZE; #ifdef CONFIG_PARAVIRT - static mmu_update_t mmu_updates[L1_PAGETABLE_ENTRIES + 1]; int count = 0; int rc; #endif