| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 8 Sep 2015 11:24:33 +0200 From: Paolo Bonzini <pbonzini@...hat.com> To: Wanpeng Li <wanpeng.li@...mail.com>, Stephen Rothwell <sfr@...b.auug.org.au>, Marcelo Tosatti <mtosatti@...hat.com>, Gleb Natapov <gleb@...nel.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: build failure after merge of the kvm tree On 08/09/2015 04:10, Wanpeng Li wrote: > > I miss place the trace codes under CONFIG_KVM_ASYNC_PF, the patch in the > attachment rewrite the commit and fix it. Sorry for that. Thanks. I cannot rewind kvm/next, so I committed just the incremental change: diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h index 0d1bc478833b..d6f83222a6a1 100644 --- a/include/trace/events/kvm.h +++ b/include/trace/events/kvm.h @@ -356,6 +356,8 @@ TRACE_EVENT( __entry->address) ); +#endif + TRACE_EVENT(kvm_halt_poll_ns, TP_PROTO(bool grow, unsigned int vcpu_id, int new, int old), TP_ARGS(grow, vcpu_id, new, old), @@ -386,8 +388,6 @@ TRACE_EVENT(kvm_halt_poll_ns, #define trace_kvm_halt_poll_ns_shrink(vcpu_id, new, old) \ trace_kvm_halt_poll_ns(false, vcpu_id, new, old) -#endif - #endif /* _TRACE_KVM_MAIN_H */ /* This part must be outside protection */ Paolo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists