From patchwork Fri Apr 11 20:15:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 28293 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 912F620822 for ; Fri, 11 Apr 2014 20:15:56 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id jy13sf18683497veb.10 for ; Fri, 11 Apr 2014 13:15:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=rA5v7UCMJ/njSaf0ne+kLqk+VEO7vKcBRNYk5OSdedo=; b=X/JXyZ8ekCy5udz3MD1EoPNxe+ji8MMvgYxR7LeAfVvzvvYwwKm1hPHjOMaIu6Tx21 KGubeOmNYh56itFF5OysIaitgoJbRvwlUOh60LzEvSO+3pPV/YrvErAHU9MRCe9roA1P BzxxPMYaJk7VIXddJUZ3/pk9RMRSAxa4jbc4e7JP/lNnQGvMW0VfZCLDhHfpgIluhGHY JgI0N1/1/DJe/tsuKLLHDFxKnGlld4aVUcXhoHupVC49j5jFt62QCGXnCfmya2hlDYbh sKDuGWRKS1QxJOjLJozDCrmtdv7G97JITdGUVAWlN9Tl0TmnOKYqTnbymn1X9LPZE1dR vbNw== X-Gm-Message-State: ALoCoQmf4+MoqJr8rbfYSwMiO1k+oKv6GCvJCPspqJcdYBVZG+xQF9882N9wQLEXjD/srxhdsg4y X-Received: by 10.236.112.130 with SMTP id y2mr11244841yhg.6.1397247356294; Fri, 11 Apr 2014 13:15:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.39.100 with SMTP id u91ls1647121qgu.74.gmail; Fri, 11 Apr 2014 13:15:56 -0700 (PDT) X-Received: by 10.220.162.6 with SMTP id t6mr21799073vcx.12.1397247356150; Fri, 11 Apr 2014 13:15:56 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id si3si1544088vcb.28.2014.04.11.13.15.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 13:15:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so5140066veb.26 for ; Fri, 11 Apr 2014 13:15:56 -0700 (PDT) X-Received: by 10.58.202.133 with SMTP id ki5mr20873531vec.19.1397247356061; Fri, 11 Apr 2014 13:15:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp84019vcb; Fri, 11 Apr 2014 13:15:55 -0700 (PDT) X-Received: by 10.66.185.39 with SMTP id ez7mr29678782pac.134.1397247355185; Fri, 11 Apr 2014 13:15:55 -0700 (PDT) Received: from mail-pb0-f48.google.com (mail-pb0-f48.google.com [209.85.160.48]) by mx.google.com with ESMTPS id se7si4855918pbb.139.2014.04.11.13.15.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 13:15:55 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.48 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.160.48; Received: by mail-pb0-f48.google.com with SMTP id md12so5849516pbc.35 for ; Fri, 11 Apr 2014 13:15:54 -0700 (PDT) X-Received: by 10.67.1.39 with SMTP id bd7mr29966090pad.15.1397247354756; Fri, 11 Apr 2014 13:15:54 -0700 (PDT) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id te2sm40308391pac.25.2014.04.11.13.15.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 13:15:54 -0700 (PDT) From: John Stultz To: LKML Cc: John Stultz , Andrew Morton , Android Kernel Team , Johannes Weiner , Robert Love , Mel Gorman , Hugh Dickins , Dave Hansen , Rik van Riel , Dmitry Adamushko , Neil Brown , Andrea Arcangeli , Mike Hommey , Taras Glek , Jan Kara , KOSAKI Motohiro , Michel Lespinasse , Minchan Kim , Keith Packard , "linux-mm@kvack.org" Subject: [PATCH 1/4] swap: Cleanup how special swap file numbers are defined Date: Fri, 11 Apr 2014 13:15:37 -0700 Message-Id: <1397247340-3365-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397247340-3365-1-git-send-email-john.stultz@linaro.org> References: <1397247340-3365-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The SWP_HWPOISON and SWP_MIGRATION numbers are defined in a fairly awkward way. Since they are stolen from the top few values of the 1<). As long as the enum values are added to the top of the enum instead of the bottom, the values for the types will be preserved. Cc: Andrew Morton Cc: Android Kernel Team Cc: Johannes Weiner Cc: Robert Love Cc: Mel Gorman Cc: Hugh Dickins Cc: Dave Hansen Cc: Rik van Riel Cc: Dmitry Adamushko Cc: Neil Brown Cc: Andrea Arcangeli Cc: Mike Hommey Cc: Taras Glek Cc: Jan Kara Cc: KOSAKI Motohiro Cc: Michel Lespinasse Cc: Minchan Kim Cc: Keith Packard Cc: linux-mm@kvack.org Signed-off-by: John Stultz --- include/linux/swap.h | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 46ba0c6..a90ea95 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -49,29 +49,38 @@ static inline int current_is_kswapd(void) * actions on faults. */ +enum { + /* + * NOTE: We use the high bits here (subtracting from + * 1<