Commit df6c6804 authored by Ashok Raj's avatar Ashok Raj Committed by Tony Luck

[IA64] Fix build errors for !HOTPLUG case.

Signed-off-by: default avatarAshok Raj <ashok.raj@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent b8d8b883
...@@ -95,6 +95,10 @@ RestRR: \ ...@@ -95,6 +95,10 @@ RestRR: \
add _idx1=1,_idx1;; \ add _idx1=1,_idx1;; \
br.cloop.sptk.few RestRR br.cloop.sptk.few RestRR
#define SET_AREA_FOR_BOOTING_CPU(reg1, reg2) \
movl reg1=sal_state_for_booting_cpu;; \
ld8 reg2=[reg1];;
/* /*
* Adjust region registers saved before starting to save * Adjust region registers saved before starting to save
* break regs and rest of the states that need to be preserved. * break regs and rest of the states that need to be preserved.
...@@ -150,7 +154,8 @@ RestRR: \ ...@@ -150,7 +154,8 @@ RestRR: \
stf.spill.nta [_reg1]=f31,16;; stf.spill.nta [_reg1]=f31,16;;
#else #else
#define SAL_TO_OS_BOOT_HANDOFF_STATE_SAVE(a1,a2) #define SET_AREA_FOR_BOOTING_CPU(a1, a2)
#define SAL_TO_OS_BOOT_HANDOFF_STATE_SAVE(a1,a2, a3)
#define SAVE_REGION_REGS(_tmp, _r0, _r1, _r2, _r3, _r4, _r5, _r6, _r7) #define SAVE_REGION_REGS(_tmp, _r0, _r1, _r2, _r3, _r4, _r5, _r6, _r7)
#define STORE_REGION_REGS(ptr, _r0, _r1, _r2, _r3, _r4, _r5, _r6, _r7) #define STORE_REGION_REGS(ptr, _r0, _r1, _r2, _r3, _r4, _r5, _r6, _r7)
#endif #endif
...@@ -260,8 +265,7 @@ start_ap: ...@@ -260,8 +265,7 @@ start_ap:
;; ;;
1: // now we are in virtual mode 1: // now we are in virtual mode
movl r2=sal_state_for_booting_cpu;; SET_AREA_FOR_BOOTING_CPU(r2, r16);
ld8 r16=[r2];;
STORE_REGION_REGS(r16, r8,r9,r10,r11,r12,r13,r14,r15); STORE_REGION_REGS(r16, r8,r9,r10,r11,r12,r13,r14,r15);
SAL_TO_OS_BOOT_HANDOFF_STATE_SAVE(r16,r17,r25) SAL_TO_OS_BOOT_HANDOFF_STATE_SAVE(r16,r17,r25)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment