2008-02-26 10:23:51

by Alexey Dobriyan

Subject: [PATCH] arch/x86/: switch to proc_create()

Signed-off-by: Alexey Dobriyan <[email protected]>
---

arch/x86/kernel/apm_32.c | 5 +----
arch/x86/kernel/cpu/mtrr/if.c | 6 ++----
2 files changed, 3 insertions(+), 8 deletions(-)

--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -2217,7 +2217,6 @@ static struct dmi_system_id __initdata apm_dmi_table[] = {
*/
static int __init apm_init(void)
{
- struct proc_dir_entry *apm_proc;
struct desc_struct *gdt;
int err;

@@ -2322,9 +2321,7 @@ static int __init apm_init(void)
set_base(gdt[APM_DS >> 3],
__va((unsigned long)apm_info.bios.dseg << 4));

- apm_proc = create_proc_entry("apm", 0, NULL);
- if (apm_proc)
- apm_proc->proc_fops = &apm_file_ops;
+ proc_create("apm", 0, NULL, &apm_file_ops);

kapmd_task = kthread_create(apm, NULL, "kapmd");
if (IS_ERR(kapmd_task)) {
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -424,11 +424,9 @@ static int __init mtrr_if_init(void)
return -ENODEV;

proc_root_mtrr =
- create_proc_entry("mtrr", S_IWUSR | S_IRUGO, &proc_root);
- if (proc_root_mtrr) {
+ proc_create("mtrr", S_IWUSR | S_IRUGO, &proc_root, &mtrr_fops);
+ if (proc_root_mtrr)
proc_root_mtrr->owner = THIS_MODULE;
- proc_root_mtrr->proc_fops = &mtrr_fops;
- }
return 0;
}

2008-02-26 11:28:51

by Ingo Molnar

Subject: Re: [PATCH] arch/x86/: switch to proc_create()

* Alexey Dobriyan <[email protected]> wrote:

> + proc_create("apm", 0, NULL, &apm_file_ops);

> + proc_create("mtrr", S_IWUSR | S_IRUGO, &proc_root, &mtrr_fops);

thanks, applied.

Ingo