| Message ID | 1232744383-998-1-git-send-email-ehabkost@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
Eduardo Habkost wrote: > Make sure we get the MSR_* defines from asm/svm.h before checking > if they are defined. > > This fixes the following warning: > > In file included from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/kvm_svm.h:10, > from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/svm.c:58: > /home/ehabkost/code/kvm/kvm-userspace/kernel/include/asm/svm.h:219:1: warning: "MSR_VM_HSAVE_PA" redefined > > > This fix applies only to the maint/2.6.29 branch, as on the master > branch the MSR_* defines went to a different header file. > I fixed this on master with d3898e3aaef791fac527d4cf4fc5b898887abc38. Any reason not to apply the same fix to maint?
On Wed, Feb 04, 2009 at 04:27:47PM +0200, Avi Kivity wrote: > Eduardo Habkost wrote: >> Make sure we get the MSR_* defines from asm/svm.h before checking >> if they are defined. >> >> This fixes the following warning: >> >> In file included from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/kvm_svm.h:10, >> from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/svm.c:58: >> /home/ehabkost/code/kvm/kvm-userspace/kernel/include/asm/svm.h:219:1: warning: "MSR_VM_HSAVE_PA" redefined >> >> >> This fix applies only to the maint/2.6.29 branch, as on the master >> branch the MSR_* defines went to a different header file. >> > > I fixed this on master with d3898e3aaef791fac527d4cf4fc5b898887abc38. > Any reason not to apply the same fix to maint? That's a different problem. The warning I'm seeing doesn't involve msr-index.h (either the real one or the compat one). My fix applies only to maint/2.6.29 because on master the MSR_* defines were moved to asm/msr-index.h (by dd29b0ddd904e19b7744055f1ee386ad9a8cf13d), and asm/msr-index.h is already (indirectly) included by external-module-compat.h before the #ifdefs. On maint/2.6.29, the #defines are still on asm/svm.h. Cherry-picking dd29b0ddd904e19b7744055f1ee386ad9a8cf13d (moves the defines to msr-index.h) on kvm.git maint/2.6.29 and d3898e3aaef791fac527d4cf4fc5b898887abc38 (the fix needed after the move) on kvm-userspace.git maint/2.6.29 would work, also.
diff --git a/kernel/x86/external-module-compat.h b/kernel/x86/external-module-compat.h index 04352bc..9ba1cc8 100644 --- a/kernel/x86/external-module-compat.h +++ b/kernel/x86/external-module-compat.h @@ -10,6 +10,9 @@ #include <asm/msr.h> +/* for the MSR_VM_* constants that were moved to svm.h */ +#include <asm/svm.h> + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) #ifndef _EFER_SCE
Make sure we get the MSR_* defines from asm/svm.h before checking if they are defined. This fixes the following warning: In file included from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/kvm_svm.h:10, from /home/ehabkost/code/kvm/kvm-userspace/kernel/x86/svm.c:58: /home/ehabkost/code/kvm/kvm-userspace/kernel/include/asm/svm.h:219:1: warning: "MSR_VM_HSAVE_PA" redefined This fix applies only to the maint/2.6.29 branch, as on the master branch the MSR_* defines went to a different header file. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- kernel/x86/external-module-compat.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)