diff options
author | Joonsoo Kim <iamjoonsoo.kim@lge.com> | 2016-03-17 17:17:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 18:09:34 -0400 |
commit | 505f6d22dbc63f333d1178dc80264e40b5c35268 (patch) | |
tree | 18c7f9c32bb107e91654baf4a702c1bc7804a2bc | |
parent | 922d566cdcb7166c729ff67bb15ff5f93a3774b6 (diff) |
sound: query dynamic DEBUG_PAGEALLOC setting
We can disable debug_pagealloc processing even if the code is compiled
with CONFIG_DEBUG_PAGEALLOC. This patch changes the code to query
whether it is enabled or not in runtime.
[akpm@linux-foundation.org: export _debug_pagealloc_enabled to modules]
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/page_alloc.c | 1 | ||||
-rw-r--r-- | sound/drivers/pcsp/pcsp.c | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c7332a4bc8db..b1fc19ebb8a2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -498,6 +498,7 @@ void prep_compound_page(struct page *page, unsigned int order) | |||
498 | unsigned int _debug_guardpage_minorder; | 498 | unsigned int _debug_guardpage_minorder; |
499 | bool _debug_pagealloc_enabled __read_mostly | 499 | bool _debug_pagealloc_enabled __read_mostly |
500 | = IS_ENABLED(CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT); | 500 | = IS_ENABLED(CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT); |
501 | EXPORT_SYMBOL(_debug_pagealloc_enabled); | ||
501 | bool _debug_guardpage_enabled __read_mostly; | 502 | bool _debug_guardpage_enabled __read_mostly; |
502 | 503 | ||
503 | static int __init early_debug_pagealloc(char *buf) | 504 | static int __init early_debug_pagealloc(char *buf) |
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c index 27e25bb78c97..72e2d0012084 100644 --- a/sound/drivers/pcsp/pcsp.c +++ b/sound/drivers/pcsp/pcsp.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/input.h> | 14 | #include <linux/input.h> |
15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
16 | #include <linux/bitops.h> | 16 | #include <linux/bitops.h> |
17 | #include <linux/mm.h> | ||
17 | #include "pcsp_input.h" | 18 | #include "pcsp_input.h" |
18 | #include "pcsp.h" | 19 | #include "pcsp.h" |
19 | 20 | ||
@@ -148,11 +149,11 @@ static int alsa_card_pcsp_init(struct device *dev) | |||
148 | return err; | 149 | return err; |
149 | } | 150 | } |
150 | 151 | ||
151 | #ifdef CONFIG_DEBUG_PAGEALLOC | ||
152 | /* Well, CONFIG_DEBUG_PAGEALLOC makes the sound horrible. Lets alert */ | 152 | /* Well, CONFIG_DEBUG_PAGEALLOC makes the sound horrible. Lets alert */ |
153 | printk(KERN_WARNING "PCSP: CONFIG_DEBUG_PAGEALLOC is enabled, " | 153 | if (debug_pagealloc_enabled()) { |
154 | "which may make the sound noisy.\n"); | 154 | printk(KERN_WARNING "PCSP: CONFIG_DEBUG_PAGEALLOC is enabled, " |
155 | #endif | 155 | "which may make the sound noisy.\n"); |
156 | } | ||
156 | 157 | ||
157 | return 0; | 158 | return 0; |
158 | } | 159 | } |