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/reipl_diag.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/s390/kernel/reipl_diag.c')
| -rw-r--r-- | arch/s390/kernel/reipl_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/reipl_diag.c b/arch/s390/kernel/reipl_diag.c index 83cb42bc0b76..1f33951ba439 100644 --- a/arch/s390/kernel/reipl_diag.c +++ b/arch/s390/kernel/reipl_diag.c | |||
| @@ -26,7 +26,7 @@ void reipl_diag(void) | |||
| 26 | " st %%r4,%0\n" | 26 | " st %%r4,%0\n" |
| 27 | " st %%r5,%1\n" | 27 | " st %%r5,%1\n" |
| 28 | ".section __ex_table,\"a\"\n" | 28 | ".section __ex_table,\"a\"\n" |
| 29 | #ifdef __s390x__ | 29 | #ifdef CONFIG_64BIT |
| 30 | " .align 8\n" | 30 | " .align 8\n" |
| 31 | " .quad 0b, 0b\n" | 31 | " .quad 0b, 0b\n" |
| 32 | #else | 32 | #else |