diff options
| author | Linus Torvalds | 2009-03-31 01:06:04 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-03-31 01:06:04 +0200 |
| commit | cf2f7d7c90279cdbc12429de278f3d27ac2050ae (patch) | |
| tree | c84bb54712f566e6497ccadd1ae9f42b4baf0c63 /arch/ia64/kernel | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff) | |
| parent | Revert "proc: revert /proc/uptime to ->read_proc hook" (diff) | |
| download | kernel-qcow2-linux-cf2f7d7c90279cdbc12429de278f3d27ac2050ae.tar.gz kernel-qcow2-linux-cf2f7d7c90279cdbc12429de278f3d27ac2050ae.tar.xz kernel-qcow2-linux-cf2f7d7c90279cdbc12429de278f3d27ac2050ae.zip | |
Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc
* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
Revert "proc: revert /proc/uptime to ->read_proc hook"
proc 2/2: remove struct proc_dir_entry::owner
proc 1/2: do PDE usecounting even for ->read_proc, ->write_proc
proc: fix sparse warnings in pagemap_read()
proc: move fs/proc/inode-alloc.txt comment into a source file
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/palinfo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c index e5c57f413ca2..a4f19c70aadd 100644 --- a/arch/ia64/kernel/palinfo.c +++ b/arch/ia64/kernel/palinfo.c @@ -1002,8 +1002,6 @@ create_palinfo_proc_entries(unsigned int cpu) *pdir = create_proc_read_entry( palinfo_entries[j].name, 0, cpu_dir, palinfo_read_entry, (void *)f.value); - if (*pdir) - (*pdir)->owner = THIS_MODULE; pdir++; } } |