]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Andrew Morton [Wed, 20 Mar 2013 04:06:46 +0000 (15:06 +1100)]
mm-hugetlb-fix-total-hugetlbfs-pages-count-when-memory-overcommit-accouting-fix
coding-style tweak
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Wanpeng Li [Wed, 20 Mar 2013 04:06:46 +0000 (15:06 +1100)]
mm/hugetlb: fix total hugetlbfs pages count when using memory overcommit accouting
hugetlb_total_pages is used for overcommit calculations but the current
implementation considers only the default hugetlb page size (which is
either the first defined hugepage size or the one specified by
default_hugepagesz kernel boot parameter).
If the system is configured for more than one hugepage size, which is
possible since
a137e1cc ("hugetlbfs: per mount huge page sizes") then the
overcommit estimation done by __vm_enough_memory() (resp. shown by
meminfo_proc_show) is not precise - there is an impression of more
available/allowed memory. This can lead to an unexpected ENOMEM/EFAULT
resp. SIGSEGV when memory is accounted.
Testcase:
boot: hugepagesz=1G hugepages=1
the default overcommit ratio is 50
before patch:
egrep 'CommitLimit' /proc/meminfo
CommitLimit:
55434168 kB
after patch:
egrep 'CommitLimit' /proc/meminfo
CommitLimit:
54909880 kB
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: <stable@vger.kernel.org> [3.0+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Wed, 20 Mar 2013 04:06:46 +0000 (15:06 +1100)]
printk-provide-a-wake_up_klogd-off-case-fix
include printk.h in bust_spinlocks.c.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Frederic Weisbecker [Wed, 20 Mar 2013 04:06:45 +0000 (15:06 +1100)]
printk: Provide a wake_up_klogd() off-case
wake_up_klogd() is useless when CONFIG_PRINTK=n because neither printk()
nor printk_sched() are in use and there are actually no waiter on log_wait
waitqueue. It should be a stub in this case for users like
bust_spinlocks().
Otherwise this results in this warning when CONFIG_PRINTK=n
and CONFIG_IRQ_WORK=n:
kernel/built-in.o In function `wake_up_klogd':
(.text.wake_up_klogd+0xb4): undefined reference to `irq_work_queue'
To fix this, provide an off-case for wake_up_klogd() when CONFIG_PRINTK=n.
There is much more from console_unlock() and other console related code in
printk.c that should be moved under CONFIG_PRINTK. But for now, focus on
a minimal fix as we passed the merged window already.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Reported-by: James Hogan <james.hogan@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
James Hogan [Wed, 20 Mar 2013 04:06:45 +0000 (15:06 +1100)]
irq_work.h: fix warning when CONFIG_IRQ_WORK=n
A randconfig caught repeated compiler warnings when CONFIG_IRQ_WORK=n due
to the definition of a non-inline static function in <linux/irq_work.h>:
include/linux/irq_work.h +40 : warning: 'irq_work_needs_cpu' defined but not used
Make it inline to supress the warning. This is caused by the following
commit:
Commit
00b429591 ("irq_work: Don't stop the tick with pending works")
merged in v3.9-rc1.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Fri, 22 Mar 2013 04:30:28 +0000 (15:30 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Fri, 22 Mar 2013 04:28:51 +0000 (15:28 +1100)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Fri, 22 Mar 2013 04:21:12 +0000 (15:21 +1100)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/mips/kernel/linux32.c
arch/tile/Kconfig
arch/tile/kernel/compat.c
include/asm-generic/unistd.h
Stephen Rothwell [Fri, 22 Mar 2013 04:19:31 +0000 (15:19 +1100)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 04:17:52 +0000 (15:17 +1100)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 04:16:12 +0000 (15:16 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Conflicts:
drivers/clocksource/tegra20_timer.c
Stephen Rothwell [Fri, 22 Mar 2013 04:14:30 +0000 (15:14 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 04:12:52 +0000 (15:12 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Fri, 22 Mar 2013 04:11:20 +0000 (15:11 +1100)]
Merge remote-tracking branch 'msm/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 04:09:39 +0000 (15:09 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
Stephen Rothwell [Fri, 22 Mar 2013 03:57:57 +0000 (14:57 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Fri, 22 Mar 2013 03:56:10 +0000 (14:56 +1100)]
Merge remote-tracking branch 'bcm2835/for-next'
Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
Stephen Rothwell [Fri, 22 Mar 2013 03:49:34 +0000 (14:49 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 03:48:02 +0000 (14:48 +1100)]
Merge remote-tracking branch 'mailbox/dbx500-prcmu-mailbox'
Stephen Rothwell [Fri, 22 Mar 2013 03:46:27 +0000 (14:46 +1100)]
Merge remote-tracking branch 'gen-gpio/for_next'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
Stephen Rothwell [Fri, 22 Mar 2013 03:44:49 +0000 (14:44 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Fri, 22 Mar 2013 03:43:15 +0000 (14:43 +1100)]
Merge remote-tracking branch 'irqdomain/irqdomain/next'
Stephen Rothwell [Fri, 22 Mar 2013 03:41:23 +0000 (14:41 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/vhost/Makefile
Stephen Rothwell [Fri, 22 Mar 2013 03:39:37 +0000 (14:39 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 03:37:15 +0000 (14:37 +1100)]
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Stephen Rothwell [Fri, 22 Mar 2013 03:35:29 +0000 (14:35 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Fri, 22 Mar 2013 03:33:49 +0000 (14:33 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Fri, 22 Mar 2013 03:31:43 +0000 (14:31 +1100)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/gadget/net2272.c
drivers/usb/gadget/net2280.c
Stephen Rothwell [Fri, 22 Mar 2013 03:22:45 +0000 (14:22 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Fri, 22 Mar 2013 03:18:52 +0000 (14:18 +1100)]
Stephen Rothwell [Fri, 22 Mar 2013 03:11:08 +0000 (14:11 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Fri, 22 Mar 2013 03:09:13 +0000 (14:09 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 03:07:34 +0000 (14:07 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 03:07:15 +0000 (14:07 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Conflicts:
drivers/platform/x86/chromeos_laptop.c
Stephen Rothwell [Fri, 22 Mar 2013 02:59:44 +0000 (13:59 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:53:12 +0000 (13:53 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:51:09 +0000 (13:51 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:43:32 +0000 (13:43 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 22 Mar 2013 02:35:55 +0000 (13:35 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Conflicts:
kernel/trace/ftrace.c
Stephen Rothwell [Fri, 22 Mar 2013 02:28:49 +0000 (13:28 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 22 Mar 2013 02:27:18 +0000 (13:27 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:25:33 +0000 (13:25 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:23:30 +0000 (13:23 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/virtual/virtio-spec.txt
Stephen Rothwell [Fri, 22 Mar 2013 01:58:06 +0000 (12:58 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Fri, 22 Mar 2013 01:56:32 +0000 (12:56 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 22 Mar 2013 01:54:53 +0000 (12:54 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:54:42 +0000 (12:54 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:53:11 +0000 (12:53 +1100)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 22 Mar 2013 01:51:37 +0000 (12:51 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:49:51 +0000 (12:49 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:48:18 +0000 (12:48 +1100)]
Merge remote-tracking branch 'mfd/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:46:39 +0000 (12:46 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:39:21 +0000 (12:39 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:39:15 +0000 (12:39 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:37:44 +0000 (12:37 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:35:54 +0000 (12:35 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:35:45 +0000 (12:35 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:31:18 +0000 (12:31 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
include/linux/res_counter.h
Stephen Rothwell [Fri, 22 Mar 2013 01:24:18 +0000 (12:24 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 22 Mar 2013 01:18:51 +0000 (12:18 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:11:17 +0000 (12:11 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:09:42 +0000 (12:09 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:07:56 +0000 (12:07 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:00:35 +0000 (12:00 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Fri, 22 Mar 2013 00:59:00 +0000 (11:59 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:57:27 +0000 (11:57 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:55:50 +0000 (11:55 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:51:56 +0000 (11:51 +1100)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:47:20 +0000 (11:47 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:47:10 +0000 (11:47 +1100)]
Merge remote-tracking branch 'dmaengine/next'
Conflicts:
drivers/dma/ioat/dma_v3.c
Stephen Rothwell [Fri, 22 Mar 2013 00:43:04 +0000 (11:43 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:41:18 +0000 (11:41 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:39:08 +0000 (11:39 +1100)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:37:18 +0000 (11:37 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:35:48 +0000 (11:35 +1100)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:34:02 +0000 (11:34 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 22 Mar 2013 00:33:47 +0000 (11:33 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:31:56 +0000 (11:31 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/media/platform/Kconfig
Stephen Rothwell [Fri, 22 Mar 2013 00:30:29 +0000 (11:30 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:29:05 +0000 (11:29 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:27:40 +0000 (11:27 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:26:10 +0000 (11:26 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:24:37 +0000 (11:24 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:23:12 +0000 (11:23 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:21:07 +0000 (11:21 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:19:38 +0000 (11:19 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:17:50 +0000 (11:17 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:16:20 +0000 (11:16 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:14:56 +0000 (11:14 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:13:31 +0000 (11:13 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 22 Mar 2013 00:12:02 +0000 (11:12 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 22 Mar 2013 00:10:34 +0000 (11:10 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:10:31 +0000 (11:10 +1100)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:09:04 +0000 (11:09 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:07:42 +0000 (11:07 +1100)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:06:19 +0000 (11:06 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 22 Mar 2013 00:04:56 +0000 (11:04 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 22 Mar 2013 00:02:27 +0000 (11:02 +1100)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:01:04 +0000 (11:01 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 21 Mar 2013 23:54:10 +0000 (10:54 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'