diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-06-07 10:25:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-07 10:25:30 +0200 |
| commit | 4c7aba46c9e82aa236502760a677e666589afead (patch) | |
| tree | 9baa94b072fa58c674c34b8ddaec8b9e727e1657 /arch/sparc/include/asm/pgtable_32.h | |
| parent | d2dc2a96de9d58038ac1f9ee432e88a70958d59b (diff) | |
| parent | ba3021b2c79b2fa9114f92790a99deb27a65b728 (diff) | |
| download | kernel_replicant_linux-4c7aba46c9e82aa236502760a677e666589afead.tar.gz kernel_replicant_linux-4c7aba46c9e82aa236502760a677e666589afead.tar.bz2 kernel_replicant_linux-4c7aba46c9e82aa236502760a677e666589afead.zip | |
Merge branch 'for-linus' into for-next
For applying more ALSA timer cleanups.
Diffstat (limited to 'arch/sparc/include/asm/pgtable_32.h')
| -rw-r--r-- | arch/sparc/include/asm/pgtable_32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index ce6f56980aef..cf190728360b 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h @@ -91,9 +91,9 @@ extern unsigned long pfn_base; * ZERO_PAGE is a global shared page that is always zero: used * for zero-mapped memory areas etc.. */ -extern unsigned long empty_zero_page; +extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; -#define ZERO_PAGE(vaddr) (virt_to_page(&empty_zero_page)) +#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) /* * In general all page table modifications should use the V8 atomic |