diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-29 21:05:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-29 21:05:31 -0400 |
commit | 7d36014b972a3833b883a7ef41e6bd3b0d187850 (patch) | |
tree | 5c828b0de1cd357288135cc04461d31386b89c26 /fs | |
parent | 442a9ffabb21f175027e93e72ea05159818271a6 (diff) | |
parent | ecb41a77411358d385e3fde5b4e98a5f3d9cfdd5 (diff) |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge patches through Andrew Morton:
"180 patches - err 181 - listed below:
- most of MM. I held back the (large) "memcg: add hugetlb extension"
series because a bunfight has recently broken out.
- leds. After this, Bryan Wu will be handling drivers/leds/
- backlight
- lib/
- rtc"
* emailed from Andrew Morton <akpm@linux-foundation.org>: (181 patches)
drivers/rtc/rtc-s3c.c: fix compiler warning
drivers/rtc/rtc-tegra.c: clean up probe/remove routines
drivers/rtc/rtc-pl031.c: remove RTC timer interrupt handling
drivers/rtc/rtc-lpc32xx.c: add device tree support
drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF
rtc: ds1307: add trickle charger support
rtc: ds1307: remove superfluous initialization
rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
rtc: add ioctl to get/clear battery low voltage status
drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
rtc/spear: add Device Tree probing capability
lib/vsprintf.c: "%#o",0 becomes '0' instead of '00'
radix-tree: fix preload vector size
spinlock_debug: print kallsyms name for lock
vsprintf: fix %ps on non symbols when using kallsyms
lib/bitmap.c: fix documentation for scnprintf() functions
lib/string_helpers.c: make arrays static
lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
...
Diffstat (limited to 'fs')
-rw-r--r-- | fs/bad_inode.c | 1 | ||||
-rw-r--r-- | fs/proc/base.c | 5 | ||||
-rw-r--r-- | fs/proc/task_mmu.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/bad_inode.c b/fs/bad_inode.c index 37268c5bb98b..1b35d6bd06b0 100644 --- a/fs/bad_inode.c +++ b/fs/bad_inode.c | |||
@@ -292,7 +292,6 @@ static const struct inode_operations bad_inode_ops = | |||
292 | .getxattr = bad_inode_getxattr, | 292 | .getxattr = bad_inode_getxattr, |
293 | .listxattr = bad_inode_listxattr, | 293 | .listxattr = bad_inode_listxattr, |
294 | .removexattr = bad_inode_removexattr, | 294 | .removexattr = bad_inode_removexattr, |
295 | /* truncate_range returns void */ | ||
296 | }; | 295 | }; |
297 | 296 | ||
298 | 297 | ||
diff --git a/fs/proc/base.c b/fs/proc/base.c index d2d3108a611c..d7d711876b6a 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -411,12 +411,13 @@ static const struct file_operations proc_lstats_operations = { | |||
411 | 411 | ||
412 | static int proc_oom_score(struct task_struct *task, char *buffer) | 412 | static int proc_oom_score(struct task_struct *task, char *buffer) |
413 | { | 413 | { |
414 | unsigned long totalpages = totalram_pages + total_swap_pages; | ||
414 | unsigned long points = 0; | 415 | unsigned long points = 0; |
415 | 416 | ||
416 | read_lock(&tasklist_lock); | 417 | read_lock(&tasklist_lock); |
417 | if (pid_alive(task)) | 418 | if (pid_alive(task)) |
418 | points = oom_badness(task, NULL, NULL, | 419 | points = oom_badness(task, NULL, NULL, totalpages) * |
419 | totalram_pages + total_swap_pages); | 420 | 1000 / totalpages; |
420 | read_unlock(&tasklist_lock); | 421 | read_unlock(&tasklist_lock); |
421 | return sprintf(buffer, "%lu\n", points); | 422 | return sprintf(buffer, "%lu\n", points); |
422 | } | 423 | } |
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 1030a716d155..7faaf2acc570 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
@@ -784,7 +784,7 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, | |||
784 | 784 | ||
785 | /* find the first VMA at or above 'addr' */ | 785 | /* find the first VMA at or above 'addr' */ |
786 | vma = find_vma(walk->mm, addr); | 786 | vma = find_vma(walk->mm, addr); |
787 | if (pmd_trans_huge_lock(pmd, vma) == 1) { | 787 | if (vma && pmd_trans_huge_lock(pmd, vma) == 1) { |
788 | for (; addr != end; addr += PAGE_SIZE) { | 788 | for (; addr != end; addr += PAGE_SIZE) { |
789 | unsigned long offset; | 789 | unsigned long offset; |
790 | 790 | ||