From: Jiri Slaby <jslaby@suse.cz>
To: torvalds@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, jirislaby@gmail.com,
nhorman@tuxdriver.com, mingo@elte.hu
Subject: [PATCH 2/3] resource: move kernel function inside __KERNEL__
Date: Mon, 4 Jan 2010 11:48:14 +0100 [thread overview]
Message-ID: <1262602095-17591-2-git-send-email-jslaby@suse.cz> (raw)
In-Reply-To: <4B41C750.9080305@gmail.com>
It is an internal function. Move it inside __KERNEL__ ifdef, along
with task_struct declaration.
Then we get:
--- /usr/include/linux/resource.h 2009-09-14 15:09:29.000000000 +0200
+++ usr/include/linux/resource.h 2010-01-04 11:30:54.000000000 +0100
@@ -3,8 +3,6 @@
#include <linux/time.h>
-struct task_struct;
-
/*
* Resource control/accounting header file for linux
*/
@@ -70,6 +68,5 @@
*/
#include <asm/resource.h>
-int getrusage(struct task_struct *p, int who, struct rusage *ru);
#endif
***********
include/linux/Kbuild is untouched, since unifdef is run even on
headers-y nowadays.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
include/linux/resource.h | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/linux/resource.h b/include/linux/resource.h
index 40fc7e6..f1e914e 100644
--- a/include/linux/resource.h
+++ b/include/linux/resource.h
@@ -3,8 +3,6 @@
#include <linux/time.h>
-struct task_struct;
-
/*
* Resource control/accounting header file for linux
*/
@@ -70,6 +68,12 @@ struct rlimit {
*/
#include <asm/resource.h>
+#ifdef __KERNEL__
+
+struct task_struct;
+
int getrusage(struct task_struct *p, int who, struct rusage __user *ru);
+#endif /* __KERNEL__ */
+
#endif
--
1.6.5.7
next prev parent reply other threads:[~2010-01-04 10:48 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-07 16:52 [PULL] pull request for writable limits for 2.6.33-rc1 Jiri Slaby
2009-12-09 19:25 ` [PULL] pull request for writable limits for 2.6.33-rc0 Jiri Slaby
2009-12-11 11:05 ` [git pull -resend] " Jiri Slaby
2009-12-23 9:40 ` Jiri Slaby
2010-01-02 21:40 ` [PULL] " Jiri Kosina
2010-01-02 21:52 ` Ingo Molnar
2010-01-04 21:59 ` Jiri Kosina
2010-01-04 10:47 ` [PULL] pull request for limits FIXES for 2.6.33-rc Jiri Slaby
2010-01-04 10:48 ` [PATCH 1/3] SECURITY: selinux, fix update_rlimit_cpu parameter Jiri Slaby
2010-01-04 10:48 ` Jiri Slaby [this message]
2010-01-04 10:48 ` [PATCH 3/3] resource: add helpers for fetching rlimits Jiri Slaby
2010-01-05 15:50 ` [PATCH 1/3] SECURITY: selinux, fix update_rlimit_cpu parameter David Howells
2010-03-05 16:53 ` [git pull] pull request for writable limits for 2.6.34-rc0 Jiri Slaby
2010-03-20 19:20 ` Linus Torvalds
2010-03-21 1:45 ` Neil Horman
2010-03-21 6:06 ` Alexey Dobriyan
2010-03-21 18:38 ` Linus Torvalds
2010-03-24 17:02 ` Jiri Slaby
2010-04-14 9:31 ` Jiri Slaby
2010-05-05 12:12 ` Resource limits interface proposal [was: pull request for writable limits] Jiri Slaby
2010-05-05 15:08 ` Linus Torvalds
2010-05-06 6:39 ` Alexey Dobriyan
2010-05-06 15:37 ` Linus Torvalds
2010-05-07 8:55 ` [PATCH 01/11] rlimits: security, add task_struct to setrlimit Jiri Slaby
2010-05-07 8:55 ` [PATCH 02/11] rlimits: add task_struct to update_rlimit_cpu Jiri Slaby
2010-05-07 8:55 ` [PATCH 03/11] rlimits: make sure ->rlim_max never grows in sys_setrlimit Jiri Slaby
2010-05-07 8:55 ` [PATCH 04/11] rlimits: split sys_setrlimit Jiri Slaby
2010-05-07 8:55 ` [PATCH 05/11] rlimits: allow setrlimit to non-current tasks Jiri Slaby
2010-05-07 8:55 ` [PATCH 06/11] rlimits: do security check under task_lock Jiri Slaby
2010-05-07 8:55 ` [PATCH 07/11] rlimits: add rlimit64 structure Jiri Slaby
2010-05-07 8:55 ` [PATCH 08/11] rlimits: redo do_setrlimit to more generic do_prlimit Jiri Slaby
2010-05-07 8:55 ` [PATCH 09/11] rlimits: switch getrlimit to do_prlimit Jiri Slaby
2010-05-07 9:02 ` [PATCH v2 09/11] rlimits: switch more rlimit syscalls " Jiri Slaby
2010-05-07 9:05 ` Jiri Slaby
2010-05-07 8:55 ` [PATCH " Jiri Slaby
2010-05-07 8:55 ` [PATCH 10/11] rlimits: implement prlimit64 syscall Jiri Slaby
2010-05-07 8:55 ` [PATCH 11/11] unistd: add __NR_prlimit64 syscall numbers Jiri Slaby
2010-05-06 15:46 ` Resource limits interface proposal [was: pull request for writable limits] Jiri Slaby
2010-03-24 17:04 ` [git pull] pull request for writable limits for 2.6.34-rc0 Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1262602095-17591-2-git-send-email-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=jirislaby@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=nhorman@tuxdriver.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®