Commit 33b36543 authored Jan 16, 2015 by Will Deacon Committed by Catalin Marinas Jan 23, 2015

arm64: uapi: expose our struct ucontext to the uapi headers



arm64 defines its own ucontext structure which is incompatible with the
struct defined (and exposed to userspace by) the asm-generic headers.

glibc carries its own struct definition that is compatible with the
arm64 definition, but we should expose our format in the uapi headers in
case other libraries want to make use of the ucontext pushed as part of
an arm64 sigframe.

This patch moves the arm64 asm/ucontext.h to the uapi headers, along
with the necessary #include of linux/types.h.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Marcus Shawcroft <marcus.shawcroft@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

parent 0aaf0dae

arch/arm64/include/uapi/asm/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,4 +18,5 @@ header-y += siginfo.h
		header-y += signal.h
		header-y += stat.h
		header-y += statfs.h
		header-y += ucontext.h
		header-y += unistd.h

arch/arm64/include/asm/ucontext.h→arch/arm64/include/uapi/asm/ucontext.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -13,8 +13,10 @@
		* You should have received a copy of the GNU General Public License
		* along with this program. If not, see <http://www.gnu.org/licenses/>.
		*/
		#ifndef __ASM_UCONTEXT_H
		#define __ASM_UCONTEXT_H
		#ifndef _UAPI__ASM_UCONTEXT_H
		#define _UAPI__ASM_UCONTEXT_H

		#include <linux/types.h>

		struct ucontext {
		unsigned long uc_flags;
		@@ -27,4 +29,4 @@ struct ucontext {
		struct sigcontext uc_mcontext;
		};

		#endif /* __ASM_UCONTEXT_H */
		#endif /* _UAPI__ASM_UCONTEXT_H */