From patchwork Thu Sep 6 06:57:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 10589925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9142069B3 for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88C102A3AB for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D0762A452; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 368702A3CC for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725961AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 Received: from nbd.name ([46.4.11.11]:48214 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727672AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bMUid2hRT5iUruawwsopGk6PKGrFFZbLMrq8V/VN/Y4=; b=s5qKxtO6Bz99pJVgHwp9wmGnxB f8OsyLO6yVFz5b572RKdIMj1KCJDZgPeqlJrioqoxIj5n8Fm6dBjEP0rxU+B5jwmlsb+pYVy4kLPb CYjk7jkJ2RrxrW+YAFib8iGcVrogJxvi9Hd7xZ3IVsC+7qR/iLKucau/4+1hMc00oESQ=; Received: by maeck.lan (Postfix, from userid 501) id 058D0379246A; Thu, 6 Sep 2018 08:57:50 +0200 (CEST) From: Felix Fietkau To: backports@vger.kernel.org Cc: john@phrozen.org Subject: [PATCH 3/6] patches: remove lib-bucket_locks.patch Date: Thu, 6 Sep 2018 08:57:47 +0200 Message-Id: <20180906065750.89673-3-nbd@nbd.name> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180906065750.89673-1-nbd@nbd.name> References: <20180906065750.89673-1-nbd@nbd.name> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Obsoleted by kvmalloc/kvmalloc_array backport Signed-off-by: Felix Fietkau --- patches/lib-bucket_locks.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 patches/lib-bucket_locks.patch diff --git a/patches/lib-bucket_locks.patch b/patches/lib-bucket_locks.patch deleted file mode 100644 index 15eeda11..00000000 --- a/patches/lib-bucket_locks.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/compat/lib-bucket_locks.c b/compat/lib-bucket_locks.c -index 266a97c5708b..405b52ca5708 100644 ---- a/compat/lib-bucket_locks.c -+++ b/compat/lib-bucket_locks.c -@@ -30,10 +30,24 @@ int alloc_bucket_spinlocks(spinlock_t ** - } - - if (sizeof(spinlock_t) != 0) { -+#if LINUX_VERSION_IS_LESS(4,12,0) -+#ifdef CONFIG_NUMA -+ if (size * sizeof(spinlock_t) > PAGE_SIZE && -+ gfp == GFP_KERNEL) -+ tlocks = vmalloc(size * sizeof(spinlock_t)); -+#endif -+ if (gfp != GFP_KERNEL) -+ gfp |= __GFP_NOWARN | __GFP_NORETRY; -+ -+ if (!tlocks) -+ tlocks = kmalloc_array(size, sizeof(spinlock_t), -+ gfp); -+#else - if (gfpflags_allow_blocking(gfp)) - tlocks = kvmalloc(size * sizeof(spinlock_t), gfp); - else - tlocks = kmalloc_array(size, sizeof(spinlock_t), gfp); -+#endif - if (!tlocks) - return -ENOMEM; - for (i = 0; i < size; i++)