[Kdfs-commits] [kernel]kdfs branch, master, updated. 9c1e8c28ec4f470c34f4c3754096311e1e1d0067

[Pierre R. <pr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "kdfs".

The branch, master has been updated
       via  9c1e8c28ec4f470c34f4c3754096311e1e1d0067 (commit)
       via  a7dc26744688881c7466fb5fef2e5459d50413a6 (commit)
       via  fbd1f02164c25aa0c84828fe5a27014f208c2b6e (commit)
       via  a49dfc12204314a84686850ecb279a363a05ce35 (commit)
       via  87b2eecf0f627ffcc2ea8300e0d0781f8e5c9843 (commit)
      from  9d670d2889578bcd82fb2d985e78508bfc342a49 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9c1e8c28ec4f470c34f4c3754096311e1e1d0067
Merge: 9d670d2 a7dc267
Author: Pierre Riteau <Pie...@ir...>
Date:   Tue Oct 20 22:57:43 2009 +0200

    Merge branch 'master' of git://mirrors.git.kernel.org/cluster/kerrighed/kernel


commit a7dc26744688881c7466fb5fef2e5459d50413a6
Author: Louis Rilling <lou...@ke...>
Date:   Tue Oct 20 18:05:06 2009 +0200

    [BUGFIX] krg_ns/pid: Always initialize sighand_struct::krg_objid/kddm_obj in execve()
    
    Signed-off-by: Louis Rilling <lou...@ke...>

diff --git a/kerrighed/epm/sighand.c b/kerrighed/epm/sighand.c
index ecde20e..7efdff8 100644
--- a/kerrighed/epm/sighand.c
+++ b/kerrighed/epm/sighand.c
@@ -269,9 +269,6 @@ static void __krg_sighand_alloc(struct task_struct *task,
 {
 	struct sighand_struct_kddm_object *obj;
 
-	if (!task->nsproxy->krg_ns)
-		return;
-
 	/*
 	 * Exclude kernel threads and local pids from using sighand_struct kddm
 	 * objects.
@@ -282,7 +279,8 @@ static void __krg_sighand_alloc(struct task_struct *task,
 	 * is being allocated, but we only need to know whether it is NULL or
 	 * not, which will be the same after copy_mm.
 	 */
-	if (!(task_pid_knr(task) & GLOBAL_PID_MASK)
+	if (!task->nsproxy->krg_ns
+	    || !(task_pid_knr(task) & GLOBAL_PID_MASK)
 	    || (task->flags & PF_KTHREAD)) {
 		BUG_ON(krg_current);
 		sig->krg_objid = 0;

commit fbd1f02164c25aa0c84828fe5a27014f208c2b6e
Author: Louis Rilling <lou...@ke...>
Date:   Thu Oct 15 12:23:45 2009 +0200

    [BUGFIX] x86-32: Fix call to lazy_save_gs() in export_thread_struct()
    
    Signed-off-by: Louis Rilling <lou...@ke...>

diff --git a/arch/x86/kerrighed/ghost.c b/arch/x86/kerrighed/ghost.c
index 2dabe9a..bcaba91 100644
--- a/arch/x86/kerrighed/ghost.c
+++ b/arch/x86/kerrighed/ghost.c
@@ -112,7 +112,7 @@ int export_thread_struct(struct epm_action *action,
 	savesegment(ds, tsk->thread.ds);
 
 #else /* CONFIG_X86_32 */
-	lazy_save_gs(tsk, tsk->thread.gs);
+	lazy_save_gs(tsk->thread.gs);
 
 	WARN_ON(tsk->thread.vm86_info);
 #endif /* CONFIG_X86_32 */

commit a49dfc12204314a84686850ecb279a363a05ce35
Author: Louis Rilling <lou...@ke...>
Date:   Thu Oct 15 12:20:52 2009 +0200

    [BUGFIX] x86-32: Fix KRG_FAF version of __put_user_asm_u64()
    
    Signed-off-by: Louis Rilling <lou...@ke...>

diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index 396d4a3..5ba660e 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -197,7 +197,7 @@ extern int __get_user_bad(void);
 		     "  movl $8,(%%esp)\n"				\
 		     "	pushl %%edx\n"					\
 		     "	pushl %%eax\n"					\
-		     "	lea %2,%%eax\n"					\
+		     "	movl %2,%%eax\n"					\
 		     "	call ruaccess_put_user_asm\n"			\
 		     "	testl %%eax,%%eax\n"				\
 		     "	popl %%eax\n"					\
@@ -210,7 +210,7 @@ extern int __get_user_bad(void);
 		     _ASM_EXTABLE(1b, 4b)				\
 		     _ASM_EXTABLE(2b, 5b)				\
 		     : "=r" (err)					\
-		     : "A" (x), "r" (addr), "i" (errret), "0" (err)
+		     : "A" (x), "r" (addr), "i" (errret), "0" (err))
 
 #else /* !CONFIG_KRG_FAF */
 

commit 87b2eecf0f627ffcc2ea8300e0d0781f8e5c9843
Author: Renaud Lottiaux <Ren...@ke...>
Date:   Tue Oct 20 15:30:20 2009 +0200

    [MINOR] Fix compilation warning with hugetlbfs_file_operations.
    
    Avoid compilation issue if CONFIG_HUGETLB_PAGE is not set.

diff --git a/ipc/krgipc_mobility.c b/ipc/krgipc_mobility.c
index 1323544..8c0992c 100644
--- a/ipc/krgipc_mobility.c
+++ b/ipc/krgipc_mobility.c
@@ -1201,8 +1201,10 @@ int export_full_sysv_shm(ghost_t *ghost, int shmid)
 		goto out_shm_unlock;
 
 	flag = shp->shm_perm.mode;
+#ifdef CONFIG_HUGETLB_PAGE
 	if (shp->shm_file->f_op == &hugetlbfs_file_operations)
 		flag |= SHM_HUGETLB;
+#endif
 	/* SHM_NORESERVE not handled */
 
 	r = ghost_write(ghost, &flag, sizeof(int));

-----------------------------------------------------------------------

Summary of changes:
 arch/x86/include/asm/uaccess.h |    4 ++--
 arch/x86/kerrighed/ghost.c     |    2 +-
 ipc/krgipc_mobility.c          |    2 ++
 kerrighed/epm/sighand.c        |    6 ++----
 4 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
kdfs