From patchwork Mon Sep 14 23:11:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 53603 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 5F7342056A for ; Mon, 14 Sep 2015 23:11:14 +0000 (UTC) Received: by lbbti1 with SMTP id ti1sf50568063lbb.3 for ; Mon, 14 Sep 2015 16:11:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:cc:subject:message-id :organization:mime-version:content-type:content-transfer-encoding :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=vv+t4zIVk0ho/410DgUtwr6qi0xGDuRz5qCepsx4i1k=; b=bRo79j26vVsMbBFkEOAbpJ2jtTKzcb2Ncf4gMdONzRSzOpaBVk/acroWxeWK1cFVH9 u/jaZWW7/iLEl4kOFh4bZ/K4e1jJka3gbQIb5xxXKataPv6oZhjkAKMwTk1b9kGrGF7k HSDDbnXX3PasHSSHXqc3oZQxfSvYQ8wlyXlLlEIcK9CpXZgZbFtFJyh6EXydxKYxQ15S I2vD27OdyHGlLC4xe8doE5QirLy02oMPKA137bYnXb5C4ABpsch1WtUPVoO0dOWBMhWw ohuqHQFqCdegc99vhu5bZj766Tbm2rrjCMC3RaGaAZyn+rivzWrSOFofkrRMmMYcc7xP x2WA== X-Gm-Message-State: ALoCoQlzJiUxHMeu9zGxucCHQ96SxyuSr2k8F31KHj6H5f6LW7tBZlW8FFyeURs0pf8bvdsqGgvn X-Received: by 10.152.224.129 with SMTP id rc1mr3611516lac.10.1442272273217; Mon, 14 Sep 2015 16:11:13 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.163.69 with SMTP id yg5ls683650lab.5.gmail; Mon, 14 Sep 2015 16:11:13 -0700 (PDT) X-Received: by 10.152.4.103 with SMTP id j7mr14278179laj.92.1442272273033; Mon, 14 Sep 2015 16:11:13 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id j15si5816352laa.14.2015.09.14.16.11.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2015 16:11:13 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lahg1 with SMTP id g1so66724139lah.1 for ; Mon, 14 Sep 2015 16:11:13 -0700 (PDT) X-Received: by 10.112.72.97 with SMTP id c1mr17134313lbv.86.1442272272937; Mon, 14 Sep 2015 16:11:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1453432lbq; Mon, 14 Sep 2015 16:11:12 -0700 (PDT) X-Received: by 10.107.168.39 with SMTP id r39mr31956918ioe.42.1442272272061; Mon, 14 Sep 2015 16:11:12 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x90si11029441ioi.94.2015.09.14.16.11.11; Mon, 14 Sep 2015 16:11:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752119AbbINXLI (ORCPT + 29 others); Mon, 14 Sep 2015 19:11:08 -0400 Received: from tex.lwn.net ([70.33.254.29]:45359 "EHLO vena.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751629AbbINXLH (ORCPT ); Mon, 14 Sep 2015 19:11:07 -0400 Received: from lwn.net (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by vena.lwn.net (Postfix) with ESMTP id 014E01540040; Mon, 14 Sep 2015 17:11:05 -0600 (MDT) Date: Mon, 14 Sep 2015 17:11:05 -0600 From: Jonathan Corbet To: Ingo Molnar Cc: LKML , Jason Baron Subject: [PATCH] locking: Fix up the static keys documentation Message-ID: <20150914171105.511e1e21@lwn.net> Organization: LWN.net MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: corbet@lwn.net X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Fix a few small mistakes in the static key documentation and delete an unneeded sentence. Suggested-by: Jason Baron Signed-off-by: Jonathan Corbet --- This is meant to go on top of my previous patch; I can combine the two if you prefer. Documentation/static-keys.txt | 4 ++-- include/linux/jump_label.h | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Documentation/static-keys.txt b/Documentation/static-keys.txt index f4cb0b2..477927b 100644 --- a/Documentation/static-keys.txt +++ b/Documentation/static-keys.txt @@ -15,8 +15,8 @@ The updated API replacements are: DEFINE_STATIC_KEY_TRUE(key); DEFINE_STATIC_KEY_FALSE(key); -static_key_likely() -static_key_unlikely() +static_branch_likely() +static_branch_unlikely() 0) Abstract diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index 7f653e8..f109423 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -21,8 +21,8 @@ * * DEFINE_STATIC_KEY_TRUE(key); * DEFINE_STATIC_KEY_FALSE(key); - * static_key_likely() - * static_key_unlikely() + * static_branch_likely() + * static_branch_unlikely() * * Jump labels provide an interface to generate dynamic branches using * self-modifying code. Assuming toolchain and architecture support, if we @@ -45,12 +45,10 @@ * statement, setting the key to true requires us to patch in a jump * to the out-of-line of true branch. * - * In addtion to static_branch_{enable,disable}, we can also reference count + * In addition to static_branch_{enable,disable}, we can also reference count * the key or branch direction via static_branch_{inc,dec}. Thus, * static_branch_inc() can be thought of as a 'make more true' and - * static_branch_dec() as a 'make more false'. The inc()/dec() - * interface is meant to be used exclusively from the inc()/dec() for a given - * key. + * static_branch_dec() as a 'make more false'. * * Since this relies on modifying code, the branch modifying functions * must be considered absolute slow paths (machine wide synchronization etc.).