diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-10 07:06:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-10 07:06:16 -0700 |
| commit | 2850310b191152cfaaaae45a2bb24ebb0a8bfc94 (patch) | |
| tree | 8193ea1857943166366cd95930801169ac163924 /kernel | |
| parent | cdd3fde3b96adc78dd50b738a977ce77ab4538c0 (diff) | |
| parent | 7e65788c16b7850d4d27ec19b720b546e164e5e7 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index edebad7ddec4..d190b98f996a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -87,6 +87,11 @@ extern char reboot_command []; extern int stop_a_enabled; #endif +#ifdef __hppa__ +extern int pwrsw_enabled; +extern int unaligned_enabled; +#endif + #ifdef CONFIG_ARCH_S390 #ifdef CONFIG_MATHEMU extern int sysctl_ieee_emulation_warnings; @@ -313,6 +318,30 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, #endif +#ifdef __hppa__ + { + .ctl_name = KERN_HPPA_PWRSW, + .procname = "soft-power", + .data = &pwrsw_enabled, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { + .ctl_name = KERN_HPPA_UNALIGNED, + .procname = "unaligned-trap", + .data = &unaligned_enabled, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, +#endif +#ifdef __hppa__ + {KERN_HPPA_PWRSW, "soft-power", &pwrsw_enabled, sizeof (int), + 0644, NULL, &proc_dointvec}, + {KERN_HPPA_UNALIGNED, "unaligned-trap", &unaligned_enabled, sizeof (int), + 0644, NULL, &proc_dointvec}, +#endif #if defined(CONFIG_PPC32) && defined(CONFIG_6xx) { .ctl_name = KERN_PPC_POWERSAVE_NAP, |