From patchwork Fri Sep 6 15:32:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 173260 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp875413ilq; Fri, 6 Sep 2019 08:32:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqymQbf9cXHJaiwsCiAOyYi3hLn8i3+1z9Xd2j63nDBaiPAdR7LrKjORZ0ig8FT1UuiOIiqA X-Received: by 2002:a17:902:d898:: with SMTP id b24mr10166462plz.7.1567783978742; Fri, 06 Sep 2019 08:32:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567783978; cv=none; d=google.com; s=arc-20160816; b=a+9y7tLRUMUYAC5DWs3LJ+ys6AbFb9uJrL82Q5dTg83PWKGPFtNqG/iKtgdNru16Tn nIU0EDA75DTX3QlP4IloMs33DhDzkvuiiz4Syn+Z2RWMmz56BUfbfkYx+8P9bnMYdtxU 8iAsbkUV7iTrMuLNJzAcjg8HacONNlTZ9hUGCVqn5lVMzfb3GaHEvcvNhKIUf0Dy1aGx 7JQB7rnDn9ckpts/csqD/tIGJWqYr+926LAuzzo/nssSiDoiSVET4p0sko4AaLQde43N mYX16ThLPf9hiUtg3Tu3mGkH5NvAgNbPhf04WkDDKsVDqd2w7h9qMJmhLb4BS2MxGo+K tePw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=g/lgAr7bmOyDQYYxPZuRIt+oDe7c6jI7VSqdZXqFkVk=; b=yBLeIygmt4afqP+bRMVh5jV8mjqq7LzxyHxKVX/OGdDLETpSB52OB8L8Rie0chks1u EWuFXQDQnBnUK05HCgW7RlvY9lMBEid4yxZ4qgdnMSi6blCU/kmPrBOBZuRTLFZDFjnm 2FkyHisVG+EaDnKOlyJmVcHvlFoCQc4VOdf9n5w5PQscsI4JEy/eCJrjyMsPx1/0PyBf C0LjuBgjCwJRVju1bkyPpy+8YU5BuukdSnPIS6XvzWTBYZebjX6Ghm3XrO/QvHUDcDWm Su4eLBFlA0/TYf6gyrS4StimE8AkMunXXnxIHdid5J7ZhiOYnscnTfAlR+JygDIVAlLK aDVQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e16si5958110pfd.208.2019.09.06.08.32.58; Fri, 06 Sep 2019 08:32:58 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394854AbfIFPc5 (ORCPT + 28 others); Fri, 6 Sep 2019 11:32:57 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:58731 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725871AbfIFPc5 (ORCPT ); Fri, 6 Sep 2019 11:32:57 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1MHX3R-1htHnP36g5-00DWTJ; Fri, 06 Sep 2019 17:32:50 +0200 From: Arnd Bergmann To: David Howells Cc: Arnd Bergmann , Jann Horn , Jens Axboe , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] watch_queue: make locked_vm accessible Date: Fri, 6 Sep 2019 17:32:35 +0200 Message-Id: <20190906153249.1864324-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:sbgYIj3sTLe6oQpfz0v9JJ1XPJHhKbHYyyuMMQMqloTgfI7J+rF Ggq9j5ylWWGi582FcXvRN3IlkRObdarvjkKJ7QeB3fpN6usSCoV07tXKS/LeXsYbpHkL7c5 FbZKF6TFQ3hJ8diapQciK0ZYmZJubNGw4ACvb7hbXVURJYIBqz/d1iplTY2jJ2JdELKLP4w h/ASi/JKgrIV2x89Tgdbg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:3hY4TUfEVzk=:stupZYSdkkZxNkZrc4/bey 8HMh1FzR2V4l5qYWkBYMCbQpwkofK81n8wx1tUIS2l+9OTzIbq0Vv/k6ufDxj28RmK47JQETv rJq3fyYpp55OBqyg6F573sZCvC2xqyeWm6nBs8eElmuV3O2KEW4pJhn1c8Twu0IxmNp3+3YJZ 2gcJr0cbQr3pL77PVSOlEElQkzMEmj0PVKPaRj+sRefo/cKAn7bxJeUeVwCZPKSOuEIntcZq8 nQKeTgKnTa1qJt9cPN5gUhl9ussoBRJWTqEX7vxUVjwOHD1UVYZW0Jvi7htMyHkin8B/MOIYs HC6xHOTiTIueai4vT5WaiVTyfGFwy5KTSQfR9XueP8z/fZvjhesTiCG8HgTS5OtYej2JD7VL/ osPH50qi5pQ3kEA62ibhd0IBWULDoynEUm3zKAUTcGkT6ttaX5rlNi298m3FiGn6NXjtXbsbP 4oE3jRXkJ5P/yKCgVN7RZEygsgxbYBj6DKACcWunzS3E14/nySVYw7CjaPUNw8FwpZ9jVyyFa N7iNbZQdWI+QN9CykkICxjD3V7p7RwchXasFta83oEQu1T4KK6fYkOKJXrXg+aZDSrcgwb1Mq rMvzds3+93dP5IqAY+IYpt+qAgAYnOsRV2IlMr5mUicOQawclzp+oZIXs9SU0TyKXo/UyJ41c 8OOlW6DjWntvKBduRZn81tOxqLCbrdsSG59UymiKmslSqg0Gyzx9x8GDOl3RhO65orZHEA4Tz ocBlmv8vGfsnRZKY9wZDrvjtkV5EnRNWga5x7unk+bCRpPr6Plu7M73TvMfqKbyJHees80AVc U+fc6PAerA+gWKYzEC2V95fi/UxS8gDjiZ+VWo/kuBngcrGDiQ= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The locked_vm member of struct user_struct is guarded by an #ifdef, which breaks building the new watch_queue driver when all the other subsystems that need it are disabled: drivers/misc/watch_queue.c:315:38: error: no member named 'locked_vm' in 'struct user_struct'; did you mean 'locked_shm'? Add watch_queue to the list. Signed-off-by: Arnd Bergmann --- include/linux/sched/user.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0 diff --git a/include/linux/sched/user.h b/include/linux/sched/user.h index 917d88edb7b9..6cd21c7bb83e 100644 --- a/include/linux/sched/user.h +++ b/include/linux/sched/user.h @@ -33,7 +33,7 @@ struct user_struct { kuid_t uid; #if defined(CONFIG_PERF_EVENTS) || defined(CONFIG_BPF_SYSCALL) || \ - defined(CONFIG_NET) || defined(CONFIG_IO_URING) + defined(CONFIG_NET) || defined(CONFIG_IO_URING) || defined(CONFIG_WATCH_QUEUE) atomic_long_t locked_vm; #endif From patchwork Fri Sep 6 15:32:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 173261 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp875711ilq; Fri, 6 Sep 2019 08:33:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzTfejBbSX1eQicBO4rP2oDukt35SaQ9rxy1BaUbH+7GRJOC1a+dVhHLZqC0nV2lUa1fNpz X-Received: by 2002:a62:168e:: with SMTP id 136mr11362065pfw.144.1567783993373; Fri, 06 Sep 2019 08:33:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567783993; cv=none; d=google.com; s=arc-20160816; b=vfYht4jLJndU75LozT6S6tUGYzfguNfTmC0zcLA9j8nzGhj9yQwEwG0j9i1WDgn1Eh Kjrcdftvo+B2HH2TQ9vO8da11StNBeIlgiQnPW3lCtrwSLpII+XOOApGU6VjodYxT0fi W5FSMkKR+uwg50sMhxmc+mfKVF3GnqlPoCapLUylwBrL8wp7tXo+eRO5JkttE4wgx+Ok +XugIDuiW0ECqjt/aeI4L7L7uGzLD1YFDXFwpQFph5h+rceoHEsaXDf4lQbnyt7bO3+f FmAfOi1IEZdfBj5h6DYb/en53lkFd8KpoIKEVb00R35jmYxEEyVvDXeazw412+rdx7nZ PYjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=8IDj+aLdGDr+FDOoMT9mhq9vAoZsi2GfnMGl3USp94s=; b=r2EFyf3YpD48lrRMMf6HqXDclp1K3ZDAK5l7oZaX1mrey/p0aFqEoAg0GBUKTnysBu /k3qacWNpr3xlf6CNdE/J4EUL5/A64BoLAEAdSiwUL7qKTfbJmeLgR/ixUX/mHo9gSt9 /q4w3r9etFRqiKyWapnJ/B1z3ydSfYqCSSeaOFwPGkYA8ArHZdCbS+7PEhvUgLrpGpRX QRYHfnR9jG0xqmXOlrgWIqnMefixBwOsVu1oFIklnFYbp1WTIrrIbDlTl0uNAvyBbbp+ kG5Pg/UrHc51cpvXroPLaD1AoopIR15+w1Zu9VrV2WSs5i8r/qILBmutLNHKFzZShWs8 wr3Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e16si5958110pfd.208.2019.09.06.08.33.13; Fri, 06 Sep 2019 08:33:13 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394864AbfIFPdM (ORCPT + 28 others); Fri, 6 Sep 2019 11:33:12 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:60027 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725871AbfIFPdM (ORCPT ); Fri, 6 Sep 2019 11:33:12 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mwwhv-1iLQpm1LR5-00yQot; Fri, 06 Sep 2019 17:33:05 +0200 From: Arnd Bergmann To: David Howells Cc: Arnd Bergmann , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] [don't apply] watch_queue: disable sample Date: Fri, 6 Sep 2019 17:32:36 +0200 Message-Id: <20190906153249.1864324-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190906153249.1864324-1-arnd@arndb.de> References: <20190906153249.1864324-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:s7LPzVXx1AJcu2lZxoaxETHXyBTWZCi5uuZHceTd7xmKWVYH64/ P54VqDE9IQNixadRhryh7ZFIl83Ore9NrMOZvT3DMt10/MyjaDHk5x239xvF1o1Txdg+0dS jOwnD8QIBufqBUVa1v8h6bnKEhZHti2cLiHUMhwlwvCy+Hb8EwRyS6J7he9vfAfiU1OGN/H 2zvHpocrBQdapMUoBsnKw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:QteUEtZ8coQ=:ZWe4eD/tcSVz70zIJy7uSw ZvnnparMxVq87+j4LEwOmEfKn45AOwhcCMD7OiakzbWuYQyDdhNuHspDZKFn8batrFibFclFZ c4BhsbUPZbhf56m2TW4voOSmCqQi35FmHFEyb8bLteZlZHVV0NSYghCt5VMh1AtE1+ZlI/fpo eoCQdQswkHJYOn1tqRhW/FXlKJ0c6CS9NJ5aerAyAfgtdiF1jqKUFEFviscuecz9gA5AsyzNA HOMLCJ+6COKeREaqiISM72Bit9Gtu0Jgmo/aS4fN80tu9jnKoCT0lVwjb91tkkpVioK6x7bR8 MkmuNQFPget5mEIMGkRoNhqzUYy5qQu29awB/56bquNcT3urUQ3/2DFyzNrlcFGwaTrIfkoJ1 tbbfzFDeo5cJfN7S2cPWonh59qj2PjqcnvrEosotfC8rnHcAVvjICfYqwkBf5RKYkG2UOs94j evdSbNEDY54OzEDgWZSxIlEWJvxG6yoUr0n6xMJQeUz5NlioDeFBFXrEv5fLgOHM3nFDc6OJs p6xJm1MoxAK243XIlBsuaMAbkWd0UMPNY/bPuVsFlmGAupyQ65kMU39WN/YDUJo4FGp+5p6n7 IJ+CT7HCf7lGQSB0244pKB6jKDLQX39x5XW0k6Yaj6/QBZLAOVPNM922uwVQ+uMWtBIVzbNFP 6C37wI058WU1mgnw9x6s7EEmrbhLw0jS+G9iIhBEh393gl8Lv30PrAehfnYUcgd3ado8iSoUy PNitBkqzRHKmUEJGIU1H5fV3c9xvjQ/fMO+h52Qwlzc11JVqBWxwFSlhzvzqBbr0YASIcie8V RcQ079WzlDFA2F5LEGN6yOQHwirVg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building in a separate object directory causes a compilation failure for a missing header: samples/watch_queue/watch_test.c:23:10: fatal error: linux/watch_queue.h: No such file or directory I could not figure out why this does not work and applied this patch locally. It would be good to fix this properly for 5.4 instead. Signed-off-by: Arnd Bergmann --- samples/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0 diff --git a/samples/Makefile b/samples/Makefile index a61a39047d02..068b28113be9 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -20,4 +20,4 @@ obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/ obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/ obj-y += vfio-mdev/ subdir-$(CONFIG_SAMPLE_VFS) += vfs -subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue +#subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue