diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-06 12:29:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-06 12:29:36 +0100 |
| commit | 6e02d8833338866388a3732e65eed1ff72a75a60 (patch) | |
| tree | 77b3407d7bdc182d751ed5440215c3f0aca1427d /arch/arm64 | |
| parent | 2f7d3ee28cb91bcc63890dbb7f63fde4c63e2340 (diff) | |
| parent | 97f32419d57c154fcc2cda75f65ce06a5920b72d (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linux-linaro-lsk-v4.9-test
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 | ||||
| -rw-r--r-- | arch/arm64/include/asm/cmpxchg.h | 4 | ||||
| -rw-r--r-- | arch/arm64/mm/init.c | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 24922c9c73b8..c54b64c8332a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -261,6 +261,8 @@ CONFIG_GPIO_XGENE=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_MAX77620=y +CONFIG_POWER_AVS=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_POWER_RESET_MSM=y CONFIG_BATTERY_BQ27XXX=y CONFIG_POWER_RESET_XGENE=y diff --git a/arch/arm64/include/asm/cmpxchg.h b/arch/arm64/include/asm/cmpxchg.h index ae852add053d..0f2e1ab5e166 100644 --- a/arch/arm64/include/asm/cmpxchg.h +++ b/arch/arm64/include/asm/cmpxchg.h @@ -229,7 +229,9 @@ static inline void __cmpwait_case_##name(volatile void *ptr, \ unsigned long tmp; \ \ asm volatile( \ - " ldxr" #sz "\t%" #w "[tmp], %[v]\n" \ + " sevl\n" \ + " wfe\n" \ + " ldxr" #sz "\t%" #w "[tmp], %[v]\n" \ " eor %" #w "[tmp], %" #w "[tmp], %" #w "[val]\n" \ " cbnz %" #w "[tmp], 1f\n" \ " wfe\n" \ diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 63bc374d99a2..c70d8c9b6ee7 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -649,11 +649,13 @@ void __init mem_init(void) BUILD_BUG_ON(TASK_SIZE_32 > TASK_SIZE_64); #endif +#ifdef CONFIG_SPARSEMEM_VMEMMAP /* * Make sure we chose the upper bound of sizeof(struct page) - * correctly. + * correctly when sizing the VMEMMAP array. */ BUILD_BUG_ON(sizeof(struct page) > (1 << STRUCT_PAGE_MAX_SHIFT)); +#endif if (PAGE_SIZE >= 16384 && get_num_physpages() <= 128) { extern int sysctl_overcommit_memory; |