## Automatically generated incremental diff ## From: linux-2.0.40-rc4 ## To: linux-2.0.40-rc5 ## Robot: $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $ diff -urN linux-2.0.40-rc4/MAINTAINERS linux-2.0.40-rc5/MAINTAINERS --- linux-2.0.40-rc4/MAINTAINERS Sat Jun 8 08:50:32 2002 +++ linux-2.0.40-rc5/MAINTAINERS Sat Jun 8 08:50:32 2002 @@ -1,53 +1,46 @@ List of maintainers and how to submit kernel changes -Please try to follow the guidelines below. This will make things -easier on the maintainers. Not all of these guidelines matter for every -trivial patch so apply some common sense. - -1. Always _test_ your changes, however small, on at least 4 or - 5 people, preferably many more. - -2. Try to release a few ALPHA test versions to the net. Announce - them onto the kernel channel and await results. This is especially - important for device drivers, because often that's the only way - you will find things like the fact version 3 firmware needs - a magic fix you didn't know about, or some clown changed the - chips on a board and not its name. (Don't laugh! Look at the - SMC etherpower for that.) - -3. Make sure your changes compile correctly in multiple - configurations. In particular check that changes work both as a - module and built into the kernel. +Please try to follow the guidelines below. This will make things easier +on the maintainers. Not all of these guidelines matter for every trivial +patch so apply some common sense. + +1. Always _test_ your changes, however small, on at least 4 or 5 people, + preferably many more. + +2. Try to release a few ALPHA test versions to the net. Announce them + onto the kernel channel and await results. This is especially + important for device drivers, because often that's the only way you + will find things like the fact version 3 firmware needs a magic fix + you didn't know about, or some clown changed the chips on a board + and not its name. (Don't laugh! Look at the SMC etherpower for that.) + +3. Make sure your changes compile correctly in multiple configurations. + In particular check that changes work both as a module and built into + the kernel. 4. When you are happy with a change make it generally available for testing and await feedback. 5. Make a patch available to the relevant maintainer in the list. Use - 'diff -u' to make the patch easy to merge. Be prepared to get your - changes sent back with seemingly silly requests about formatting - and variable names. These aren't as silly as they seem. One - job the maintainers (and especially Linus) do is to keep things - looking the same. Sometimes this means that the clever hack in - your driver to get around a problem actual needs to become a - generalised kernel feature ready for next time. See - Documentation/CodingStyle for guidance here. - - PLEASE try to include any credit lines you want added with the - patch. It avoids people being missed off by mistake and makes - it easier to know who wants adding and who doesn't. - - PLEASE document known bugs. If it doesn't work for everything - or does something very odd once a month document it. - -6. Make sure you have the right to send any changes you make. If you - do changes at work you may find your employer owns the patch - not you. + 'diff -u5' to make the patch easy to merge. Be prepared to get your + changes sent back with seemingly silly requests about formatting and + variable names. These aren't as silly as they seem. One job the + maintainers (and especially Linus) do is to keep things looking the + same. Sometimes this means that the clever hack in your driver to get + around a problem actual needs to become a generalised kernel feature + ready for next time. See Documentation/CodingStyle for guidance here. + + PLEASE try to include any credit lines you want added with the patch. + It avoids people being missed off by mistake and makes it easier to + know who wants adding and who doesn't. -7. Happy hacking. + PLEASE document known bugs. If it doesn't work for everything or does + something very odd once a month document it. +6. Make sure you have the right to send any changes you make. If you do + changes at work you may find your employer owns the patch not you. -[This file is new: I've just put the existing network contacts in, other - people please add yourselves] -- AC +7. Happy hacking. ----------------------------------- @@ -60,7 +53,7 @@ S: Status, one of the following: Supported: Someone is actually paid to look after this (wildly - improbable). + improbable, but does occasionally happen). Maintained: Someone actually looks after it. Odd Fixes: It has a maintainer but they don't have time to do much other than throw the odd patch in. See below.. @@ -111,7 +104,7 @@ APPLETALK NETWORK LAYER P: Jay Schulist M: jschlst@samba.org -L: linux-atalk@netspace.org +L: linux-atalk@lists.netspace.org S: Maintained ARPD SUPPORT @@ -185,7 +178,7 @@ DIGIBOARD DRIVER P: Christoph Lameter -M: clameter@fuller.edu +M: christoph@lameter.com W: http://www.dgii.com/linux,http://lameter.com/digi L: digilnux@dgii.com S: Maintained @@ -257,15 +250,21 @@ L: linux-kernel@vger.kernel.org S: Maintained +i386 BOOT CODE +P: Riley Williams +M: Riley@Williams.Name +L: linux-kernel@vger.kernel.org +S: Odd fixes + IDE DRIVER [GENERAL] P: Andre Hedrick M: andre@linux-ide.org -M: andre@aslab.com -M: andre@suse.com +M: andre@linuxdiskcert.org L: linux-kernel@vger.kernel.org W: http://www.kernel.org/pub/linux/kernel/people/hedrick/ W: http://www.linux-ide.org/ -S: Supported +W: http://www.linuxdiskcert.org/ +S: Maintained IDE/ATAPI CDROM DRIVER P: Jens Axboe @@ -315,8 +314,8 @@ S: Maintained LANCE AND LANCE32 NETWORK DRIVER -P: Thomas Bogendoerfer -M: tsbogend@bigbug.franken.de +P: Thomas Bogendörfer +M: tsbogend@alpha.franken.de L: linux-net@vger.kernel.org S: Maintained @@ -436,7 +435,7 @@ SVGA HANDLING P: Martin Mares -M: mj@atrey.karlin.mff.cuni.cz +M: mj@ucw.cz L: linux-video@atrey.karlin.mff.cuni.cz S: Maintained diff -urN linux-2.0.40-rc4/Makefile linux-2.0.40-rc5/Makefile --- linux-2.0.40-rc4/Makefile Sat Jun 8 08:50:32 2002 +++ linux-2.0.40-rc5/Makefile Sat Jun 8 08:50:32 2002 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 0 SUBLEVEL = 40 -EXTRAVERSION =-rc4 +EXTRAVERSION =-rc5 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) diff -urN linux-2.0.40-rc4/arch/alpha/kernel/signal.c linux-2.0.40-rc5/arch/alpha/kernel/signal.c --- linux-2.0.40-rc4/arch/alpha/kernel/signal.c Wed Jun 3 15:17:46 1998 +++ linux-2.0.40-rc5/arch/alpha/kernel/signal.c Sat Jun 8 08:50:32 2002 @@ -320,7 +320,7 @@ if (current->pid == 1) continue; switch (signr) { - case SIGCONT: case SIGCHLD: case SIGWINCH: + case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG: continue; case SIGTSTP: case SIGTTIN: case SIGTTOU: diff -urN linux-2.0.40-rc4/arch/i386/kernel/signal.c linux-2.0.40-rc5/arch/i386/kernel/signal.c --- linux-2.0.40-rc4/arch/i386/kernel/signal.c Sat Jun 8 08:50:32 2002 +++ linux-2.0.40-rc5/arch/i386/kernel/signal.c Sat Jun 8 08:50:32 2002 @@ -312,7 +312,7 @@ if (current->pid == 1) continue; switch (signr) { - case SIGCONT: case SIGCHLD: case SIGWINCH: + case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG: continue; case SIGTSTP: case SIGTTIN: case SIGTTOU: diff -urN linux-2.0.40-rc4/arch/m68k/kernel/signal.c linux-2.0.40-rc5/arch/m68k/kernel/signal.c --- linux-2.0.40-rc4/arch/m68k/kernel/signal.c Sun May 19 21:54:26 1996 +++ linux-2.0.40-rc5/arch/m68k/kernel/signal.c Sat Jun 8 08:50:32 2002 @@ -447,7 +447,7 @@ if (current->pid == 1) continue; switch (signr) { - case SIGCONT: case SIGCHLD: case SIGWINCH: + case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG: continue; case SIGSTOP: case SIGTSTP: case SIGTTIN: case SIGTTOU: diff -urN linux-2.0.40-rc4/arch/mips/kernel/signal.c linux-2.0.40-rc5/arch/mips/kernel/signal.c --- linux-2.0.40-rc4/arch/mips/kernel/signal.c Sun Mar 10 23:39:33 1996 +++ linux-2.0.40-rc5/arch/mips/kernel/signal.c Sat Jun 8 08:50:32 2002 @@ -279,7 +279,7 @@ if (current->pid == 1) continue; switch (signr) { - case SIGCONT: case SIGCHLD: case SIGWINCH: + case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG: continue; case SIGSTOP: case SIGTSTP: case SIGTTIN: case SIGTTOU: diff -urN linux-2.0.40-rc4/arch/ppc/kernel/signal.c linux-2.0.40-rc5/arch/ppc/kernel/signal.c --- linux-2.0.40-rc4/arch/ppc/kernel/signal.c Mon Jul 8 01:27:43 1996 +++ linux-2.0.40-rc5/arch/ppc/kernel/signal.c Sat Jun 8 08:50:32 2002 @@ -148,7 +148,7 @@ if (current->pid == 1) continue; switch (signr) { - case SIGCONT: case SIGCHLD: case SIGWINCH: + case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG: continue; case SIGSTOP: case SIGTSTP: case SIGTTIN: case SIGTTOU: diff -urN linux-2.0.40-rc4/arch/sparc/kernel/signal.c linux-2.0.40-rc5/arch/sparc/kernel/signal.c --- linux-2.0.40-rc4/arch/sparc/kernel/signal.c Thu Apr 25 03:22:05 1996 +++ linux-2.0.40-rc5/arch/sparc/kernel/signal.c Sat Jun 8 08:50:32 2002 @@ -258,7 +258,7 @@ if(current->pid == 1) continue; switch(signr) { - case SIGCONT: case SIGCHLD: case SIGWINCH: + case SIGCONT: case SIGCHLD: case SIGWINCH: case SIGURG: continue; case SIGSTOP: case SIGTSTP: case SIGTTIN: case SIGTTOU: diff -urN linux-2.0.40-rc4/ipc/sem.c linux-2.0.40-rc5/ipc/sem.c --- linux-2.0.40-rc4/ipc/sem.c Sat Aug 31 23:15:34 1996 +++ linux-2.0.40-rc5/ipc/sem.c Sat Jun 8 08:50:32 2002 @@ -40,10 +40,10 @@ #include #include -extern int ipcperms (struct ipc_perm *ipcp, short semflg); -static int newary (key_t, int, int); -static int findkey (key_t key); -static void freeary (int id); +extern int ipcperms(struct ipc_perm *ipcp, short semflg); +static int newary(key_t, int, int); +static int findkey(key_t key); +static void freeary(int id); static struct semid_ds *semary[SEMMNI]; static int used_sems = 0, used_semids = 0; @@ -52,7 +52,7 @@ static unsigned short sem_seq = 0; -void sem_init (void) +void sem_init(void) { int i; @@ -63,14 +63,14 @@ return; } -static int findkey (key_t key) +static int findkey(key_t key) { int id; struct semid_ds *sma; for (id = 0; id <= max_semid; id++) { while ((sma = semary[id]) == IPC_NOID) - interruptible_sleep_on (&sem_lock); + interruptible_sleep_on(&sem_lock); if (sma == IPC_UNUSED) continue; if (key == sma->sem_perm.key) @@ -79,7 +79,7 @@ return -1; } -static int newary (key_t key, int nsems, int semflg) +static int newary(key_t key, int nsems, int semflg) { int id; struct semid_ds *sma; @@ -99,14 +99,14 @@ found: size = sizeof (*sma) + nsems * sizeof (struct sem); used_sems += nsems; - sma = (struct semid_ds *) kmalloc (size, GFP_KERNEL); + sma = (struct semid_ds *) kmalloc(size, GFP_KERNEL); if (!sma) { semary[id] = (struct semid_ds *) IPC_UNUSED; used_sems -= nsems; - wake_up (&sem_lock); + wake_up(&sem_lock); return -ENOMEM; } - memset (sma, 0, size); + memset(sma, 0, size); sma->sem_base = (struct sem *) &sma[1]; ipcp = &sma->sem_perm; ipcp->mode = (semflg & S_IRWXUGO); @@ -123,11 +123,11 @@ max_semid = id; used_semids++; semary[id] = sma; - wake_up (&sem_lock); + wake_up(&sem_lock); return (unsigned int) sma->sem_perm.seq * SEMMNI + id; } -asmlinkage int sys_semget (key_t key, int nsems, int semflg) +asmlinkage int sys_semget(key_t key, int nsems, int semflg) { int id; struct semid_ds *sma; @@ -136,7 +136,7 @@ return -EINVAL; if (key == IPC_PRIVATE) return newary(key, nsems, semflg); - if ((id = findkey (key)) == -1) { /* key not used */ + if ((id = findkey(key)) == -1) { /* key not used */ if (!(semflg & IPC_CREAT)) return -ENOENT; return newary(key, nsems, semflg); @@ -154,12 +154,12 @@ /* Manage the doubly linked list sma->sem_pending as a FIFO: * insert new queue elements at the tail sma->sem_pending_last. */ -static inline void insert_into_queue (struct semid_ds * sma, struct sem_queue * q) +static inline void insert_into_queue(struct semid_ds * sma, struct sem_queue * q) { *(q->prev = sma->sem_pending_last) = q; *(sma->sem_pending_last = &q->next) = NULL; } -static inline void remove_from_queue (struct semid_ds * sma, struct sem_queue * q) +static inline void remove_from_queue(struct semid_ds * sma, struct sem_queue * q) { *(q->prev) = q->next; if (q->next) @@ -172,7 +172,7 @@ /* Determine whether a sequence of semaphore operations would succeed * all at once. Return 0 if yes, 1 if need to sleep, else return error code. */ -static int try_semop (struct semid_ds * sma, struct sembuf * sops, int nsops) +static int try_semop(struct semid_ds * sma, struct sembuf * sops, int nsops) { int result = 0; int i = 0; @@ -211,8 +211,8 @@ /* Actually perform a sequence of semaphore operations. Atomically. */ /* This assumes that try_semop() already returned 0. */ -static int do_semop (struct semid_ds * sma, struct sembuf * sops, int nsops, - struct sem_undo * un, int pid) +static int do_semop(struct semid_ds * sma, struct sembuf * sops, int nsops, + struct sem_undo * un, int pid) { int i; @@ -252,7 +252,7 @@ * looking for tasks that can be completed. Keep cycling through * the queue until a pass is made in which no process is woken up. */ -static void update_queue (struct semid_ds * sma) +static void update_queue(struct semid_ds * sma) { int wokeup, error; struct sem_queue * q; @@ -269,7 +269,7 @@ error = do_semop(sma, q->sops, q->nsops, q->undo, q->pid); q->status = error; /* Remove it from the queue */ - remove_from_queue(sma,q); + remove_from_queue(sma, q); /* Wake it up */ wake_up_interruptible(&q->sleeper); /* doesn't sleep! */ wokeup++; @@ -286,7 +286,7 @@ * The counts we return here are a rough approximation, but still * warrant that semncnt+semzcnt>0 if the task is on the pending queue. */ -static int count_semncnt (struct semid_ds * sma, ushort semnum) +static int count_semncnt(struct semid_ds * sma, ushort semnum) { int semncnt; struct sem_queue * q; @@ -304,7 +304,7 @@ } return semncnt; } -static int count_semzcnt (struct semid_ds * sma, ushort semnum) +static int count_semzcnt(struct semid_ds * sma, ushort semnum) { int semzcnt; struct sem_queue * q; @@ -324,7 +324,7 @@ } /* Free a semaphore set. */ -static void freeary (int id) +static void freeary(int id) { struct semid_ds *sma = semary[id]; struct sem_undo *un; @@ -355,7 +355,7 @@ kfree(sma); } -asmlinkage int sys_semctl (int semid, int semnum, int cmd, union semun arg) +asmlinkage int sys_semctl(int semid, int semnum, int cmd, union semun arg) { struct semid_ds *buf = NULL; struct semid_ds tbuf; @@ -390,16 +390,16 @@ seminfo.semusz = used_semids; seminfo.semaem = used_sems; } - i = verify_area(VERIFY_WRITE, tmp, sizeof(struct seminfo)); + i = verify_area(VERIFY_WRITE, tmp, sizeof (struct seminfo)); if (i) return i; - memcpy_tofs (tmp, &seminfo, sizeof(struct seminfo)); + memcpy_tofs(tmp, &seminfo, sizeof (struct seminfo)); return max_semid; } case SEM_STAT: buf = arg.buf; - i = verify_area (VERIFY_WRITE, buf, sizeof (*buf)); + i = verify_area(VERIFY_WRITE, buf, sizeof (*buf)); if (i) return i; if (semid > max_semid) @@ -407,14 +407,14 @@ sma = semary[semid]; if (sma == IPC_UNUSED || sma == IPC_NOID) return -EINVAL; - if (ipcperms (&sma->sem_perm, S_IRUGO)) + if (ipcperms(&sma->sem_perm, S_IRUGO)) return -EACCES; id = (unsigned int) sma->sem_perm.seq * SEMMNI + semid; tbuf.sem_perm = sma->sem_perm; tbuf.sem_otime = sma->sem_otime; tbuf.sem_ctime = sma->sem_ctime; tbuf.sem_nsems = sma->sem_nsems; - memcpy_tofs (buf, &tbuf, sizeof(*buf)); + memcpy_tofs(buf, &tbuf, sizeof (*buf)); return id; } @@ -445,16 +445,16 @@ case GETNCNT: case GETZCNT: case GETALL: - if (ipcperms (ipcp, S_IRUGO)) + if (ipcperms(ipcp, S_IRUGO)) return -EACCES; switch (cmd) { case GETVAL : return curr->semval; case GETPID : return curr->sempid; - case GETNCNT: return count_semncnt(sma,semnum); - case GETZCNT: return count_semzcnt(sma,semnum); + case GETNCNT: return count_semncnt(sma, semnum); + case GETZCNT: return count_semzcnt(sma, semnum); case GETALL: array = arg.array; - i = verify_area (VERIFY_WRITE, array, nsems*sizeof(ushort)); + i = verify_area(VERIFY_WRITE, array, nsems * sizeof (ushort)); if (i) return i; } @@ -466,29 +466,29 @@ break; case IPC_RMID: if (suser() || current->euid == ipcp->cuid || current->euid == ipcp->uid) { - freeary (id); + freeary(id); return 0; } return -EPERM; case SETALL: /* arg is a pointer to an array of ushort */ array = arg.array; - if ((i = verify_area (VERIFY_READ, array, nsems*sizeof(ushort)))) + if ((i = verify_area(VERIFY_READ, array, nsems * sizeof (ushort)))) return i; - memcpy_fromfs (sem_io, array, nsems*sizeof(ushort)); + memcpy_fromfs(sem_io, array, nsems * sizeof (ushort)); for (i = 0; i < nsems; i++) if (sem_io[i] > SEMVMX) return -ERANGE; break; case IPC_STAT: buf = arg.buf; - if ((i = verify_area (VERIFY_WRITE, buf, sizeof(*buf)))) + if ((i = verify_area(VERIFY_WRITE, buf, sizeof (*buf)))) return i; break; case IPC_SET: buf = arg.buf; - if ((i = verify_area (VERIFY_READ, buf, sizeof (*buf)))) + if ((i = verify_area(VERIFY_READ, buf, sizeof (*buf)))) return i; - memcpy_fromfs (&tbuf, buf, sizeof (*buf)); + memcpy_fromfs(&tbuf, buf, sizeof (*buf)); break; } @@ -499,18 +499,19 @@ switch (cmd) { case GETALL: - if (ipcperms (ipcp, S_IRUGO)) + if (ipcperms(ipcp, S_IRUGO)) return -EACCES; for (i = 0; i < sma->sem_nsems; i++) sem_io[i] = sma->sem_base[i].semval; - memcpy_tofs (array, sem_io, nsems*sizeof(ushort)); + memcpy_tofs(array, sem_io, nsems * sizeof (ushort)); break; case SETVAL: - if (ipcperms (ipcp, S_IWUGO)) + if (ipcperms(ipcp, S_IWUGO)) return -EACCES; for (un = sma->undo; un; un = un->id_next) un->semadj[semnum] = 0; curr->semval = val; + curr->sempid = current->pid; sma->sem_ctime = CURRENT_TIME; /* maybe some queued-up processes were waiting for this */ update_queue(sma); @@ -526,16 +527,16 @@ } return -EPERM; case IPC_STAT: - if (ipcperms (ipcp, S_IRUGO)) + if (ipcperms(ipcp, S_IRUGO)) return -EACCES; tbuf.sem_perm = sma->sem_perm; tbuf.sem_otime = sma->sem_otime; tbuf.sem_ctime = sma->sem_ctime; tbuf.sem_nsems = sma->sem_nsems; - memcpy_tofs (buf, &tbuf, sizeof(*buf)); + memcpy_tofs(buf, &tbuf, sizeof (*buf)); break; case SETALL: - if (ipcperms (ipcp, S_IWUGO)) + if (ipcperms(ipcp, S_IWUGO)) return -EACCES; for (i = 0; i < nsems; i++) sma->sem_base[i].semval = sem_io[i]; @@ -552,7 +553,7 @@ return 0; } -asmlinkage int sys_semop (int semid, struct sembuf *tsops, unsigned nsops) +asmlinkage int sys_semop(int semid, struct sembuf *tsops, unsigned nsops) { int i, id, size, error; struct semid_ds *sma; @@ -566,9 +567,9 @@ return -E2BIG; if (!tsops) return -EFAULT; - if ((i = verify_area (VERIFY_READ, tsops, nsops * sizeof(*tsops)))) + if ((i = verify_area(VERIFY_READ, tsops, nsops * sizeof (*tsops)))) return i; - memcpy_fromfs (sops, tsops, nsops * sizeof(*tsops)); + memcpy_fromfs(sops, tsops, nsops * sizeof (*tsops)); id = (unsigned int) semid % SEMMNI; if ((sma = semary[id]) == IPC_UNUSED || sma == IPC_NOID) return -EINVAL; @@ -596,7 +597,7 @@ if (un->semid == semid) break; if (!un) { - size = sizeof(struct sem_undo) + sizeof(short)*sma->sem_nsems; + size = sizeof (struct sem_undo) + sizeof (short) * sma->sem_nsems; un = (struct sem_undo *) kmalloc(size, GFP_ATOMIC); if (!un) return -ENOMEM; @@ -658,7 +659,7 @@ * The current implementation does not do so. The POSIX standard * and SVID should be consulted to determine what behavior is mandated. */ -void sem_exit (void) +void sem_exit(void) { struct sem_queue *q; struct sem_undo *u, *un = NULL, **up, **unp; @@ -670,7 +671,7 @@ */ if ((q = current->semsleeping)) { if (q->prev) - remove_from_queue(q->sma,q); + remove_from_queue(q->sma, q); current->semsleeping = NULL; } @@ -687,7 +688,7 @@ if (u == un) goto found; } - printk ("sem_exit undo list error id=%d\n", u->semid); + printk("sem_exit undo list error id=%d\n", u->semid); break; found: *unp = un->id_next; diff -urN linux-2.0.40-rc4/kernel/signal.c linux-2.0.40-rc5/kernel/signal.c --- linux-2.0.40-rc4/kernel/signal.c Tue Jul 2 09:08:43 1996 +++ linux-2.0.40-rc5/kernel/signal.c Sat Jun 8 08:50:32 2002 @@ -32,7 +32,7 @@ int error; if (set) { - error = verify_area(VERIFY_READ, set, sizeof(sigset_t)); + error = verify_area(VERIFY_READ, set, sizeof (sigset_t)); if (error) return error; new_set = get_user(set) & _BLOCKABLE; @@ -51,7 +51,7 @@ } } if (oset) { - error = verify_area(VERIFY_WRITE, oset, sizeof(sigset_t)); + error = verify_area(VERIFY_WRITE, oset, sizeof (sigset_t)); if (error) return error; put_user(old_set, oset); @@ -81,7 +81,7 @@ { int error; /* fill in "set" with signals pending but blocked. */ - error = verify_area(VERIFY_WRITE, set, sizeof(sigset_t)); + error = verify_area(VERIFY_WRITE, set, sizeof (sigset_t)); if (!error) put_user(current->blocked & current->signal, set); return error; @@ -112,11 +112,12 @@ return; } if (p->sa_handler == SIG_DFL) { - if (signum != SIGCONT && signum != SIGCHLD && signum != SIGWINCH) + if (signum != SIGCONT && signum != SIGCHLD && + signum != SIGURG && signum != SIGWINCH) return; current->signal &= ~_S(signum); return; - } + } } #ifndef __alpha__ @@ -128,16 +129,16 @@ int err; struct sigaction tmp; - if (signum<1 || signum>32) + if (signum < 1 || signum > 32) return -EINVAL; - if (signum==SIGKILL || signum==SIGSTOP) + if (signum == SIGKILL || signum == SIGSTOP) return -EINVAL; if (handler != SIG_DFL && handler != SIG_IGN) { err = verify_area(VERIFY_READ, handler, 1); if (err) return err; } - memset(&tmp, 0, sizeof(tmp)); + memset(&tmp, 0, sizeof (tmp)); tmp.sa_handler = handler; tmp.sa_flags = SA_ONESHOT | SA_NOMASK; handler = current->sig->action[signum-1].sa_handler; @@ -152,16 +153,16 @@ { struct sigaction new_sa, *p; - if (signum<1 || signum>32) + if (signum < 1 || signum > 32) return -EINVAL; p = signum - 1 + current->sig->action; if (action) { - int err = verify_area(VERIFY_READ, action, sizeof(*action)); + int err = verify_area(VERIFY_READ, action, sizeof (*action)); if (err) return err; - if (signum==SIGKILL || signum==SIGSTOP) + if (signum == SIGKILL || signum == SIGSTOP) return -EINVAL; - memcpy_fromfs(&new_sa, action, sizeof(struct sigaction)); + memcpy_fromfs(&new_sa, action, sizeof (struct sigaction)); if (new_sa.sa_handler != SIG_DFL && new_sa.sa_handler != SIG_IGN) { err = verify_area(VERIFY_READ, new_sa.sa_handler, 1); if (err) @@ -169,10 +170,10 @@ } } if (oldaction) { - int err = verify_area(VERIFY_WRITE, oldaction, sizeof(*oldaction)); + int err = verify_area(VERIFY_WRITE, oldaction, sizeof (*oldaction)); if (err) return err; - memcpy_tofs(oldaction, p, sizeof(struct sigaction)); + memcpy_tofs(oldaction, p, sizeof (struct sigaction)); } if (action) { *p = new_sa;