From f95416e43e63b6accd41b4057113ee23523c1644 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Mon, 18 Aug 2008 17:15:31 -0500 Subject: [PATCH] --- yaml --- r: 109087 b: refs/heads/master c: 532a6086e35fa3b5761e68af36d4e42a550eba15 h: refs/heads/master i: 109085: 980b45557fd696fb596349fee2ffdcc88339661b 109083: 8e75153f4ddd30dbe420534eacadccc75999e46a 109079: 6207e57d76cd15e3028ecdaf1c29140e8c8f16c8 109071: 9466fd71f5202b997231280f7daf6ea002794f89 109055: d9ee509183f6070b7f9d39b764c18684a3c160fb v: v3 --- [refs] | 2 +- trunk/drivers/virtio/virtio_balloon.c | 2 +- trunk/kernel/module.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3fe12ddd43d9..6121c1a70f3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffb4ba76a25ab6c9deeec33e4f58395586ca747c +refs/heads/master: 532a6086e35fa3b5761e68af36d4e42a550eba15 diff --git a/trunk/drivers/virtio/virtio_balloon.c b/trunk/drivers/virtio/virtio_balloon.c index bfef604160d1..62eab43152d2 100644 --- a/trunk/drivers/virtio/virtio_balloon.c +++ b/trunk/drivers/virtio/virtio_balloon.c @@ -158,7 +158,7 @@ static inline s64 towards_target(struct virtio_balloon *vb) vb->vdev->config->get(vb->vdev, offsetof(struct virtio_balloon_config, num_pages), &v, sizeof(v)); - return v - vb->num_pages; + return (s64)v - vb->num_pages; } static void update_balloon_size(struct virtio_balloon *vb) diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c index 9db11911e04b..08864d257eb0 100644 --- a/trunk/kernel/module.c +++ b/trunk/kernel/module.c @@ -1799,7 +1799,7 @@ static void *module_alloc_update_bounds(unsigned long size) /* Allocate and load the module: note that size of section 0 is always zero, and we rely on this for optional sections. */ -static noinline struct module *load_module(void __user *umod, +static struct module *load_module(void __user *umod, unsigned long len, const char __user *uargs) {