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 /drivers/s390/sysinfo.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/s390/sysinfo.c')
| -rw-r--r-- | drivers/s390/sysinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/sysinfo.c b/drivers/s390/sysinfo.c index 87c2db1bd4f5..66da840c9316 100644 --- a/drivers/s390/sysinfo.c +++ b/drivers/s390/sysinfo.c | |||
| @@ -106,7 +106,7 @@ static inline int stsi (void *sysinfo, | |||
| 106 | { | 106 | { |
| 107 | int cc, retv; | 107 | int cc, retv; |
| 108 | 108 | ||
| 109 | #ifndef CONFIG_ARCH_S390X | 109 | #ifndef CONFIG_64BIT |
| 110 | __asm__ __volatile__ ( "lr\t0,%2\n" | 110 | __asm__ __volatile__ ( "lr\t0,%2\n" |
| 111 | "\tlr\t1,%3\n" | 111 | "\tlr\t1,%3\n" |
| 112 | "\tstsi\t0(%4)\n" | 112 | "\tstsi\t0(%4)\n" |