From 0b6158cadd5393266a90d280eae8398f4ef6bb99 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Fri, 3 Feb 2006 03:04:23 -0800
Subject: [PATCH] --- yaml --- r: 19654 b: refs/heads/master c:
 fe85a998ca64a067e58ca9240ec54a95994d78ee h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cpuset.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0491b8f5697c..7102de43bd87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778116920e89b91b19d2b488a0d6fe63cf43379c
+refs/heads/master: fe85a998ca64a067e58ca9240ec54a95994d78ee
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index fe2f71f92ae0..ba42b0a76961 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -641,7 +641,7 @@ static void guarantee_online_mems(const struct cpuset *cs, nodemask_t *pmask)
  * task has been modifying its cpuset.
  */
 
-void cpuset_update_task_memory_state()
+void cpuset_update_task_memory_state(void)
 {
 	int my_cpusets_mem_gen;
 	struct task_struct *tsk = current;