lkml.org 
[lkml]   [2011]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: mmotm 2011-05-06-16-39 uploaded (fs/proc/task_mmu)
On Fri, May 06, 2011 at 06:35:17PM -0700, Randy Dunlap wrote:
> On Fri, 06 May 2011 16:39:31 -0700 akpm@linux-foundation.org wrote:
>
> > The mm-of-the-moment snapshot 2011-05-06-16-39 has been uploaded to
> >
> > http://userweb.kernel.org/~akpm/mmotm/
> >
> > and will soon be available at
> >
> > git://zen-kernel.org/kernel/mmotm.git
> >
> > It contains the following patches against 2.6.39-rc6:
>
> from "mm-proc-move-show_numa_map-to-fs-proc-task_mmuc.patch":
>
> on i386 (X86_32):
>
> fs/proc/task_mmu.c:981: error: implicit declaration of function 'mpol_to_str'
>
> when CONFIG_SHMEM=n, CONFIG_TMPFS=n, and these NUMA config settings:

OK, thanks for finding this! The key here is CONFIG_TMPFS=n. I think
the only path forward is the obvious one. If reasonable, the following
can be appied just prior to
mm-proc-move-show_numa_map-to-fs-proc-task_mmuc.patch.



From 83aea2021566dd0ceb720b6493df9682cde373f7 Mon Sep 17 00:00:00 2001
From: Stephen Wilson <wilsons@start.ca>
Date: Fri, 6 May 2011 23:45:07 -0400
Subject: [PATCH] mm: declare mpol_to_str() when CONFIG_TMPFS=n

When CONFIG_TMPFS=n mpol_to_str() is not declared in mempolicy.h.
However, in the NUMA case, the definition is always compiled.

Since it is not strictly true that tmpfs is the only client, and since
the symbol was always lurking around anyways, export mpol_to_str()
unconditionally. Furthermore, this will allow us to move
show_numa_map() out of mempolicy.c and into the procfs subsystem.

Signed-off-by: Stephen Wilson <wilsons@start.ca>
Cc: Randy Dunlap <rdunlap@xenotime.net>
---
include/linux/mempolicy.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index c2f6032..7978eec 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -231,10 +231,10 @@ int do_migrate_pages(struct mm_struct *mm,

#ifdef CONFIG_TMPFS
extern int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context);
+#endif

extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,
int no_context);
-#endif

/* Check if a vma is migratable */
static inline int vma_migratable(struct vm_area_struct *vma)
@@ -371,13 +371,13 @@ static inline int mpol_parse_str(char *str, struct mempolicy **mpol,
{
return 1; /* error */
}
+#endif

static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,
int no_context)
{
return 0;
}
-#endif

#endif /* CONFIG_NUMA */
#endif /* __KERNEL__ */
--
1.7.3.5


\
 
 \ /
  Last update: 2011-05-07 07:39    [W:0.157 / U:1.336 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site