aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 12:41:18 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 12:41:18 -0500
commit9ae21d1bb376436285cd5346d3e4b3655d6dd1b9 (patch)
tree8f889770fae721da63bd378c1834a87e2eb1cfb5 /ipc
parentf9b4192923fa6e38331e88214b1fe5fc21583fcc (diff)
parente9415777b1cd0eaf4d1d3d61772f0e6d5c2551ad (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment Kconfig help: MTD_JEDECPROBE already supports Intel Remove ugly debugging stuff do_mounts.c: Minor ROOT_DEV comment cleanup BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c BUG_ON() Conversion in mm/mempool.c BUG_ON() Conversion in mm/memory.c BUG_ON() Conversion in kernel/fork.c BUG_ON() Conversion in ipc/sem.c BUG_ON() Conversion in fs/ext2/ BUG_ON() Conversion in fs/hfs/ BUG_ON() Conversion in fs/dcache.c BUG_ON() Conversion in fs/buffer.c BUG_ON() Conversion in input/serio/hp_sdc_mlc.c BUG_ON() Conversion in md/dm-table.c BUG_ON() Conversion in md/dm-path-selector.c BUG_ON() Conversion in drivers/isdn BUG_ON() Conversion in drivers/char BUG_ON() Conversion in drivers/mtd/
Diffstat (limited to 'ipc')
-rw-r--r--ipc/sem.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index 48a54f66a246..642659cd596b 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -229,8 +229,7 @@ asmlinkage long sys_semget (key_t key, int nsems, int semflg)
229 err = -EEXIST; 229 err = -EEXIST;
230 } else { 230 } else {
231 sma = sem_lock(id); 231 sma = sem_lock(id);
232 if(sma==NULL) 232 BUG_ON(sma==NULL);
233 BUG();
234 if (nsems > sma->sem_nsems) 233 if (nsems > sma->sem_nsems)
235 err = -EINVAL; 234 err = -EINVAL;
236 else if (ipcperms(&sma->sem_perm, semflg)) 235 else if (ipcperms(&sma->sem_perm, semflg))
@@ -1183,8 +1182,7 @@ retry_undos:
1183 1182
1184 sma = sem_lock(semid); 1183 sma = sem_lock(semid);
1185 if(sma==NULL) { 1184 if(sma==NULL) {
1186 if(queue.prev != NULL) 1185 BUG_ON(queue.prev != NULL);
1187 BUG();
1188 error = -EIDRM; 1186 error = -EIDRM;
1189 goto out_free; 1187 goto out_free;
1190 } 1188 }