Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756171AbcJPDOi (ORCPT ); Sat, 15 Oct 2016 23:14:38 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34289 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755825AbcJPDO1 (ORCPT ); Sat, 15 Oct 2016 23:14:27 -0400 Message-ID: <1476587662.1538.8.camel@gmail.com> Subject: [patch] drivers/zram: Don't disable preemption in zcomp_stream_get/put() From: Mike Galbraith To: Sebastian Andrzej Siewior , Thomas Gleixner Cc: LKML , linux-rt-users , Steven Rostedt Date: Sun, 16 Oct 2016 05:14:22 +0200 In-Reply-To: <20161006085228.jl6rpszdp5c2p2nr@linutronix.de> References: <20161006085228.jl6rpszdp5c2p2nr@linutronix.de> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.16.5 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 720 Lines: 26 In v4.7, the driver switched to percpu compression streams, disabling preemption (get/put_cpu_ptr()). Use get/put_cpu_light() instead. Signed-off-by: Mike Galbraith --- drivers/block/zram/zcomp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -118,12 +118,12 @@ ssize_t zcomp_available_show(const char struct zcomp_strm *zcomp_stream_get(struct zcomp *comp) { - return *get_cpu_ptr(comp->stream); + return *per_cpu_ptr(comp->stream, get_cpu_light()); } void zcomp_stream_put(struct zcomp *comp) { - put_cpu_ptr(comp->stream); + put_cpu_light(); } int zcomp_compress(struct zcomp_strm *zstrm,