git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
arch
/
mips
/
lasat
/
sysctl.c
diff --git
a/arch/mips/lasat/sysctl.c
b/arch/mips/lasat/sysctl.c
index
3f04d4c
..
b3deed8
100644
(file)
--- a/
arch/mips/lasat/sysctl.c
+++ b/
arch/mips/lasat/sysctl.c
@@
-56,12
+56,12
@@
int sysctl_lasatstring(ctl_table *table,
/* And the same for proc */
/* And the same for proc */
-int proc_dolasatstring(ctl_table *table, int write,
struct file *filp,
+int proc_dolasatstring(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos)
{
int r;
void *buffer, size_t *lenp, loff_t *ppos)
{
int r;
- r = proc_dostring(table, write,
filp,
buffer, lenp, ppos);
+ r = proc_dostring(table, write, buffer, lenp, ppos);
if ((!write) || r)
return r;
if ((!write) || r)
return r;
@@
-71,12
+71,12
@@
int proc_dolasatstring(ctl_table *table, int write, struct file *filp,
}
/* proc function to write EEPROM after changing int entry */
}
/* proc function to write EEPROM after changing int entry */
-int proc_dolasatint(ctl_table *table, int write,
struct file *filp,
+int proc_dolasatint(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos)
{
int r;
void *buffer, size_t *lenp, loff_t *ppos)
{
int r;
- r = proc_dointvec(table, write,
filp,
buffer, lenp, ppos);
+ r = proc_dointvec(table, write, buffer, lenp, ppos);
if ((!write) || r)
return r;
if ((!write) || r)
return r;
@@
-89,7
+89,7
@@
int proc_dolasatint(ctl_table *table, int write, struct file *filp,
static int rtctmp;
/* proc function to read/write RealTime Clock */
static int rtctmp;
/* proc function to read/write RealTime Clock */
-int proc_dolasatrtc(ctl_table *table, int write,
struct file *filp,
+int proc_dolasatrtc(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos)
{
struct timespec ts;
void *buffer, size_t *lenp, loff_t *ppos)
{
struct timespec ts;
@@
-102,7
+102,7
@@
int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
if (rtctmp < 0)
rtctmp = 0;
}
if (rtctmp < 0)
rtctmp = 0;
}
- r = proc_dointvec(table, write,
filp,
buffer, lenp, ppos);
+ r = proc_dointvec(table, write, buffer, lenp, ppos);
if (r)
return r;
if (r)
return r;
@@
-154,7
+154,7
@@
int sysctl_lasat_rtc(ctl_table *table,
#endif
#ifdef CONFIG_INET
#endif
#ifdef CONFIG_INET
-int proc_lasat_ip(ctl_table *table, int write,
struct file *filp,
+int proc_lasat_ip(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos)
{
unsigned int ip;
void *buffer, size_t *lenp, loff_t *ppos)
{
unsigned int ip;
@@
-231,12
+231,12
@@
static int sysctl_lasat_prid(ctl_table *table,
return 0;
}
return 0;
}
-int proc_lasat_prid(ctl_table *table, int write,
struct file *filp,
+int proc_lasat_prid(ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos)
{
int r;
void *buffer, size_t *lenp, loff_t *ppos)
{
int r;
- r = proc_dointvec(table, write,
filp,
buffer, lenp, ppos);
+ r = proc_dointvec(table, write, buffer, lenp, ppos);
if (r < 0)
return r;
if (write) {
if (r < 0)
return r;
if (write) {