Commits · 59c7572e82d69483a66eaa67b46548baeb69ecf4 · Kirill Smelkov / linux

23 Oct, 2008 35 commits

proc: remove fs/proc/proc_misc.c · 59c7572e

Alexey Dobriyan authored Oct 06, 2008

Now that everything was moved to their more or less expected places,
apply rm(1).
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

59c7572e

proc: move /proc/vmcore creation to fs/proc/vmcore.c · 5aa140c2
Alexey Dobriyan authored Oct 06, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
5aa140c2
proc: move pagecount stuff to fs/proc/page.c · 6d80e53f
Alexey Dobriyan authored Oct 06, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
6d80e53f
proc: move all /proc/kcore stuff to fs/proc/kcore.c · 97ce5d6d
Alexey Dobriyan authored Oct 06, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
97ce5d6d
proc: move /proc/schedstat boilerplate to kernel/sched_stats.h · b5aadf7f
Alexey Dobriyan authored Oct 06, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
b5aadf7f
proc: move /proc/modules boilerplate to kernel/module.c · 3b5d5c6b
Alexey Dobriyan authored Oct 06, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
3b5d5c6b
proc: move /proc/diskstats boilerplate to block/genhd.c · 31d85ab2
Alexey Dobriyan authored Oct 06, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
```
31d85ab2

proc: move /proc/zoneinfo boilerplate to mm/vmstat.c · 5c9fe628

Alexey Dobriyan authored Oct 06, 2008

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Christoph Lameter <cl@linux-foundation.org>

5c9fe628

proc: move /proc/vmstat boilerplate to mm/vmstat.c · b6aa44ab

Alexey Dobriyan authored Oct 06, 2008

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Christoph Lameter <cl@linux-foundation.org>

b6aa44ab

proc: move /proc/pagetypeinfo boilerplate to mm/vmstat.c · 74e2e8e8
Alexey Dobriyan authored Oct 06, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
74e2e8e8
proc: move /proc/buddyinfo boilerplate to mm/vmstat.c · 8f32f7e5
Alexey Dobriyan authored Oct 06, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
8f32f7e5

proc: move /proc/vmallocinfo to mm/vmalloc.c · 5f6a6a9c

Alexey Dobriyan authored Oct 06, 2008

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Christoph Lameter <cl@linux-foundation.org>

5f6a6a9c

proc: move /proc/slabinfo boilerplate to mm/slub.c, mm/slab.c · 7b3c3a50

Alexey Dobriyan authored Oct 06, 2008

Lose dummy ->write hook in case of SLUB, it's possible now.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>

7b3c3a50

proc: move /proc/slab_allocators boilerplate to mm/slab.c · a0ec95a8
Alexey Dobriyan authored Oct 06, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
```
a0ec95a8
proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c · d6917e19
Alexey Dobriyan authored Oct 05, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
d6917e19
proc: move /proc/stat to fs/proc/stat.c · df8106db
Alexey Dobriyan authored Oct 05, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
df8106db
proc: move rest of /proc/partitions code to block/genhd.c · f500975a
Alexey Dobriyan authored Oct 04, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
```
f500975a
proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c · 8591cf43
Alexey Dobriyan authored Oct 04, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
8591cf43
proc: move /proc/devices code to fs/proc/devices.c · fe251042
Alexey Dobriyan authored Oct 04, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
fe251042
proc: move rest of /proc/locks to fs/locks.c · d8ba7a36
Alexey Dobriyan authored Oct 04, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
d8ba7a36
proc: move /proc/kmsg creation to fs/proc/kmsg.c · ae048112
Alexey Dobriyan authored Oct 04, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
ae048112
proc: remove remnants of ->read_proc in proc_misc.c · 65968928
Alexey Dobriyan authored Oct 04, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
65968928
proc: move /proc/execdomains to kernel/exec_domain.c · 6e62775e
Alexey Dobriyan authored Oct 04, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
6e62775e

proc: switch /proc/cmdline to seq_file · cf9887f1

Alexey Dobriyan authored Oct 04, 2008

and move it to fs/proc/cmdline.c while I'm at it.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

cf9887f1

proc: move /proc/filesystems to fs/filesystems.c · 68274007
Alexey Dobriyan authored Oct 04, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
68274007
proc: move /proc/stram to m68k-specific code · 4c150f6c
Alexey Dobriyan authored Oct 04, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
4c150f6c
proc: move /proc/hardware to m68k-specific code · 813dcf7a
Alexey Dobriyan authored Oct 03, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
813dcf7a

proc: switch /proc/version to seq_file · b457d151

Alexey Dobriyan authored Oct 03, 2008

and move it to fs/proc/version.c while I'm at it.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

b457d151

proc: switch /proc/meminfo to seq_file · e1759c21

Alexey Dobriyan authored Oct 15, 2008

and move it to fs/proc/meminfo.c while I'm at it.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

e1759c21

proc: switch /proc/uptime to seq_file · 96177602

Alexey Dobriyan authored Oct 03, 2008

and move it to fs/proc/uptime.c while I'm at it.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

96177602

proc: switch /proc/loadavg to seq_file · 5b3acc8d

Alexey Dobriyan authored Oct 03, 2008

and move it to fs/proc/loadavg.c while I'm at it.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

5b3acc8d

proc: use WARN() rather than printk+backtrace · 6c2f91e0

Arjan van de Ven authored Sep 13, 2008

Use WARN() rather than a printk() + backtrace();
this gives a more standard format message as well as complete
information (including line numbers etc) that will be collected
by kerneloops.org
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

6c2f91e0

proc: spread __init · 1e0edd3f
Alexey Dobriyan authored Oct 17, 2008
```
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
```
1e0edd3f

proc: proc_init_inodecache() can't fail · 5bcd7ff9

Alexey Dobriyan authored Oct 17, 2008

kmem_cache creation code will panic, don't return anything.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

5bcd7ff9

proc: fix vma display mismatch between /proc/pid/{maps,smaps} · 7c88db0c

Joe Korty authored Oct 16, 2008

Commit 4752c369 aka
"maps4: simplify interdependence of maps and smaps" broke /proc/pid/smaps,
causing it to display some vmas twice and other vmas not at all.  For example:

    grep .- /proc/1/smaps >/tmp/smaps; diff /proc/1/maps /tmp/smaps

    1  25d24
    2  < 7fd7e23aa000-7fd7e23ac000 rw-p 7fd7e23aa000 00:00 0
    3  28a28
    4  > ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0  [vsyscall]

The bug has something to do with setting m->version before all the
seq_printf's have been performed.  show_map was doing this correctly,
but show_smap was doing this in the middle of its seq_printf sequence.
This patch arranges things so that the setting of m->version in show_smap
is also done at the end of its seq_printf sequence.

Testing: in addition to the above grep test, for each process I summed
up the 'Rss' fields of /proc/pid/smaps and compared that to the 'VmRSS'
field of /proc/pid/status.  All matched except for Xorg (which has a
/dev/mem mapping which Rss accounts for but VmRSS does not).  This result
gives us some confidence that neither /proc/pid/maps nor /proc/pid/smaps
are any longer skipping or double-counting vmas.
Signed-off-by: Joe Korty <joe.korty@ccur.com>
Cc: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

7c88db0c

21 Oct, 2008 1 commit

binfmt_elf_fdpic: Update for cputime changes. · 2515ddc6

Paul Mundt authored Oct 21, 2008

Commit f06febc9 ("timers: fix itimer/
many thread hang") introduced a new task_cputime interface and
subsequently only converted binfmt_elf over to it.  This results in the
build for binfmt_elf_fdpic blowing up given that p->signal->{u,s}time
have disappeared from underneath us.

Apply the same trivial fix from binfmt_elf to binfmt_elf_fdpic.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2515ddc6

20 Oct, 2008 4 commits

mm: remove duplicated #include's · a50c22ee

Huang Weiyi authored Oct 21, 2008

Removed duplicated #include <linux/vmalloc.h> in mm/vmalloc.c and
"internal.h" in mm/memory.c.
Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

a50c22ee

Export tiny shmem_file_setup for DRM-GEM · e798ba57

Hugh Dickins authored Oct 21, 2008

We're trying to keep the !CONFIG_SHMEM tiny-shmem.c (using ramfs without
swap) in synch with CONFIG_SHMEM shmem.c (and mpm is preparing patches
to combine them).  I was glad to see EXPORT_SYMBOL_GPL(shmem_file_setup)
go into shmem.c, but why not support DRM-GEM when !CONFIG_SHMEM too?
But caution says still depend on MMU, since !CONFIG_MMU is.. different.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Matt Mackall <mpm@selenic.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

e798ba57

misc: replace remaining __FUNCTION__ with __func__ · 653c0316

Harvey Harrison authored Oct 20, 2008

__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

653c0316

fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c · e8848a17

Thomas Gleixner authored Oct 21, 2008

commit 9b7530cc ("i915: cleanup coding
horrors in i915_gem_gtt_pwrite()")

broke the i386 build for CONFIG_HIGHMEM=y.

Caught by automatic testing http://www.tglx.de/autoqa-logs/000137-0006-0001.logSigned-off-by: Thomas Gleixner <tglx@linutronix.de>
[ My bad. It's the same patch I sent out earlier, nobody noticed then either.. ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

e8848a17