diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /arch/s390/kernel/head.S | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/s390/kernel/head.S')
| -rw-r--r-- | arch/s390/kernel/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index d31a97c89f68..ea88d066bf04 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <asm/thread_info.h> | 30 | #include <asm/thread_info.h> |
| 31 | #include <asm/page.h> | 31 | #include <asm/page.h> |
| 32 | 32 | ||
| 33 | #ifdef CONFIG_ARCH_S390X | 33 | #ifdef CONFIG_64BIT |
| 34 | #define ARCH_OFFSET 4 | 34 | #define ARCH_OFFSET 4 |
| 35 | #else | 35 | #else |
| 36 | #define ARCH_OFFSET 0 | 36 | #define ARCH_OFFSET 0 |
| @@ -539,7 +539,7 @@ ipl_devno: | |||
| 539 | .word 0 | 539 | .word 0 |
| 540 | .endm | 540 | .endm |
| 541 | 541 | ||
| 542 | #ifdef CONFIG_ARCH_S390X | 542 | #ifdef CONFIG_64BIT |
| 543 | #include "head64.S" | 543 | #include "head64.S" |
| 544 | #else | 544 | #else |
| 545 | #include "head31.S" | 545 | #include "head31.S" |