Commit 016017a1 authored by Johannes Berg's avatar Johannes Berg Committed by Daniel Vetter
Browse files

drm/ttm: fix compilation on ARCH=um 



Even if it's probably not really useful, it can get selected
by e.g. randconfig builds, and then failing to compile is an
annoyance. Unfortunately, it's hard to fix in Kconfig, since
DRM_TTM is selected by many things that don't really depend
on any specific architecture, and just depend on PCI (which
is indeed now available in ARCH=um via simulation/emulation).

Fix this in the code instead by just ifdef'ing the relevant
two lines that depend on "real X86".

Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211220111519.a4c8c6eff702.Ie4cf4e68698f6a9f546b83379bc52c266504424f@changeid
parent 54329e6f

drivers/gpu/drm/ttm/ttm_module.c

+3 −1
Original line number Diff line number Diff line
@@ -68,9 +68,11 @@ pgprot_t ttm_prot_from_caching(enum ttm_caching caching, pgprot_t tmp) 
#if defined(__i386__) || defined(__x86_64__)

	if (caching == ttm_write_combined)

		tmp = pgprot_writecombine(tmp);

#ifndef CONFIG_UML

	else if (boot_cpu_data.x86 > 3)

		tmp = pgprot_noncached(tmp);

#endif

#endif /* CONFIG_UML */

#endif /* __i386__ || __x86_64__ */

#if defined(__ia64__) || defined(__arm__) || defined(__aarch64__) || \

	defined(__powerpc__) || defined(__mips__)

	if (caching == ttm_write_combined)