Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a2fd924 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I94109b09,I1eecef1b into msm-next 

* changes:
  arm64: Add 32-bit sigcontext definition to uapi signcontext.h
  epoll: drop struct epoll_event definition
parents 6cf4c49f 31042184

arch/arm64/include/uapi/asm/sigcontext.h

+32 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#ifndef _UAPI__ASM_SIGCONTEXT_H

#define _UAPI__ASM_SIGCONTEXT_H



#ifdef CONFIG_64BIT

#include <linux/types.h>



/*
@@ -116,4 +117,35 @@ struct extra_context { 
	__u32 __reserved[3];

};



#else /* CONFIG_64BIT */



/*

 * Signal context structure - contains all info to do with the state

 * before the signal handler was invoked.  Note: only add new entries

 * to the end of the structure.

 */

struct sigcontext {

	unsigned long trap_no;

	unsigned long error_code;

	unsigned long oldmask;

	unsigned long arm_r0;

	unsigned long arm_r1;

	unsigned long arm_r2;

	unsigned long arm_r3;

	unsigned long arm_r4;

	unsigned long arm_r5;

	unsigned long arm_r6;

	unsigned long arm_r7;

	unsigned long arm_r8;

	unsigned long arm_r9;

	unsigned long arm_r10;

	unsigned long arm_fp;

	unsigned long arm_ip;

	unsigned long arm_sp;

	unsigned long arm_lr;

	unsigned long arm_pc;

	unsigned long arm_cpsr;

	unsigned long fault_address;

};

#endif /* CONFIG_64BIT */

#endif /* _UAPI__ASM_SIGCONTEXT_H */

include/uapi/linux/eventpoll.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
#define EPOLL_PACKED

#endif



#ifdef __KERNEL__

struct epoll_event {

	__u32 events;

	__u64 data;
@@ -89,4 +90,5 @@ static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) 
	epev->events &= ~EPOLLWAKEUP;

}

#endif

#endif /* __KERNEL__ */

#endif /* _UAPI_LINUX_EVENTPOLL_H */