diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
| commit | 09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch) | |
| tree | 29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /arch/s390/kernel/cpcmd.c | |
| parent | d0d59b98d7a0b3801ce03e695ba885b698a6d122 (diff) | |
| parent | 9c2c38a122cc23d6a09b8004d60a33913683eedf (diff) | |
Merge HEAD from ../from-linus
Diffstat (limited to 'arch/s390/kernel/cpcmd.c')
| -rw-r--r-- | arch/s390/kernel/cpcmd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kernel/cpcmd.c b/arch/s390/kernel/cpcmd.c index 20062145e84e..d47fecb42cc5 100644 --- a/arch/s390/kernel/cpcmd.c +++ b/arch/s390/kernel/cpcmd.c | |||
| @@ -46,9 +46,9 @@ int __cpcmd(const char *cmd, char *response, int rlen, int *response_code) | |||
| 46 | "lra 3,0(%4)\n" | 46 | "lra 3,0(%4)\n" |
| 47 | "lr 5,%5\n" | 47 | "lr 5,%5\n" |
| 48 | "diag 2,4,0x8\n" | 48 | "diag 2,4,0x8\n" |
| 49 | "brc 8, .Litfits\n" | 49 | "brc 8, 1f\n" |
| 50 | "ar 5, %5\n" | 50 | "ar 5, %5\n" |
| 51 | ".Litfits: \n" | 51 | "1: \n" |
| 52 | "lr %0,4\n" | 52 | "lr %0,4\n" |
| 53 | "lr %1,5\n" | 53 | "lr %1,5\n" |
| 54 | : "=d" (return_code), "=d" (return_len) | 54 | : "=d" (return_code), "=d" (return_len) |
| @@ -64,9 +64,9 @@ int __cpcmd(const char *cmd, char *response, int rlen, int *response_code) | |||
| 64 | "sam31\n" | 64 | "sam31\n" |
| 65 | "diag 2,4,0x8\n" | 65 | "diag 2,4,0x8\n" |
| 66 | "sam64\n" | 66 | "sam64\n" |
| 67 | "brc 8, .Litfits\n" | 67 | "brc 8, 1f\n" |
| 68 | "agr 5, %5\n" | 68 | "agr 5, %5\n" |
| 69 | ".Litfits: \n" | 69 | "1: \n" |
| 70 | "lgr %0,4\n" | 70 | "lgr %0,4\n" |
| 71 | "lgr %1,5\n" | 71 | "lgr %1,5\n" |
| 72 | : "=d" (return_code), "=d" (return_len) | 72 | : "=d" (return_code), "=d" (return_len) |