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 /arch/i386 | |
| parent | fea12a7b3f20bc135ab533491411e9ff753c01c8 (diff) | |
Merge with Linux 2.4.0-test5-pre4.
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/defconfig | 4 | ||||
| -rw-r--r-- | arch/i386/kernel/apm.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index b99d0cec3..1055ed5e3 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -481,6 +481,10 @@ CONFIG_PSMOUSE=y CONFIG_DRM=y CONFIG_DRM_TDFX=y # CONFIG_DRM_GAMMA is not set +# CONFIG_DRM_R128 is not set +# CONFIG_DRM_I810 is not set +# CONFIG_DRM_MGA is not set +# CONFIG_AGP is not set CONFIG_PCMCIA_SERIAL=y # diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index b1debd5fe..039ba695c 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -1423,6 +1423,8 @@ static int apm(void *unused) kapmd_running = 1; exit_files(current); /* daemonize doesn't do exit_files */ + current->files = init_task.files; + atomic_inc(¤t->files->count); daemonize(); strcpy(current->comm, "kapmd"); |