aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorTom Rini <trini@kernel.crashing.org>2004-08-12 04:24:36 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-12 04:24:36 -0700
commit59635f61873e95723c951e25c619782f66126a94 (patch)
treed1cf775db19ee53f796c121e618d47f67c2be751 /kernel
parenta75aaa84276708dda2ba54f22a761b2207149067 (diff)
downloadhistory-59635f61873e95723c951e25c619782f66126a94.tar.gz
[PATCH] ppc32: Fix warning on CONFIG_PPC32 && CONFIG_6xx
In the *ppos cleanups, proc_dol2crvec was updated, but the prototype found at the top of kernel/sysctl.h was not, generating warning. This corrects the prototype to match the code. (I'm gonna take a stab at moving these into arch/ppc shortly) Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 2a643c00e9ad6c..3905df6f026f2d 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -113,7 +113,7 @@ extern int sysctl_hz_timer;
#if defined(CONFIG_PPC32) && defined(CONFIG_6xx)
extern unsigned long powersave_nap;
int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
- void __user *buffer, size_t *lenp);
+ void __user *buffer, size_t *lenp, loff_t *ppos);
#endif
#ifdef CONFIG_BSD_PROCESS_ACCT