Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
This commit is contained in:
@@ -391,3 +391,4 @@ sys_call_table:
|
||||
.long sys_pwritev
|
||||
.long sys_rt_tgsigqueueinfo
|
||||
.long sys_perf_event_open
|
||||
.long sys_recvmmsg /* 365 */
|
||||
|
@@ -877,44 +877,39 @@ static int misaligned_fixup(struct pt_regs *regs)
|
||||
|
||||
static ctl_table unaligned_table[] = {
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "kernel_reports",
|
||||
.data = &kernel_mode_unaligned_fixup_count,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_dointvec
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "user_reports",
|
||||
.data = &user_mode_unaligned_fixup_count,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_dointvec
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "user_enable",
|
||||
.data = &user_mode_unaligned_fixup_enable,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_dointvec},
|
||||
.proc_handler = proc_dointvec},
|
||||
{}
|
||||
};
|
||||
|
||||
static ctl_table unaligned_root[] = {
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "unaligned_fixup",
|
||||
.mode = 0555,
|
||||
unaligned_table
|
||||
.child = unaligned_table
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
static ctl_table sh64_root[] = {
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "sh64",
|
||||
.mode = 0555,
|
||||
.child = unaligned_root
|
||||
|
Reference in New Issue
Block a user