diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
| commit | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch) | |
| tree | 734289dc85074903d9e636a935d43414746e222c /mm/memory.c | |
| parent | 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff) | |
| parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
code cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
mm: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
m32r: Convert print_symbol to %pSR
iostats.txt: add easy-to-find description for field 6
x86 cmpxchg.h: fix wrong comment
treewide: Fix typo in printk and comments
doc: devicetree: Fix various typos
docbook: fix 8250 naming in device-drivers
pata_pdc2027x: Fix compiler warning
treewide: Fix typo in printks
mei: Fix comments in drivers/misc/mei
treewide: Fix typos in kernel messages
pm44xx: Fix comment for "CONFIG_CPU_IDLE"
doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
mmzone: correct "pags" to "pages" in comment.
kernel-parameters: remove outdated 'noresidual' parameter
Remove spurious _H suffixes from ifdef comments
sound: Remove stray pluses from Kconfig file
radio-shark: Fix printk "CONFIG_LED_CLASS"
doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
...
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c index f7a1fba85d14..6dc1882fbd72 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -715,11 +715,11 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, | |||
| 715 | * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y | 715 | * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y |
| 716 | */ | 716 | */ |
| 717 | if (vma->vm_ops) | 717 | if (vma->vm_ops) |
| 718 | print_symbol(KERN_ALERT "vma->vm_ops->fault: %s\n", | 718 | printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n", |
| 719 | (unsigned long)vma->vm_ops->fault); | 719 | vma->vm_ops->fault); |
| 720 | if (vma->vm_file && vma->vm_file->f_op) | 720 | if (vma->vm_file && vma->vm_file->f_op) |
| 721 | print_symbol(KERN_ALERT "vma->vm_file->f_op->mmap: %s\n", | 721 | printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n", |
| 722 | (unsigned long)vma->vm_file->f_op->mmap); | 722 | vma->vm_file->f_op->mmap); |
| 723 | dump_stack(); | 723 | dump_stack(); |
| 724 | add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); | 724 | add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); |
| 725 | } | 725 | } |