#
c226951b |
| 26-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
#
27bf71c2 |
| 26-Sep-2006 |
Christoph Lameter <clameter@sgi.com> |
[PATCH] reduce MAX_NR_ZONES: remove display of counters for unconfigured zones
eventcounters: Do not display counters for zones that are not available on an arch
Do not define or display counters f
[PATCH] reduce MAX_NR_ZONES: remove display of counters for unconfigured zones
eventcounters: Do not display counters for zones that are not available on an arch
Do not define or display counters for the DMA32 and the HIGHMEM zone if such zones were not configured.
[akpm@osdl.org: s390 fix] [heiko.carstens@de.ibm.com: s390 fix] Signed-off-by: Christoph Lameter <clameter@sgi.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
Revision tags: v2.6.18, v2.6.18-rc7, v2.6.18-rc6, v2.6.18-rc5, v2.6.18-rc4, v2.6.18-rc3, v2.6.18-rc2, v2.6.18-rc1 |
|
#
05668381 |
| 03-Jul-2006 |
Sam Ravnborg <sam@mars.ravnborg.org> |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
|
#
026477c1 |
| 03-Jul-2006 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
|
#
0a1340c1 |
| 03-Jul-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
|
#
22a3e233 |
| 01-Jul-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: Remove obsolete #include <linux/config.h> remove obsolete swsusp_en
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: Remove obsolete #include <linux/config.h> remove obsolete swsusp_encrypt arch/arm26/Kconfig typos Documentation/IPMI typos Kconfig: Typos in net/sched/Kconfig v9fs: do not include linux/version.h Documentation/DocBook/mtdnand.tmpl: typo fixes typo fixes: specfic -> specific typo fixes in Documentation/networking/pktgen.txt typo fixes: occuring -> occurring typo fixes: infomation -> information typo fixes: disadvantadge -> disadvantage typo fixes: aquire -> acquire typo fixes: mecanism -> mechanism typo fixes: bandwith -> bandwidth fix a typo in the RTC_CLASS help text smb is no longer maintained
Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
show more ...
|
#
f8891e5e |
| 30-Jun-2006 |
Christoph Lameter <clameter@sgi.com> |
[PATCH] Light weight event counters
The remaining counters in page_state after the zoned VM counter patches have been applied are all just for show in /proc/vmstat. They have no essential function
[PATCH] Light weight event counters
The remaining counters in page_state after the zoned VM counter patches have been applied are all just for show in /proc/vmstat. They have no essential function for the VM.
We use a simple increment of per cpu variables. In order to avoid the most severe races we disable preempt. Preempt does not prevent the race between an increment and an interrupt handler incrementing the same statistics counter. However, that race is exceedingly rare, we may only loose one increment or so and there is no requirement (at least not in kernel) that the vm event counters have to be accurate.
In the non preempt case this results in a simple increment for each counter. For many architectures this will be reduced by the compiler to a single instruction. This single instruction is atomic for i386 and x86_64. And therefore even the rare race condition in an interrupt is avoided for both architectures in most cases.
The patchset also adds an off switch for embedded systems that allows a building of linux kernels without these counters.
The implementation of these counters is through inline code that hopefully results in only a single instruction increment instruction being emitted (i386, x86_64) or in the increment being hidden though instruction concurrency (EPIC architectures such as ia64 can get that done).
Benefits: - VM event counter operations usually reduce to a single inline instruction on i386 and x86_64. - No interrupt disable, only preempt disable for the preempt case. Preempt disable can also be avoided by moving the counter into a spinlock. - Handling is similar to zoned VM counters. - Simple and easily extendable. - Can be omitted to reduce memory use for embedded use.
References:
RFC http://marc.theaimsgroup.com/?l=linux-kernel&m=113512330605497&w=2 RFC http://marc.theaimsgroup.com/?l=linux-kernel&m=114988082814934&w=2 local_t http://marc.theaimsgroup.com/?l=linux-kernel&m=114991748606690&w=2 V2 http://marc.theaimsgroup.com/?t=115014808400007&r=1&w=2 V3 http://marc.theaimsgroup.com/?l=linux-kernel&m=115024767022346&w=2 V4 http://marc.theaimsgroup.com/?l=linux-kernel&m=115047968808926&w=2
Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
#
347ce434 |
| 30-Jun-2006 |
Christoph Lameter <clameter@sgi.com> |
[PATCH] zoned vm counters: conversion of nr_pagecache to per zone counter
Currently a single atomic variable is used to establish the size of the page cache in the whole machine. The zoned VM count
[PATCH] zoned vm counters: conversion of nr_pagecache to per zone counter
Currently a single atomic variable is used to establish the size of the page cache in the whole machine. The zoned VM counters have the same method of implementation as the nr_pagecache code but also allow the determination of the pagecache size per zone.
Remove the special implementation for nr_pagecache and make it a zoned counter named NR_FILE_PAGES.
Updates of the page cache counters are always performed with interrupts off. We can therefore use the __ variant here.
Signed-off-by: Christoph Lameter <clameter@sgi.com> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
#
6ab3d562 |
| 30-Jun-2006 |
Jörn Engel <joern@wohnheim.fh-wedel.de> |
Remove obsolete #include <linux/config.h>
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
#
d120cfb5 |
| 30-Jun-2006 |
Len Brown <len.brown@intel.com> |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
|
#
55b4d6a5 |
| 29-Jun-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
|
#
b026188e |
| 29-Jun-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (28 commits) [S390] rework of channel measurement facili
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (28 commits) [S390] rework of channel measurement facility. [S390] appldata enhancements. [S390] Add vmpanic parameter. [S390] add PAV support to the dasd driver. [S390] remove export of sys_call_table [S390] remove unused macros from binfmt_elf32.c [S390] fix duplicate export of overflow{ug}id [S390] cio chpid offline. [S390] avenrun export in appdata_base.c Convert s390_collect_crw_info() in s390mach.c from being started [S390] dasd eer data format. [S390] preempt_count initialization. [S390] head.S code moving. [S390] dasd whitespace and other cosmetics. [S390] virtual cpu accounting vs. machine checks. [S390] add __cpuinit to appldata cpu hotplug notifier. [S390] dasd_eckd_dump_sense bug. [S390] missing check in dasd_eer_open. [S390] modular 3270 driver. [S390] console_unblank woes. ...
show more ...
|
#
5b5dd21a |
| 29-Jun-2006 |
Gerald Schaefer <geraldsc@de.ibm.com> |
[S390] appldata enhancements.
Add CPU ID and steal time, and make OS record size variable.
Signed-off-by: Gerald Schaefer <geraldsc@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm
[S390] appldata enhancements.
Add CPU ID and steal time, and make OS record size variable.
Signed-off-by: Gerald Schaefer <geraldsc@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
show more ...
|
Revision tags: v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4, v2.6.17-rc3, v2.6.17-rc2, v2.6.17-rc1, v2.6.16, v2.6.16-rc6, v2.6.16-rc5, v2.6.16-rc4, v2.6.16-rc3, v2.6.16-rc2, v2.6.16-rc1, v2.6.15, v2.6.15-rc7, v2.6.15-rc6, v2.6.15-rc5, v2.6.15-rc4, v2.6.15-rc3, v2.6.15-rc2, v2.6.15-rc1, v2.6.14, v2.6.14-rc5, v2.6.14-rc4, v2.6.14-rc3, v2.6.14-rc2, v2.6.14-rc1, v2.6.13, v2.6.13-rc7, v2.6.13-rc6, v2.6.13-rc5, v2.6.13-rc4, v2.6.13-rc3, v2.6.13-rc2, v2.6.13-rc1 |
|
#
f45727d5 |
| 27-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
|
#
5696c194 |
| 27-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
#
aef7b83c |
| 27-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
#
7ca6448d |
| 26-Jun-2005 |
Thomas Gleixner <tglx@tglx.tec.linutronix.de> |
Merge with rsync://fileserver/linux Update to Linus latest
|
#
8b0ee07e |
| 26-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
|
#
a5324343 |
| 23-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
#
80bd6d7f |
| 22-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
#
ff40c6d3 |
| 22-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge upstream kernel changes into 'C/H/S support' branch of libata.
|
#
fae6ec69 |
| 21-Jun-2005 |
Jaroslav Kysela <perex@hera.kernel.org> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
d039ba24 |
| 20-Jun-2005 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
#
f9d1fe96 |
| 18-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
#
0107b3cf |
| 18-Jun-2005 |
David Woodhouse <dwmw2@shinybook.infradead.org> |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|