diff options
| author | Martin Schwidefsky <martin.schwidefsky@debitel.net> | 2002-06-17 21:16:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-17 21:16:21 -0700 |
| commit | dcfdb40ccbd2277ca4cf24407bb09f3a19d08b0b (patch) | |
| tree | 40170ca413daad35c1e252f9a6977fab91589c86 /init | |
| parent | dfbb3f53fad5526e39aee39bf66140fc72d99f33 (diff) | |
[PATCH] 2.5.22: common code changes for s/390.
1) Add __s390__ to the list of architectures that use unsigned int as
type for rautofs_wqt_t. __s390__ is defined for both 31-bit and 64-bit
linux for s/390. Both architectures are fine with unsigned int since
sizeof(unsigned int) == sizeof(unsigned long) for 31 bit s/390.
2) Remove early initialization call ccwcache_init(). It doesn't exists
anymore.
3) Remove special case for irq_stat. We moved the irq_stat structure out
of the lowcore.
4) Replace acquire_console_sem with down_trylock & return to avoid an
endless trap loop if console_unblank is called from interrupt context
and the console semaphore is taken.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c index 839dbcf364a0..922ea974aaf9 100644 --- a/init/main.c +++ b/init/main.c @@ -34,7 +34,6 @@ #if defined(CONFIG_ARCH_S390) #include <asm/s390mach.h> -#include <asm/ccwcache.h> #endif #ifdef CONFIG_MTRR @@ -393,9 +392,6 @@ asmlinkage void __init start_kernel(void) buffer_init(); vfs_caches_init(mempages); radix_tree_init(); -#if defined(CONFIG_ARCH_S390) - ccwcache_init(); -#endif signals_init(); #ifdef CONFIG_PROC_FS proc_root_init(); |