From: Andrew Morton <akpm@linux-foundation.org>

Cc: Paul Jackson <pj@sgi.com>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/cgroup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/cgroup.c~cgroup-simplify-space-stripping-fix kernel/cgroup.c
--- a/kernel/cgroup.c~cgroup-simplify-space-stripping-fix
+++ a/kernel/cgroup.c
@@ -1349,7 +1349,7 @@ static ssize_t cgroup_common_file_write(
 			clear_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags);
 		break;
 	case FILE_RELEASE_AGENT:
-		BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX);
+		BUILD_BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX);
 		strcpy(cgrp->root->release_agent_path, buffer);
 		break;
 	default:
_