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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
ppc
/
kernel
/
ppc_htab.c
diff --git
a/arch/ppc/kernel/ppc_htab.c
b/arch/ppc/kernel/ppc_htab.c
index
bd129d3
..
9ed36dd
100644
(file)
--- a/
arch/ppc/kernel/ppc_htab.c
+++ b/
arch/ppc/kernel/ppc_htab.c
@@
-18,7
+18,6
@@
#include <linux/capability.h>
#include <linux/ctype.h>
#include <linux/threads.h>
#include <linux/capability.h>
#include <linux/ctype.h>
#include <linux/threads.h>
-#include <linux/smp_lock.h>
#include <linux/seq_file.h>
#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/seq_file.h>
#include <linux/init.h>
#include <linux/bitops.h>
@@
-437,22
+436,26
@@
int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
*/
static ctl_table htab_ctl_table[]={
{
*/
static ctl_table htab_ctl_table[]={
{
- .ctl_name = KERN_PPC_L2CR,
.procname = "l2cr",
.mode = 0644,
.proc_handler = &proc_dol2crvec,
},
.procname = "l2cr",
.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;
}