diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
| commit | f3627cbe9236a062012c836f3b6ee311b43f63f2 (patch) | |
| tree | ae854838b9a73b35bd0f3b8f42e5fb7f9cb1d5a9 /net | |
| parent | fea12a7b3f20bc135ab533491411e9ff753c01c8 (diff) | |
Merge with Linux 2.4.0-test5-pre4.
Diffstat (limited to 'net')
| -rw-r--r-- | net/econet/af_econet.c | 2 | ||||
| -rw-r--r-- | net/khttpd/main.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c index 79ae4d3ca..cb9b3d11e 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c @@ -594,7 +594,7 @@ static int ec_dev_ioctl(struct socket *sock, unsigned int cmd, void *arg) if (edev == NULL) { /* Magic up a new one. */ - edev = kmalloc(GFP_KERNEL, sizeof(struct ec_device)); + edev = kmalloc(sizeof(struct ec_device), GFP_KERNEL); if (edev == NULL) { printk("af_ec: memory squeeze.\n"); dev_put(dev); diff --git a/net/khttpd/main.c b/net/khttpd/main.c index a9568ef0d..5c39c59b9 100644 --- a/net/khttpd/main.c +++ b/net/khttpd/main.c @@ -277,7 +277,7 @@ static int ManagementDaemon(void *unused) while (I<ActualThreads) { atomic_set(&Running[I],1); - (void)kernel_thread(MainDaemon,&(CountBuf[I]),0); + (void)kernel_thread(MainDaemon,&(CountBuf[I]), CLONE_FS | CLONE_FILES | CLONE_SIGHAND); I++; } @@ -294,7 +294,7 @@ static int ManagementDaemon(void *unused) if (atomic_read(&Running[I])==0) { atomic_set(&Running[I],1); - (void)kernel_thread(MainDaemon,&(CountBuf[I]),0); + (void)kernel_thread(MainDaemon,&(CountBuf[I]), CLONE_FS | CLONE_FILES | CLONE_SIGHAND); (void)printk(KERN_CRIT "kHTTPd: Restarting daemon %i \n",I); } I++; @@ -383,7 +383,7 @@ int __init khttpd_init(void) StartSysctl(); - (void)kernel_thread(ManagementDaemon,NULL,0); + (void)kernel_thread(ManagementDaemon,NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND); return 0; } |