diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-06-08 14:14:40 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-06-08 14:14:45 +0200 |
| commit | a43e61842ec55baa486d60eed2a19af67ba78b9f (patch) | |
| tree | 6c3c93f19e3933273b73b9edd16edc146ab18527 /arch/sparc/include/asm/setup.h | |
| parent | 5d473fedd17ae3a9f92fb35551e307d01459ea6a (diff) | |
| parent | 50dffe7fad6c156c2928e45c19ff7b86eb951f4c (diff) | |
| download | linux-a43e61842ec55baa486d60eed2a19af67ba78b9f.tar.bz2 | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
This brings in commit 7a7c0a6438b8 ("mac80211: fix TX aggregation
start/stop callback race") to allow the follow-up cleanup.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'arch/sparc/include/asm/setup.h')
| -rw-r--r-- | arch/sparc/include/asm/setup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h index 478bf6bb4598..3fae200dd251 100644 --- a/arch/sparc/include/asm/setup.h +++ b/arch/sparc/include/asm/setup.h @@ -16,7 +16,7 @@ extern char reboot_command[]; */ extern unsigned char boot_cpu_id; -extern unsigned long empty_zero_page; +extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; extern int serial_console; static inline int con_is_present(void) |