---

yaml --- r: 109087 b: refs/heads/master c: 532a608 h: refs/heads/master i: 109085: 980b455 109083: 8e75153 109079: 6207e57 109071: 9466fd7 109055: d9ee509 v: v3
git-mirror · Aug 25, 2008 · f95416e · f95416e
1 parent 5ec578c
commit f95416e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)
 {