aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kvm/kvm-ia64.c6
-rw-r--r--arch/ia64/sn/kernel/setup.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 7f3c0a2e60cd..29afd9a252ff 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1234,7 +1234,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
1234 p_ctx->cr[2] = (unsigned long)kvm_vmm_info->vmm_ivt; 1234 p_ctx->cr[2] = (unsigned long)kvm_vmm_info->vmm_ivt;
1235 p_ctx->cr[8] = 0x3c; 1235 p_ctx->cr[8] = 0x3c;
1236 1236
1237 /*Initilize region register*/ 1237 /*Initialize region register*/
1238 p_ctx->rr[0] = 0x30; 1238 p_ctx->rr[0] = 0x30;
1239 p_ctx->rr[1] = 0x30; 1239 p_ctx->rr[1] = 0x30;
1240 p_ctx->rr[2] = 0x30; 1240 p_ctx->rr[2] = 0x30;
@@ -1243,7 +1243,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
1243 p_ctx->rr[5] = 0x30; 1243 p_ctx->rr[5] = 0x30;
1244 p_ctx->rr[7] = 0x30; 1244 p_ctx->rr[7] = 0x30;
1245 1245
1246 /*Initilize branch register 0*/ 1246 /*Initialize branch register 0*/
1247 p_ctx->br[0] = *(unsigned long *)kvm_vmm_info->vmm_entry; 1247 p_ctx->br[0] = *(unsigned long *)kvm_vmm_info->vmm_entry;
1248 1248
1249 vcpu->arch.vmm_rr = kvm->arch.vmm_init_rr; 1249 vcpu->arch.vmm_rr = kvm->arch.vmm_init_rr;
@@ -1702,7 +1702,7 @@ static int kvm_relocate_vmm(struct kvm_vmm_info *vmm_info,
1702 BUG_ON(!module); 1702 BUG_ON(!module);
1703 1703
1704 if (!kvm_vmm_base) { 1704 if (!kvm_vmm_base) {
1705 printk("kvm: kvm area hasn't been initilized yet!!\n"); 1705 printk("kvm: kvm area hasn't been initialized yet!!\n");
1706 return -EFAULT; 1706 return -EFAULT;
1707 } 1707 }
1708 1708
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index d00dfc180021..dbc4cbecb5ed 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -507,7 +507,7 @@ static void __init sn_init_pdas(char **cmdline_p)
507 cnodeid_t cnode; 507 cnodeid_t cnode;
508 508
509 /* 509 /*
510 * Allocate & initalize the nodepda for each node. 510 * Allocate & initialize the nodepda for each node.
511 */ 511 */
512 for_each_online_node(cnode) { 512 for_each_online_node(cnode) {
513 nodepdaindr[cnode] = 513 nodepdaindr[cnode] =