]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Konstantin Khlebnikov [Fri, 2 Dec 2011 03:06:44 +0000 (14:06 +1100)]
vmscan: fix initial shrinker size handling
A shrinker function can return -1, means that it cannot do anything
without a risk of deadlock. For example prune_super() does this if it
cannot grab a superblock refrence, even if nr_to_scan=0. Currently we
interpret this -1 as a ULONG_MAX size shrinker and evaluate `total_scan'
according to this. So the next time around this shrinker can cause really
big pressure. Let's skip such shrinkers instead.
Also make total_scan signed, otherwise the check (total_scan < 0) below
never works.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Dave Chinner <david@fromorbit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Mon, 5 Dec 2011 04:12:08 +0000 (15:12 +1100)]
Merge remote-tracking branch 'kvmtool/master'
Conflicts:
include/net/9p/9p.h
scripts/kconfig/Makefile
Stephen Rothwell [Mon, 5 Dec 2011 04:08:48 +0000 (15:08 +1100)]
Merge remote-tracking branch 'kmap_atomic/kmap_atomic'
Stephen Rothwell [Mon, 5 Dec 2011 04:02:13 +0000 (15:02 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig
Stephen Rothwell [Mon, 5 Dec 2011 04:00:46 +0000 (15:00 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 03:54:28 +0000 (14:54 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Mon, 5 Dec 2011 03:49:06 +0000 (14:49 +1100)]
Merge remote-tracking branch 'tmem/tmem'
Conflicts:
mm/swapfile.c
Stephen Rothwell [Mon, 5 Dec 2011 03:47:35 +0000 (14:47 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Mon, 5 Dec 2011 03:45:57 +0000 (14:45 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/hid/hid-hyperv.c
drivers/staging/hv/Kconfig
drivers/staging/hv/Makefile
drivers/staging/iio/adc/ad799x_core.c
drivers/staging/iio/industrialio-core.c
Stephen Rothwell [Mon, 5 Dec 2011 03:36:13 +0000 (14:36 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Mon, 5 Dec 2011 03:34:20 +0000 (14:34 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
Stephen Rothwell [Mon, 5 Dec 2011 03:28:10 +0000 (14:28 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Mon, 5 Dec 2011 03:26:43 +0000 (14:26 +1100)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 03:25:12 +0000 (14:25 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 03:23:41 +0000 (14:23 +1100)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Mon, 5 Dec 2011 03:22:08 +0000 (14:22 +1100)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Mon, 5 Dec 2011 03:16:04 +0000 (14:16 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Mon, 5 Dec 2011 03:14:41 +0000 (14:14 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Mon, 5 Dec 2011 03:07:57 +0000 (14:07 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Mon, 5 Dec 2011 03:01:06 +0000 (14:01 +1100)]
Merge remote-tracking branch 'uprobes/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:54:18 +0000 (13:54 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/mips/kernel/perf_event_mipsxx.c
Stephen Rothwell [Mon, 5 Dec 2011 02:52:39 +0000 (13:52 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:49:36 +0000 (13:49 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:48:10 +0000 (13:48 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:41:21 +0000 (13:41 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:37:45 +0000 (13:37 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/powerpc/platforms/40x/Kconfig
net/mac80211/work.c
Stephen Rothwell [Mon, 5 Dec 2011 02:31:14 +0000 (13:31 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:25:04 +0000 (13:25 +1100)]
Merge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Mon, 5 Dec 2011 02:23:40 +0000 (13:23 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 5 Dec 2011 02:22:11 +0000 (13:22 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:19:29 +0000 (13:19 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
lib/Makefile
Stephen Rothwell [Mon, 5 Dec 2011 02:18:02 +0000 (13:18 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:16:32 +0000 (13:16 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:15:00 +0000 (13:15 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:13:25 +0000 (13:13 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:12:00 +0000 (13:12 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:11:51 +0000 (13:11 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:10:22 +0000 (13:10 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:08:54 +0000 (13:08 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 5 Dec 2011 02:06:33 +0000 (13:06 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 02:04:58 +0000 (13:04 +1100)]
Merge remote-tracking branch 'input/next'
Conflicts:
drivers/input/keyboard/samsung-keypad.c
Stephen Rothwell [Mon, 5 Dec 2011 02:03:35 +0000 (13:03 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Mon, 5 Dec 2011 02:02:13 +0000 (13:02 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Mon, 5 Dec 2011 02:00:49 +0000 (13:00 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c
Stephen Rothwell [Mon, 5 Dec 2011 01:44:26 +0000 (12:44 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 01:42:55 +0000 (12:42 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 5 Dec 2011 01:41:26 +0000 (12:41 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 5 Dec 2011 01:40:07 +0000 (12:40 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Mon, 5 Dec 2011 01:38:39 +0000 (12:38 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 5 Dec 2011 01:36:59 +0000 (12:36 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
Stephen Rothwell [Mon, 5 Dec 2011 01:28:02 +0000 (12:28 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
Stephen Rothwell [Mon, 5 Dec 2011 01:00:37 +0000 (12:00 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/pl330.c
Stephen Rothwell [Mon, 5 Dec 2011 00:59:12 +0000 (11:59 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Mon, 5 Dec 2011 00:57:45 +0000 (11:57 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 5 Dec 2011 00:56:25 +0000 (11:56 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:54:56 +0000 (11:54 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 5 Dec 2011 00:54:53 +0000 (11:54 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:53:27 +0000 (11:53 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:50:04 +0000 (11:50 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/staging/media/as102/as102_drv.h
Stephen Rothwell [Mon, 5 Dec 2011 00:48:45 +0000 (11:48 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:47:29 +0000 (11:47 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 5 Dec 2011 00:46:11 +0000 (11:46 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c
Stephen Rothwell [Mon, 5 Dec 2011 00:44:35 +0000 (11:44 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:41:30 +0000 (11:41 +1100)]
Merge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:40:09 +0000 (11:40 +1100)]
Merge remote-tracking branch 'xfs/master'
Stephen Rothwell [Mon, 5 Dec 2011 00:38:53 +0000 (11:38 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:37:32 +0000 (11:37 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:36:16 +0000 (11:36 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:34:57 +0000 (11:34 +1100)]
Merge remote-tracking branch 'logfs/master'
Conflicts:
fs/logfs/file.c
Stephen Rothwell [Mon, 5 Dec 2011 00:33:26 +0000 (11:33 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 5 Dec 2011 00:33:21 +0000 (11:33 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Mon, 5 Dec 2011 00:32:02 +0000 (11:32 +1100)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Mon, 5 Dec 2011 00:30:39 +0000 (11:30 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Mon, 5 Dec 2011 00:25:13 +0000 (11:25 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 5 Dec 2011 00:23:52 +0000 (11:23 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 5 Dec 2011 00:23:35 +0000 (11:23 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 5 Dec 2011 00:22:18 +0000 (11:22 +1100)]
Merge remote-tracking branch '4xx/next'
Stephen Rothwell [Mon, 5 Dec 2011 00:19:50 +0000 (11:19 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Mon, 5 Dec 2011 00:18:28 +0000 (11:18 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:16:37 +0000 (11:16 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:15:12 +0000 (11:15 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Conflicts:
arch/m68k/Kconfig.debug
Stephen Rothwell [Mon, 5 Dec 2011 00:13:48 +0000 (11:13 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:12:30 +0000 (11:12 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Mon, 5 Dec 2011 00:11:15 +0000 (11:11 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Mon, 5 Dec 2011 00:09:40 +0000 (11:09 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:04:20 +0000 (11:04 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:02:56 +0000 (11:02 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Mon, 5 Dec 2011 00:01:39 +0000 (11:01 +1100)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-s3c64xx/mach-crag6410.c
Stephen Rothwell [Sun, 4 Dec 2011 23:56:32 +0000 (10:56 +1100)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h
Stephen Rothwell [Sun, 4 Dec 2011 23:54:47 +0000 (10:54 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Sun, 4 Dec 2011 23:53:24 +0000 (10:53 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c
Stephen Rothwell [Sun, 4 Dec 2011 23:52:03 +0000 (10:52 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/mm/ioremap.c
Stephen Rothwell [Sun, 4 Dec 2011 23:46:13 +0000 (10:46 +1100)]
Merge remote-tracking branch 'arm/for-next'
Conflicts:
arch/arm/plat-omap/include/plat/common.h
arch/arm/tools/mach-types
Stephen Rothwell [Sun, 4 Dec 2011 23:44:40 +0000 (10:44 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Sun, 4 Dec 2011 23:44:38 +0000 (10:44 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 4 Dec 2011 23:44:37 +0000 (10:44 +1100)]
Merge remote-tracking branch 'sparc/master'
Jacek Galowicz [Sun, 4 Dec 2011 23:33:31 +0000 (10:33 +1100)]
lguest: switch segment-voodoo-numbers to readable symbols
When studying lguest's x86 segment descriptor code, it is not longer
necessary to have the Intel x86 architecture manual open on the page
with the segment descriptor illustration to understand the crazy
numbers assigned to both descriptor structure halves a/b.
Now the struct desc_struct's fields, like suggested by
Glauber de Oliveira Costa in 2008, are used.
Signed-off-by: Jacek Galowicz <jacek@galowicz.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Kevin Cernekee [Sun, 4 Dec 2011 23:33:31 +0000 (10:33 +1100)]
module: Fix performance regression on modules with large symbol tables
Looking at /proc/kallsyms, one starts to ponder whether all of the extra
strtab-related complexity in module.c is worth the memory savings.
Instead of making the add_kallsyms() loop even more complex, I tried the
other route of deleting the strmap logic and naively copying each string
into core_strtab with no consideration for consolidating duplicates.
Performance on an "already exists" insmod of nvidia.ko (runs
add_kallsyms() but does not actually initialize the module):
Original scheme: 1.230s
With naive copying: 0.058s
Extra space used: 35k (of a 408k module).
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
LKML-Reference: <
73defb5e4bca04a6431392cc341112b1 @localhost>
Kevin Cernekee [Sun, 13 Nov 2011 03:08:55 +0000 (19:08 -0800)]
module: Add comments describing how the "strmap" logic works
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Sun, 4 Dec 2011 23:33:30 +0000 (10:33 +1100)]
virtio: add debugging if driver doesn't kick.
Under the existing #ifdef DEBUG, check that they don't have more than
1/10 of a second between an add_buf() and a
virtqueue_notify()/virtqueue_kick_prepare() call.
We could get false positives on a really busy system, but good for
development.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>