From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 11 Aug 2010 09:28:02 +0000 (+0200)
Subject: AppArmor: fix task_setrlimit prototype
X-Git-Tag: v2.6.36-rc2~45^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cb4dc9fc95f89587f57f287b47e091d7806255e;p=pandora-kernel.git

AppArmor: fix task_setrlimit prototype

After rlimits tree was merged we get the following errors:
security/apparmor/lsm.c:663:2: warning: initialization from incompatible pointer type

It is because AppArmor was merged in the meantime, but uses the old
prototype. So fix it by adding struct task_struct as a first parameter
of apparmor_task_setrlimit.

NOTE that this is ONLY a compilation warning fix (and crashes caused
by that). It needs proper handling in AppArmor depending on who is the
'task'.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
---

Reading git-diff-tree failed