ia64/xen-unstable

changeset 15660:32825349924d

[IA64] Clean up unused pkrs[] handling.

Signed-off-by: Dietmar Hahn <dietmar.hahn@fujitsu-siemens.com>
author Alex Williamson <alex.williamson@hp.com>
date Mon Jul 30 16:01:05 2007 -0600 (2007-07-30)
parents 4492a0285bae
children 522a1932111f
files xen/arch/ia64/xen/vcpu.c xen/include/public/arch-ia64.h
line diff
     1.1 --- a/xen/arch/ia64/xen/vcpu.c	Fri Jul 27 08:15:16 2007 -0600
     1.2 +++ b/xen/arch/ia64/xen/vcpu.c	Mon Jul 30 16:01:05 2007 -0600
     1.3 @@ -2057,28 +2057,14 @@ IA64FAULT vcpu_get_rr(VCPU * vcpu, u64 r
     1.4  
     1.5  IA64FAULT vcpu_get_pkr(VCPU * vcpu, u64 reg, u64 * pval)
     1.6  {
     1.7 -#ifndef PKR_USE_FIXED
     1.8  	printk("vcpu_get_pkr: called, not implemented yet\n");
     1.9  	return IA64_ILLOP_FAULT;
    1.10 -#else
    1.11 -	u64 val = (u64) ia64_get_pkr(reg);
    1.12 -	*pval = val;
    1.13 -	return IA64_NO_FAULT;
    1.14 -#endif
    1.15  }
    1.16  
    1.17  IA64FAULT vcpu_set_pkr(VCPU * vcpu, u64 reg, u64 val)
    1.18  {
    1.19 -#ifndef PKR_USE_FIXED
    1.20  	printk("vcpu_set_pkr: called, not implemented yet\n");
    1.21  	return IA64_ILLOP_FAULT;
    1.22 -#else
    1.23 -//      if (reg >= NPKRS)
    1.24 -//		return IA64_ILLOP_FAULT;
    1.25 -	vcpu->pkrs[reg] = val;
    1.26 -	ia64_set_pkr(reg, val);
    1.27 -	return IA64_NO_FAULT;
    1.28 -#endif
    1.29  }
    1.30  
    1.31  /**************************************************************************
     2.1 --- a/xen/include/public/arch-ia64.h	Fri Jul 27 08:15:16 2007 -0600
     2.2 +++ b/xen/include/public/arch-ia64.h	Mon Jul 30 16:01:05 2007 -0600
     2.3 @@ -236,8 +236,7 @@ struct mapped_regs {
     2.4              int banknum; // 0 or 1, which virtual register bank is active
     2.5              unsigned long rrs[8]; // region registers
     2.6              unsigned long krs[8]; // kernel registers
     2.7 -            unsigned long pkrs[8]; // protection key registers
     2.8 -            unsigned long tmp[8]; // temp registers (e.g. for hyperprivops)
     2.9 +            unsigned long tmp[16]; // temp registers (e.g. for hyperprivops)
    2.10          };
    2.11      };
    2.12  };