From b24d813d24c412a2e78bab8ef224a1d4c7c25de8 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Wed, 1 Apr 2015 20:21:50 +0000 Subject: [PATCH] aarch64: fix namespace pollution in bits/shm.h The shm_info struct is a gnu extension and some of its members do not have shm* prefix. This is worked around in sys/shm.h by macros, but aarch64 didn't use those. --- arch/aarch64/bits/shm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/aarch64/bits/shm.h b/arch/aarch64/bits/shm.h index e62fdf89..4c3c9fb7 100644 --- a/arch/aarch64/bits/shm.h +++ b/arch/aarch64/bits/shm.h @@ -19,7 +19,7 @@ struct shminfo { }; struct shm_info { - int used_ids; + int __used_ids; unsigned long shm_tot, shm_rss, shm_swp; - unsigned long swap_attempts, swap_successes; + unsigned long __swap_attempts, __swap_successes; };