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/block/xpram.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/s390/block/xpram.c')
| -rw-r--r-- | drivers/s390/block/xpram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index d428c909b8a0..bf3a67c3cc5e 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c | |||
| @@ -160,7 +160,7 @@ static int xpram_page_in (unsigned long page_addr, unsigned int xpage_index) | |||
| 160 | "0: ipm %0\n" | 160 | "0: ipm %0\n" |
| 161 | " srl %0,28\n" | 161 | " srl %0,28\n" |
| 162 | "1:\n" | 162 | "1:\n" |
| 163 | #ifndef CONFIG_ARCH_S390X | 163 | #ifndef CONFIG_64BIT |
| 164 | ".section __ex_table,\"a\"\n" | 164 | ".section __ex_table,\"a\"\n" |
| 165 | " .align 4\n" | 165 | " .align 4\n" |
| 166 | " .long 0b,1b\n" | 166 | " .long 0b,1b\n" |
| @@ -208,7 +208,7 @@ static long xpram_page_out (unsigned long page_addr, unsigned int xpage_index) | |||
| 208 | "0: ipm %0\n" | 208 | "0: ipm %0\n" |
| 209 | " srl %0,28\n" | 209 | " srl %0,28\n" |
| 210 | "1:\n" | 210 | "1:\n" |
| 211 | #ifndef CONFIG_ARCH_S390X | 211 | #ifndef CONFIG_64BIT |
| 212 | ".section __ex_table,\"a\"\n" | 212 | ".section __ex_table,\"a\"\n" |
| 213 | " .align 4\n" | 213 | " .align 4\n" |
| 214 | " .long 0b,1b\n" | 214 | " .long 0b,1b\n" |