diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /arch/s390 | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/config.in | 8 | ||||
| -rw-r--r-- | arch/s390/defconfig | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/traps.c | 3 |
3 files changed, 2 insertions, 10 deletions
diff --git a/arch/s390/config.in b/arch/s390/config.in index 5ffd230a0..9e946365f 100644 --- a/arch/s390/config.in +++ b/arch/s390/config.in @@ -1,6 +1,6 @@ - +# # For a description of the syntax of this configuration file, -# see the Configure script. +# see Documentation/kbuild/config-language.txt. # define_bool CONFIG_UID16 y @@ -63,10 +63,6 @@ mainmenu_option next_comment comment 'Kernel hacking' #bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC -bool 'Kernel profiling support' CONFIG_PROFILE -if [ "$CONFIG_PROFILE" = "y" ]; then - int ' Profile shift count' CONFIG_PROFILE_SHIFT 2 -fi if [ "$CONFIG_CTC" = "y" ]; then bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG fi diff --git a/arch/s390/defconfig b/arch/s390/defconfig index aa0440919..459d51ebb 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig @@ -174,5 +174,4 @@ CONFIG_IBM_PARTITION=y # # Kernel hacking # -# CONFIG_PROFILE is not set # CONFIG_REMOTE_DEBUG is not set diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c index b207d78aa..71fbe4665 100644 --- a/arch/s390/kernel/traps.c +++ b/arch/s390/kernel/traps.c @@ -62,9 +62,6 @@ asmlinkage void name(struct pt_regs * regs, long error_code) \ force_sig(signr, tsk); \ } - -void page_exception(void); - /* TODO: define these as 'pgm_check_handler_t xxx;' asmlinkage void divide_error(void); asmlinkage void debug(void); |