diff options
Diffstat (limited to 'drivers/lguest/lguest.c')
-rw-r--r-- | drivers/lguest/lguest.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/lguest/lguest.c b/drivers/lguest/lguest.c index 524beea7fb1..6e135ac0834 100644 --- a/drivers/lguest/lguest.c +++ b/drivers/lguest/lguest.c | |||
@@ -936,23 +936,24 @@ static const struct lguest_insns | |||
936 | /* Now our patch routine is fairly simple (based on the native one in | 936 | /* Now our patch routine is fairly simple (based on the native one in |
937 | * paravirt.c). If we have a replacement, we copy it in and return how much of | 937 | * paravirt.c). If we have a replacement, we copy it in and return how much of |
938 | * the available space we used. */ | 938 | * the available space we used. */ |
939 | static unsigned lguest_patch(u8 type, u16 clobber, void *insns, unsigned len) | 939 | static unsigned lguest_patch(u8 type, u16 clobber, void *ibuf, |
940 | unsigned long addr, unsigned len) | ||
940 | { | 941 | { |
941 | unsigned int insn_len; | 942 | unsigned int insn_len; |
942 | 943 | ||
943 | /* Don't do anything special if we don't have a replacement */ | 944 | /* Don't do anything special if we don't have a replacement */ |
944 | if (type >= ARRAY_SIZE(lguest_insns) || !lguest_insns[type].start) | 945 | if (type >= ARRAY_SIZE(lguest_insns) || !lguest_insns[type].start) |
945 | return paravirt_patch_default(type, clobber, insns, len); | 946 | return paravirt_patch_default(type, clobber, ibuf, addr, len); |
946 | 947 | ||
947 | insn_len = lguest_insns[type].end - lguest_insns[type].start; | 948 | insn_len = lguest_insns[type].end - lguest_insns[type].start; |
948 | 949 | ||
949 | /* Similarly if we can't fit replacement (shouldn't happen, but let's | 950 | /* Similarly if we can't fit replacement (shouldn't happen, but let's |
950 | * be thorough). */ | 951 | * be thorough). */ |
951 | if (len < insn_len) | 952 | if (len < insn_len) |
952 | return paravirt_patch_default(type, clobber, insns, len); | 953 | return paravirt_patch_default(type, clobber, ibuf, addr, len); |
953 | 954 | ||
954 | /* Copy in our instructions. */ | 955 | /* Copy in our instructions. */ |
955 | memcpy(insns, lguest_insns[type].start, insn_len); | 956 | memcpy(ibuf, lguest_insns[type].start, insn_len); |
956 | return insn_len; | 957 | return insn_len; |
957 | } | 958 | } |
958 | 959 | ||