diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-08-13 11:28:17 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-08-13 11:28:17 -0400 |
| commit | 139803a137dea5e02334692c20f07f19c42afc2e (patch) | |
| tree | 8c6a149f003aa3c366e44e9bfffb8b3cd6a01fc5 /lib | |
| parent | 69ebd1210e5fc6535320c9da4c6196b95fa0668c (diff) | |
| parent | 8524c7870680e93cb3d8f1d3f90f927c3c0686b6 (diff) | |
Merge tag 'v3.2.27' into v3.2-rt
This is the 3.2.27 stable release
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vsprintf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 993599e66e5a..d74c317f4b29 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -886,7 +886,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, * %pK cannot be used in IRQ context because its test * for CAP_SYSLOG would be meaningless. */ - if (in_irq() || in_serving_softirq() || in_nmi()) { + if (kptr_restrict && (in_irq() || in_serving_softirq() || + in_nmi())) { if (spec.field_width == -1) spec.field_width = 2 * sizeof(void *); return string(buf, end, "pK-error", spec); |