From: Mark Salter <msalter@redhat•com>
To: Paul Gortmaker <paul.gortmaker@windriver•com>,
Oleg Nesterov <oleg@redhat•com>
Cc: "Kirill A. Shutemov" <kirill@shutemov•name>,
Dave Hansen <dave.hansen@linux•intel.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux•intel.com>,
Andrew Morton <akpm@linux-foundation•org>,
linux-mm@kvack•org, LKML <linux-kernel@vger•kernel.org>,
Andy Lutomirski <luto@amacapital•net>,
Thomas Gleixner <tglx@linutronix•de>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>
Subject: Re: [PATCH 1/1] mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
Date: Mon, 27 Jul 2015 15:34:56 -0400 [thread overview]
Message-ID: <1438025696.31680.24.camel@redhat.com> (raw)
In-Reply-To: <CAP=VYLp+5Co5PyHcbfkdkNUmyy259DuG4ov=+da+UeRAGFUe1Q@mail.gmail.com>
On Fri, 2015-07-24 at 10:39 -0400, Paul Gortmaker wrote:
> On Thu, Jul 16, 2015 at 6:26 PM, Oleg Nesterov <oleg@redhat•com> wrote:
> > Add the additional "vm_flags_t vm_flags" argument to do_mmap_pgoff(),
> > rename it to do_mmap(), and re-introduce do_mmap_pgoff() as a simple
> > wrapper on top of do_mmap(). Perhaps we should update the callers of
> > do_mmap_pgoff() and kill it later.
>
> It seems that the version of this patch in linux-next breaks all nommu
> builds (m86k, some arm, etc).
>
> mm/nommu.c: In function 'do_mmap':
> mm/nommu.c:1248:30: error: 'vm_flags' redeclared as different kind of symbol
> mm/nommu.c:1241:15: note: previous definition of 'vm_flags' was here
> scripts/Makefile.build:258: recipe for target 'mm/nommu.o' failed
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/12470285/
>
> Bisect says:
>
> 31705a3a633bb63683918f055fe6032939672b61 is the first bad commit
> commit 31705a3a633bb63683918f055fe6032939672b61
> Author: Oleg Nesterov <oleg@redhat•com>
> Date: Fri Jul 24 09:20:30 2015 +1000
>
> mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
>
> Paul.
This fixes the build error and runs fine on c6x:
diff --git a/mm/nommu.c b/mm/nommu.c
index 530eea5..af2196e 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1245,7 +1245,7 @@ unsigned long do_mmap(struct file *file,
struct vm_area_struct *vma;
struct vm_region *region;
struct rb_node *rb;
- unsigned long capabilities, vm_flags, result;
+ unsigned long capabilities, result;
int ret;
*populate = 0;
@@ -1263,7 +1263,7 @@ unsigned long do_mmap(struct file *file,
/* we've determined that we can make the mapping, now translate what we
* now know into VMA flags */
- vm_flags = determine_vm_flags(file, prot, flags, capabilities);
+ vm_flags |= determine_vm_flags(file, prot, flags, capabilities);
/* we're going to need to record the mapping */
region = kmem_cache_zalloc(vm_region_jar, GFP_KERNEL);
prev parent reply other threads:[~2015-07-27 19:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1436784852-144369-1-git-send-email-kirill.shutemov@linux.intel.com>
[not found] ` <1436784852-144369-3-git-send-email-kirill.shutemov@linux.intel.com>
[not found] ` <20150713165323.GA7906@redhat.com>
[not found] ` <55A3EFE9.7080101@linux.intel.com>
[not found] ` <20150716110503.9A4F5196@black.fi.intel.com>
[not found] ` <55A7D38C.7070907@linux.intel.com>
[not found] ` <20150716160927.GA27037@node.dhcp.inet.fi>
[not found] ` <20150716222603.GA21791@redhat.com>
[not found] ` <20150716222621.GB21791@redhat.com>
2015-07-24 14:39 ` [PATCH 1/1] mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff() Paul Gortmaker
2015-07-27 19:34 ` Mark Salter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438025696.31680.24.camel@redhat.com \
--to=msalter@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=kirill@shutemov$(echo .)name \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luto@amacapital$(echo .)net \
--cc=oleg@redhat$(echo .)com \
--cc=paul.gortmaker@windriver$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox