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/mm/init_32.c | |
| parent | ALSA: fireface: constify ALSA specific operations (diff) | |
| parent | ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT (diff) | |
| download | linux-dev-4c7aba46c9e82aa236502760a677e666589afead.tar.xz linux-dev-4c7aba46c9e82aa236502760a677e666589afead.zip | |
Merge branch 'for-linus' into for-next
For applying more ALSA timer cleanups.
Diffstat (limited to 'arch/sparc/mm/init_32.c')
| -rw-r--r-- | arch/sparc/mm/init_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index c6afe98de4d9..3bd0d513bddb 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -290,7 +290,7 @@ void __init mem_init(void) /* Saves us work later. */ - memset((void *)&empty_zero_page, 0, PAGE_SIZE); + memset((void *)empty_zero_page, 0, PAGE_SIZE); i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5); i += 1; |