lkml.org 
[lkml]   [2008]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/1] DEBUGFS: Fixing name for debug fs
    Date
    From: Michal Simek <monstr@monstr.eu>

    This change is made because powerpc_debugfs_root is arch
    specific name.

    Signed-off-by: Michal Simek <monstr@monstr.eu>
    ---
    arch/powerpc/kernel/irq.c | 2 +-
    arch/powerpc/kernel/prom.c | 2 +-
    arch/powerpc/kernel/setup-common.c | 6 +++---
    include/asm-powerpc/system.h | 2 +-
    4 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
    index 2f73f70..95008ee 100644
    --- a/arch/powerpc/kernel/irq.c
    +++ b/arch/powerpc/kernel/irq.c
    @@ -1072,7 +1072,7 @@ static const struct file_operations virq_debug_fops = {

    static int __init irq_debugfs_init(void)
    {
    - if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root,
    + if (debugfs_create_file("virq_mapping", S_IRUGO, debugfs_root,
    NULL, &virq_debug_fops))
    return -ENOMEM;

    diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
    index 2aefe2a..0946370 100644
    --- a/arch/powerpc/kernel/prom.c
    +++ b/arch/powerpc/kernel/prom.c
    @@ -1631,7 +1631,7 @@ static int __init export_flat_device_tree(void)
    flat_dt_blob.size = initial_boot_params->totalsize;

    d = debugfs_create_blob("flat-device-tree", S_IFREG | S_IRUSR,
    - powerpc_debugfs_root, &flat_dt_blob);
    + debugfs_root, &flat_dt_blob);
    if (!d)
    return 1;

    diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
    index db540ea..e47caba 100644
    --- a/arch/powerpc/kernel/setup-common.c
    +++ b/arch/powerpc/kernel/setup-common.c
    @@ -661,13 +661,13 @@ late_initcall(check_cache_coherency);
    #endif /* CONFIG_CHECK_CACHE_COHERENCY */

    #ifdef CONFIG_DEBUG_FS
    -struct dentry *powerpc_debugfs_root;
    +struct dentry *debugfs_root;

    static int powerpc_debugfs_init(void)
    {
    - powerpc_debugfs_root = debugfs_create_dir("powerpc", NULL);
    + debugfs_root = debugfs_create_dir("powerpc", NULL);

    - return powerpc_debugfs_root == NULL;
    + return debugfs_root == NULL;
    }
    arch_initcall(powerpc_debugfs_init);
    #endif
    diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
    index 2b6559a..9d1ef16 100644
    --- a/include/asm-powerpc/system.h
    +++ b/include/asm-powerpc/system.h
    @@ -570,7 +570,7 @@ static inline void create_function_call(unsigned long addr, void * func)
    extern void account_system_vtime(struct task_struct *);
    #endif

    -extern struct dentry *powerpc_debugfs_root;
    +extern struct dentry *debugfs_root;

    #endif /* __KERNEL__ */
    #endif /* _ASM_POWERPC_SYSTEM_H */
    --
    1.5.4.GIT


    \
     
     \ /
      Last update: 2008-05-03 16:37    [W:0.024 / U:60.564 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site