diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 6 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/setup.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 5cb58655cd5f..f56a6316e134 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -1230,7 +1230,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) | |||
1230 | p_ctx->cr[2] = (unsigned long)kvm_vmm_info->vmm_ivt; | 1230 | p_ctx->cr[2] = (unsigned long)kvm_vmm_info->vmm_ivt; |
1231 | p_ctx->cr[8] = 0x3c; | 1231 | p_ctx->cr[8] = 0x3c; |
1232 | 1232 | ||
1233 | /*Initilize region register*/ | 1233 | /*Initialize region register*/ |
1234 | p_ctx->rr[0] = 0x30; | 1234 | p_ctx->rr[0] = 0x30; |
1235 | p_ctx->rr[1] = 0x30; | 1235 | p_ctx->rr[1] = 0x30; |
1236 | p_ctx->rr[2] = 0x30; | 1236 | p_ctx->rr[2] = 0x30; |
@@ -1239,7 +1239,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) | |||
1239 | p_ctx->rr[5] = 0x30; | 1239 | p_ctx->rr[5] = 0x30; |
1240 | p_ctx->rr[7] = 0x30; | 1240 | p_ctx->rr[7] = 0x30; |
1241 | 1241 | ||
1242 | /*Initilize branch register 0*/ | 1242 | /*Initialize branch register 0*/ |
1243 | p_ctx->br[0] = *(unsigned long *)kvm_vmm_info->vmm_entry; | 1243 | p_ctx->br[0] = *(unsigned long *)kvm_vmm_info->vmm_entry; |
1244 | 1244 | ||
1245 | vcpu->arch.vmm_rr = kvm->arch.vmm_init_rr; | 1245 | vcpu->arch.vmm_rr = kvm->arch.vmm_init_rr; |
@@ -1700,7 +1700,7 @@ static int kvm_relocate_vmm(struct kvm_vmm_info *vmm_info, | |||
1700 | BUG_ON(!module); | 1700 | BUG_ON(!module); |
1701 | 1701 | ||
1702 | if (!kvm_vmm_base) { | 1702 | if (!kvm_vmm_base) { |
1703 | printk("kvm: kvm area hasn't been initilized yet!!\n"); | 1703 | printk("kvm: kvm area hasn't been initialized yet!!\n"); |
1704 | return -EFAULT; | 1704 | return -EFAULT; |
1705 | } | 1705 | } |
1706 | 1706 | ||
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] = |