From 880f06ffc24af13bc10b0ac467d634b0daf57f12 Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Wed, 11 Jan 2012 13:37:35 +0000
Subject: [PATCH] --- yaml --- r: 297117 b: refs/heads/master c:
 54f65795c8f6e192540756085d738e66ab0917a0 h: refs/heads/master i:   297115:
 3962ed7d37eff3c2a08fbac7e1c3df1c3cc332ba v: v3

---
 [refs]                                     |  2 +-
 trunk/Documentation/virtual/kvm/ppc-pv.txt | 24 ++--------------------
 trunk/arch/powerpc/include/asm/kvm_para.h  | 10 +++++++++
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index d62bc250af4b..5e29b7433242 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3c5d3c2a49602c370de6d02fdb923bc48cd1abc
+refs/heads/master: 54f65795c8f6e192540756085d738e66ab0917a0
diff --git a/trunk/Documentation/virtual/kvm/ppc-pv.txt b/trunk/Documentation/virtual/kvm/ppc-pv.txt
index 2b7ce190cde4..6e7c37050930 100644
--- a/trunk/Documentation/virtual/kvm/ppc-pv.txt
+++ b/trunk/Documentation/virtual/kvm/ppc-pv.txt
@@ -81,28 +81,8 @@ additional registers to the magic page. If you add fields to the magic page,
 also define a new hypercall feature to indicate that the host can give you more
 registers. Only if the host supports the additional features, make use of them.
 
-The magic page has the following layout as described in
-arch/powerpc/include/asm/kvm_para.h:
-
-struct kvm_vcpu_arch_shared {
-	__u64 scratch1;
-	__u64 scratch2;
-	__u64 scratch3;
-	__u64 critical;		/* Guest may not get interrupts if == r1 */
-	__u64 sprg0;
-	__u64 sprg1;
-	__u64 sprg2;
-	__u64 sprg3;
-	__u64 srr0;
-	__u64 srr1;
-	__u64 dar;
-	__u64 msr;
-	__u32 dsisr;
-	__u32 int_pending;	/* Tells the guest if we have an interrupt */
-};
-
-Additions to the page must only occur at the end. Struct fields are always 32
-or 64 bit aligned, depending on them being 32 or 64 bit wide respectively.
+The magic page layout is described by struct kvm_vcpu_arch_shared
+in arch/powerpc/include/asm/kvm_para.h.
 
 Magic page features
 ===================
diff --git a/trunk/arch/powerpc/include/asm/kvm_para.h b/trunk/arch/powerpc/include/asm/kvm_para.h
index ece70fb36513..7b754e743003 100644
--- a/trunk/arch/powerpc/include/asm/kvm_para.h
+++ b/trunk/arch/powerpc/include/asm/kvm_para.h
@@ -22,6 +22,16 @@
 
 #include <linux/types.h>
 
+/*
+ * Additions to this struct must only occur at the end, and should be
+ * accompanied by a KVM_MAGIC_FEAT flag to advertise that they are present
+ * (albeit not necessarily relevant to the current target hardware platform).
+ *
+ * Struct fields are always 32 or 64 bit aligned, depending on them being 32
+ * or 64 bit wide respectively.
+ *
+ * See Documentation/virtual/kvm/ppc-pv.txt
+ */
 struct kvm_vcpu_arch_shared {
 	__u64 scratch1;
 	__u64 scratch2;