diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 18:04:47 +0400 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 18:41:49 +0400 |
| commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
| tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /include/linux/hyperv.h | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa (diff) | |
| parent | 34ec4de42be5006abdd8d0c08b306ffaa64d0d5d (diff) | |
| download | linux-13acfd5715144518232d8e29acf7c76ef1b089d8.tar.xz | |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts:
arch/arm/kvm/reset.c
Diffstat (limited to 'include/linux/hyperv.h')
| -rw-r--r-- | include/linux/hyperv.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index a3b8b2e2d244..d98503bde7e9 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -30,10 +30,13 @@ /* * Framework version for util services. */ +#define UTIL_FW_MINOR 0 + +#define UTIL_WS2K8_FW_MAJOR 1 +#define UTIL_WS2K8_FW_VERSION (UTIL_WS2K8_FW_MAJOR << 16 | UTIL_FW_MINOR) #define UTIL_FW_MAJOR 3 -#define UTIL_FW_MINOR 0 -#define UTIL_FW_MAJOR_MINOR (UTIL_FW_MAJOR << 16 | UTIL_FW_MINOR) +#define UTIL_FW_VERSION (UTIL_FW_MAJOR << 16 | UTIL_FW_MINOR) /* |