git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
machine_kexec.c
diff --git
a/arch/s390/kernel/machine_kexec.c
b/arch/s390/kernel/machine_kexec.c
index
f0ed5c6
..
60b1ea9
100644
(file)
--- a/
arch/s390/kernel/machine_kexec.c
+++ b/
arch/s390/kernel/machine_kexec.c
@@
-12,22
+12,23
@@
* on the S390 architecture.
*/
* on the S390 architecture.
*/
-#include <asm/cio.h>
-#include <asm/setup.h>
#include <linux/device.h>
#include <linux/mm.h>
#include <linux/kexec.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/mm.h>
#include <linux/kexec.h>
#include <linux/delay.h>
+#include <asm/cio.h>
+#include <asm/setup.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
#include <asm/system.h>
+#include <asm/smp.h>
static void kexec_halt_all_cpus(void *);
typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long);
static void kexec_halt_all_cpus(void *);
typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long);
-
const extern
unsigned char relocate_kernel[];
-
const extern
unsigned long long relocate_kernel_len;
+
extern const
unsigned char relocate_kernel[];
+
extern const
unsigned long long relocate_kernel_len;
int
machine_kexec_prepare(struct kimage *image)
int
machine_kexec_prepare(struct kimage *image)
@@
-62,6
+63,7
@@
NORET_TYPE void
machine_kexec(struct kimage *image)
{
clear_all_subchannels();
machine_kexec(struct kimage *image)
{
clear_all_subchannels();
+ cio_reset_channel_paths();
/* Disable lowcore protection */
ctl_clear_bit(0,28);
/* Disable lowcore protection */
ctl_clear_bit(0,28);