diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2017-01-30 15:47:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2017-01-30 15:47:19 -0800 |
| commit | f9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b (patch) | |
| tree | 4078d3ae27d4ebb85bdcd4d84e9b9a4d059f22bb /arch/sparc/kernel/irq_64.c | |
| parent | Merge tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abell... (diff) | |
| parent | Merge branch 'sparc64-non-resumable-user-error-recovery' (diff) | |
| download | linux-f9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b.tar.gz linux-f9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b.tar.bz2 linux-f9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Several small bug fixes and tidies, along with a fix for non-resumable
memory errors triggered by userspace"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Handle PIO & MEM non-resumable errors.
sparc64: Zero pages on allocation for mondo and error queues.
sparc: Fixed typo in sstate.c. Replaced panicing with panicking
sparc: use symbolic names for tsb indexing
Diffstat (limited to 'arch/sparc/kernel/irq_64.c')
| -rw-r--r-- | arch/sparc/kernel/irq_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c index 3bebf395252c..4d0248aa0928 100644 --- a/arch/sparc/kernel/irq_64.c +++ b/arch/sparc/kernel/irq_64.c @@ -1021,7 +1021,7 @@ static void __init alloc_one_queue(unsigned long *pa_ptr, unsigned long qmask) unsigned long order = get_order(size); unsigned long p; - p = __get_free_pages(GFP_KERNEL, order); + p = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); if (!p) { prom_printf("SUN4V: Error, cannot allocate queue.\n"); prom_halt(); |