git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
head.S
diff --git
a/arch/ia64/kernel/head.S
b/arch/ia64/kernel/head.S
index
f1778a8
..
dded6f2
100644
(file)
--- a/
arch/ia64/kernel/head.S
+++ b/
arch/ia64/kernel/head.S
@@
-19,7
+19,6
@@
* Support for CPU Hotplug
*/
* Support for CPU Hotplug
*/
-#include <linux/config.h>
#include <asm/asmmacro.h>
#include <asm/fpu.h>
#include <asm/asmmacro.h>
#include <asm/fpu.h>
@@
-198,6
+197,11
@@
start_ap:
;;
srlz.i
;;
;;
srlz.i
;;
+ {
+ flushrs // must be first insn in group
+ srlz.i
+ }
+ ;;
/*
* Save the region registers, predicate before they get clobbered
*/
/*
* Save the region registers, predicate before they get clobbered
*/
@@
-363,6
+367,12
@@
start_ap:
;;
(isBP) st8 [r2]=r28 // save the address of the boot param area passed by the bootloader
;;
(isBP) st8 [r2]=r28 // save the address of the boot param area passed by the bootloader
+#ifdef CONFIG_XEN
+ // Note: isBP is used by the subprogram.
+ br.call.sptk.many rp=early_xen_setup
+ ;;
+#endif
+
#ifdef CONFIG_SMP
(isAP) br.call.sptk.many rp=start_secondary
.ret0:
#ifdef CONFIG_SMP
(isAP) br.call.sptk.many rp=start_secondary
.ret0:
@@
-854,7
+864,6
@@
END(__ia64_init_fpu)
*/
GLOBAL_ENTRY(ia64_switch_mode_phys)
{
*/
GLOBAL_ENTRY(ia64_switch_mode_phys)
{
- alloc r2=ar.pfs,0,0,0,0
rsm psr.i | psr.ic // disable interrupts and interrupt collection
mov r15=ip
}
rsm psr.i | psr.ic // disable interrupts and interrupt collection
mov r15=ip
}
@@
-903,7
+912,6
@@
END(ia64_switch_mode_phys)
*/
GLOBAL_ENTRY(ia64_switch_mode_virt)
{
*/
GLOBAL_ENTRY(ia64_switch_mode_virt)
{
- alloc r2=ar.pfs,0,0,0,0
rsm psr.i | psr.ic // disable interrupts and interrupt collection
mov r15=ip
}
rsm psr.i | psr.ic // disable interrupts and interrupt collection
mov r15=ip
}