linux/arch/m68k
Peter Collingbourne 79cb255c79 BACKPORT: FROMGIT: mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable()
In an upcoming change we would like to add a flag to
GFP_HIGHUSER_MOVABLE so that it would no longer be an OR
of GFP_HIGHUSER and __GFP_MOVABLE. This poses a problem for
alloc_zeroed_user_highpage_movable() which passes __GFP_MOVABLE
into an arch-specific __alloc_zeroed_user_highpage() hook which ORs
in GFP_HIGHUSER.

Since __alloc_zeroed_user_highpage() is only ever called from
alloc_zeroed_user_highpage_movable(), we can remove one level
of indirection here. Remove __alloc_zeroed_user_highpage(),
make alloc_zeroed_user_highpage_movable() the hook, and use
GFP_HIGHUSER_MOVABLE in the hook implementations so that they will
pick up the new flag that we are going to add.

Signed-off-by: Peter Collingbourne <pcc@google.com>
Link: https://linux-review.googlesource.com/id/Ic6361c657b2cdcd896adbe0cf7cb5a7fbb1ed7bf
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210602235230.3928842-2-pcc@google.com
Signed-off-by: Will Deacon <will@kernel.org>
(cherry-picked from commit 92638b4e1b
 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-next/mte)
[pcc: keep setting GFP_CMA in generic, x86 and arm64 to correspond with downstream GFP_CMA patch]
Change-Id: Ic6361c657b2cdcd896adbe0cf7cb5a7fbb1ed7bf
Bug: 186816853
2021-06-07 20:38:48 +00:00
..
68000 mm: reorder includes after introduction of linux/pgtable.h 2020-06-09 09:39:13 -07:00
amiga m68k: amiga: Clean up Amiga hardware configuration 2020-09-07 10:56:08 +02:00
apollo mm: don't include asm/pgtable.h if linux/mm.h is already included 2020-06-09 09:39:13 -07:00
atari treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
bvme6000 mm: don't include asm/pgtable.h if linux/mm.h is already included 2020-06-09 09:39:13 -07:00
coldfire m68knommu: include SDHC support only when hardware has it 2020-10-05 21:51:31 +10:00
configs ide/macide: Convert Mac IDE driver to platform driver 2020-09-28 10:48:17 +02:00
emu block: move ->make_request_fn to struct block_device_operations 2020-07-01 07:27:24 -06:00
fpsp040
hp300 treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
ifpsp060
include BACKPORT: FROMGIT: mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable() 2021-06-07 20:38:48 +00:00
kernel m68k: Add missing mmap_read_lock() to sys_cacheflush() 2021-05-14 09:50:19 +02:00
lib m68k: get rid of zeroing destination on error in csum_and_copy_from_user() 2020-08-20 15:45:17 -04:00
mac m68k: Fix WARNING splat in pmac_zilog driver 2020-12-30 11:54:11 +01:00
math-emu treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 74 2019-05-24 17:36:47 +02:00
mm m68k updates for v5.10 2020-10-12 10:10:56 -07:00
mvme16x m68k: mvme147,mvme16x: Don't wipe PCC timer config bits 2021-05-14 09:50:14 +02:00
mvme147 m68k: mvme147,mvme16x: Don't wipe PCC timer config bits 2021-05-14 09:50:14 +02:00
q40 mm: don't include asm/pgtable.h if linux/mm.h is already included 2020-06-09 09:39:13 -07:00
sun3 m68k: sun3: Descend to prom from arch/m68k/sun3 2020-07-13 11:39:12 +02:00
sun3x mm: remove unneeded includes of <asm/pgalloc.h> 2020-08-07 11:33:26 -07:00
tools/amiga m68k: tools: Replace zero-length array with flexible-array member 2020-05-25 10:55:56 +02:00
install.sh
Kbuild m68k: sun3: Descend to prom from arch/m68k/sun3 2020-07-13 11:39:12 +02:00
Kconfig Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2020-10-22 09:59:21 -07:00
Kconfig.bus m68k: Fix Kconfig indentation 2020-03-09 11:12:19 +01:00
Kconfig.cpu treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Kconfig.debug m68k: Fix Kconfig indentation 2020-03-09 11:12:19 +01:00
Kconfig.devices treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Kconfig.machine dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig 2020-08-14 22:05:17 -04:00
Makefile kbuild: preprocess module linker script 2020-09-25 00:36:41 +09:00