projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into upstream-jgarzik
[powerpc.git]
/
arch
/
ppc
/
kernel
/
ppc_htab.c
diff --git
a/arch/ppc/kernel/ppc_htab.c
b/arch/ppc/kernel/ppc_htab.c
index
75c6450
..
0a7e42d
100644
(file)
--- a/
arch/ppc/kernel/ppc_htab.c
+++ b/
arch/ppc/kernel/ppc_htab.c
@@
-10,7
+10,6
@@
* 2 of the License, or (at your option) any later version.
*/
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/proc_fs.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/proc_fs.h>
@@
-443,17
+442,22
@@
static ctl_table htab_ctl_table[]={
.mode = 0644,
.proc_handler = &proc_dol2crvec,
},
.mode = 0644,
.proc_handler = &proc_dol2crvec,
},
- {
0, },
+ {
}
};
static ctl_table htab_sysctl_root[] = {
};
static ctl_table htab_sysctl_root[] = {
- { 1, "kernel", NULL, 0, 0755, htab_ctl_table, },
- { 0,},
+ {
+ .ctl_name = CTL_KERN,
+ .procname = "kernel",
+ .mode = 0555,
+ .child = htab_ctl_table,
+ },
+ {}
};
static int __init
register_ppc_htab_sysctl(void)
{
};
static int __init
register_ppc_htab_sysctl(void)
{
- register_sysctl_table(htab_sysctl_root
, 0
);
+ register_sysctl_table(htab_sysctl_root);
return 0;
}
return 0;
}