---

yaml --- r: 11381 b: refs/heads/master c: 551110a h: refs/heads/master i: 11379: 6669426 v: v3
git-mirror · Oct 30, 2005 · c88c26a · c88c26a
1 parent 114c95c
commit c88c26a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b1533f67cc1a595457af6d05ab3510294e2ca9c
+refs/heads/master: 551110a94aa15890d1709b179c4be1e66ff6db53
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
@@ -233,10 +233,11 @@ static int newseg (key_t key, int shmflg, size_t size)
 	shp->id = shm_buildid(id,shp->shm_perm.seq);
 	shp->shm_file = file;
 	file->f_dentry->d_inode->i_ino = shp->id;
-	if (shmflg & SHM_HUGETLB)
-		set_file_hugepages(file);
-	else
+
+	/* Hugetlb ops would have already been assigned. */
+	if (!(shmflg & SHM_HUGETLB))
 		file->f_op = &shm_file_operations;
+
 	shm_tot += numpages;
 	shm_unlock(shp);
 	return shp->id;