diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-02-28 12:25:22 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-02-28 12:25:22 -0500 |
| commit | 9585da3729e7e27bf22818625c10ac6c64ebb609 (patch) | |
| tree | 8c8d46f7f2cc933fdf75a6a75cf593a63f7b8717 /arch/s390/kernel/machine_kexec.c | |
| parent | 8080d5497146d5d27d9e8e78229d1adc7fe280cf (diff) | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/s390/kernel/machine_kexec.c')
| -rw-r--r-- | arch/s390/kernel/machine_kexec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c index f0ed5c642c74..bad81b5832db 100644 --- a/arch/s390/kernel/machine_kexec.c +++ b/arch/s390/kernel/machine_kexec.c | |||
| @@ -12,15 +12,16 @@ | |||
| 12 | * on the S390 architecture. | 12 | * on the S390 architecture. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <asm/cio.h> | ||
| 16 | #include <asm/setup.h> | ||
| 17 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 18 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 19 | #include <linux/kexec.h> | 17 | #include <linux/kexec.h> |
| 20 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <asm/cio.h> | ||
| 20 | #include <asm/setup.h> | ||
| 21 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
| 22 | #include <asm/pgalloc.h> | 22 | #include <asm/pgalloc.h> |
| 23 | #include <asm/system.h> | 23 | #include <asm/system.h> |
| 24 | #include <asm/smp.h> | ||
| 24 | 25 | ||
| 25 | static void kexec_halt_all_cpus(void *); | 26 | static void kexec_halt_all_cpus(void *); |
| 26 | 27 | ||