diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-05 10:22:45 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-05 10:22:45 -0400 |
| commit | 593d0a3e9f813db910dc50574532914db21d09ff (patch) | |
| tree | 12d8413ee57b4383ca8c906996ffe02be6d377a5 /arch/s390/kernel/reipl.S | |
| parent | 50e900417b8096939d12a46848f965e27a905e36 (diff) | |
| parent | 4cb38750d49010ae72e718d46605ac9ba5a851b4 (diff) | |
Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus-3.6
* commit '4cb38750d49010ae72e718d46605ac9ba5a851b4': (6849 commits)
bcma: fix invalid PMU chip control masks
[libata] pata_cmd64x: whitespace cleanup
libata-acpi: fix up for acpi_pm_device_sleep_state API
sata_dwc_460ex: device tree may specify dma_channel
ahci, trivial: fixed coding style issues related to braces
ahci_platform: add hibernation callbacks
libata-eh.c: local functions should not be exposed globally
libata-transport.c: local functions should not be exposed globally
sata_dwc_460ex: support hardreset
ata: use module_pci_driver
drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
[libata] Prevent interface errors with Seagate FreeAgent GoFlex
drivers/acpi/glue: revert accidental license-related 6b66d95895c bits
libata-acpi: add missing inlines in libata.h
i2c-omap: Add support for I2C_M_STOP message flag
i2c: Fall back to emulated SMBus if the operation isn't supported natively
i2c: Add SCCB support
i2c-tiny-usb: Add support for the Robofuzz OSIF USB/I2C converter
...
Diffstat (limited to 'arch/s390/kernel/reipl.S')
| -rw-r--r-- | arch/s390/kernel/reipl.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/s390/kernel/reipl.S b/arch/s390/kernel/reipl.S index ad67c214be04..dd8016b0477e 100644 --- a/arch/s390/kernel/reipl.S +++ b/arch/s390/kernel/reipl.S | |||
| @@ -1,13 +1,12 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/s390/kernel/reipl.S | ||
| 3 | * | ||
| 4 | * S390 version | 2 | * S390 version |
| 5 | * Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation | 3 | * Copyright IBM Corp. 2000 |
| 6 | * Author(s): Holger Smolinski (Holger.Smolinski@de.ibm.com) | 4 | * Author(s): Holger Smolinski (Holger.Smolinski@de.ibm.com) |
| 7 | */ | 5 | */ |
| 8 | 6 | ||
| 9 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
| 10 | #include <asm/asm-offsets.h> | 8 | #include <asm/asm-offsets.h> |
| 9 | #include <asm/sigp.h> | ||
| 11 | 10 | ||
| 12 | # | 11 | # |
| 13 | # store_status: Empty implementation until kdump is supported on 31 bit | 12 | # store_status: Empty implementation until kdump is supported on 31 bit |
| @@ -60,7 +59,7 @@ ENTRY(do_reipl_asm) | |||
| 60 | bas %r14,.Ldisab-.Lpg0(%r13) | 59 | bas %r14,.Ldisab-.Lpg0(%r13) |
| 61 | .L003: st %r1,__LC_SUBCHANNEL_ID | 60 | .L003: st %r1,__LC_SUBCHANNEL_ID |
| 62 | lpsw 0 | 61 | lpsw 0 |
| 63 | sigp 0,0,0(6) | 62 | sigp 0,0,SIGP_RESTART |
| 64 | .Ldisab: st %r14,.Ldispsw+4-.Lpg0(%r13) | 63 | .Ldisab: st %r14,.Ldispsw+4-.Lpg0(%r13) |
| 65 | lpsw .Ldispsw-.Lpg0(%r13) | 64 | lpsw .Ldispsw-.Lpg0(%r13) |
| 66 | .align 8 | 65 | .align 8 |