# HG changeset patch
# User dietmar.hahn@xxxxxxxxxxxxxxxxxxx
# Node ID 451967deefdc46254c2b3af7d0f8e00284ab29b2
# Parent  fcdd56b88acdc34a392a6807fcaa6005fedf6d82
Clean up unused pkrs[] handling.

Signed-off-by: Dietmar Hahn <dietmar.hahn@xxxxxxxxxxxxxxxxxxx>

diff -r fcdd56b88acd -r 451967deefdc xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c	Thu Jul 19 20:02:04 2007 -0600
+++ b/xen/arch/ia64/xen/vcpu.c	Tue Jul 24 09:38:20 2007 +0200
@@ -2057,28 +2057,14 @@ IA64FAULT vcpu_get_rr(VCPU * vcpu, u64 r
 
 IA64FAULT vcpu_get_pkr(VCPU * vcpu, u64 reg, u64 * pval)
 {
-#ifndef PKR_USE_FIXED
 	printk("vcpu_get_pkr: called, not implemented yet\n");
 	return IA64_ILLOP_FAULT;
-#else
-	u64 val = (u64) ia64_get_pkr(reg);
-	*pval = val;
-	return IA64_NO_FAULT;
-#endif
 }
 
 IA64FAULT vcpu_set_pkr(VCPU * vcpu, u64 reg, u64 val)
 {
-#ifndef PKR_USE_FIXED
 	printk("vcpu_set_pkr: called, not implemented yet\n");
 	return IA64_ILLOP_FAULT;
-#else
-//      if (reg >= NPKRS)
-//		return IA64_ILLOP_FAULT;
-	vcpu->pkrs[reg] = val;
-	ia64_set_pkr(reg, val);
-	return IA64_NO_FAULT;
-#endif
 }
 
 /**************************************************************************
diff -r fcdd56b88acd -r 451967deefdc xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h	Thu Jul 19 20:02:04 2007 -0600
+++ b/xen/include/public/arch-ia64.h	Tue Jul 24 09:38:20 2007 +0200
@@ -236,8 +236,7 @@ struct mapped_regs {
             int banknum; // 0 or 1, which virtual register bank is active
             unsigned long rrs[8]; // region registers
             unsigned long krs[8]; // kernel registers
-            unsigned long pkrs[8]; // protection key registers
-            unsigned long tmp[8]; // temp registers (e.g. for hyperprivops)
+            unsigned long tmp[16]; // temp registers (e.g. for hyperprivops)
         };
     };
 };