From: Tetsuo Handa Date: Sun, 3 Aug 2014 11:02:31 +0000 (+0900) Subject: drm/ttm: Pass GFP flags in order to avoid deadlock. X-Git-Tag: omap-for-v3.17/fixes-against-rc2~125^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a91576d7916f6cce76d30303e60e1ac47cf4a76d;p=pandora-kernel.git drm/ttm: Pass GFP flags in order to avoid deadlock. Commit 7dc19d5a "drivers: convert shrinkers to new count/scan API" added deadlock warnings that ttm_page_pool_free() and ttm_dma_page_pool_free() are currently doing GFP_KERNEL allocation. But these functions did not get updated to receive gfp_t argument. This patch explicitly passes sc->gfp_mask or GFP_KERNEL to these functions, and removes the deadlock warning. Signed-off-by: Tetsuo Handa Cc: stable [2.6.35+] Signed-off-by: Dave Airlie --- Reading git-diff-tree failed