Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1047f42 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "include/linux/string.h: add the option of fortified string.h functions"

parents 92640cbe 0f51310a

arch/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -218,6 +218,12 @@ config GENERIC_SMP_IDLE_THREAD 
config GENERIC_IDLE_POLL_SETUP

       bool



config ARCH_HAS_FORTIFY_SOURCE

	bool

	help

	  An architecture should select this when it can successfully

	  build and run with CONFIG_FORTIFY_SOURCE.



# Select if arch init_task initializer is different to init/init_task.c

config ARCH_INIT_TASK

       bool

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config ARM64 
	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_HAS_KCOV

arch/arm64/include/asm/kvm_mmu.h

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
 * If the page is in the bottom half, we have to use the top half. If

 * the page is in the top half, we have to use the bottom half:

 *

 * T = __virt_to_phys(__hyp_idmap_text_start)

 * T = __pa_symbol(__hyp_idmap_text_start)

 * if (T & BIT(VA_BITS - 1))

 *	HYP_VA_MIN = 0  //idmap in upper half

 * else
@@ -270,7 +270,7 @@ static inline void __kvm_flush_dcache_pud(pud_t pud) 
	kvm_flush_dcache_to_poc(page_address(page), PUD_SIZE);

}



#define kvm_virt_to_phys(x)		__virt_to_phys((unsigned long)(x))

#define kvm_virt_to_phys(x)		__pa_symbol(x)



void kvm_set_way_flush(struct kvm_vcpu *vcpu);

void kvm_toggle_cache(struct kvm_vcpu *vcpu, bool was_enabled);

arch/arm64/include/asm/memory.h

+2 −1
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ static inline void *phys_to_virt(phys_addr_t x) 
#define __pa(x)			__virt_to_phys((unsigned long)(x))

#define __va(x)			((void *)__phys_to_virt((phys_addr_t)(x)))

#define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)

#define virt_to_pfn(x)      __phys_to_pfn(__virt_to_phys(x))

#define virt_to_pfn(x)      __phys_to_pfn(__virt_to_phys((unsigned long)(x)))

#define sym_to_pfn(x)	    __phys_to_pfn(__pa_symbol(x))



/*

 *  virt_to_page(k)	convert a _valid_ virtual address to struct page *

arch/arm64/include/asm/mmu_context.h

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static inline void contextidr_thread_switch(struct task_struct *next) 
 */

static inline void cpu_set_reserved_ttbr0(void)

{

	unsigned long ttbr = virt_to_phys(empty_zero_page);

	unsigned long ttbr = __pa_symbol(empty_zero_page);



	write_sysreg(ttbr, ttbr0_el1);

	isb();
@@ -120,7 +120,7 @@ static inline void cpu_install_idmap(void) 
	local_flush_tlb_all();

	cpu_set_idmap_tcr_t0sz();



	cpu_switch_mm(idmap_pg_dir, &init_mm);

	cpu_switch_mm(lm_alias(idmap_pg_dir), &init_mm);

}



/*
@@ -135,7 +135,7 @@ static inline void cpu_replace_ttbr1(pgd_t *pgd) 


	phys_addr_t pgd_phys = virt_to_phys(pgd);



	replace_phys = (void *)virt_to_phys(idmap_cpu_replace_ttbr1);

	replace_phys = (void *)__pa_symbol(idmap_cpu_replace_ttbr1);



	cpu_install_idmap();

	replace_phys(pgd_phys);