mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
Rather than #define the options manually in the architecture code, add Kconfig options for them and select them there instead. This also allows us to select the compat IPC version parsing automatically for platforms using the old compat IPC interface. Reported-by: Andrew Morton <[email protected]> Signed-off-by: Will Deacon <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Chris Metcalf <[email protected]> Cc: Catalin Marinas <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
05ba3f1aa1
commit
c1d7e01d78
39 changed files with 29 additions and 22 deletions
|
|
@ -118,7 +118,7 @@ extern int sem_ctls[];
|
|||
|
||||
static inline int compat_ipc_parse_version(int *cmd)
|
||||
{
|
||||
#ifdef __ARCH_WANT_COMPAT_IPC_PARSE_VERSION
|
||||
#ifdef CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION
|
||||
int version = *cmd & IPC_64;
|
||||
|
||||
/* this is tricky: architectures that have support for the old
|
||||
|
|
|
|||
|
|
@ -804,7 +804,7 @@ out_up:
|
|||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
#ifdef __ARCH_WANT_IPC_PARSE_VERSION
|
||||
#ifdef CONFIG_ARCH_WANT_IPC_PARSE_VERSION
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -826,7 +826,7 @@ int ipc_parse_version (int *cmd)
|
|||
}
|
||||
}
|
||||
|
||||
#endif /* __ARCH_WANT_IPC_PARSE_VERSION */
|
||||
#endif /* CONFIG_ARCH_WANT_IPC_PARSE_VERSION */
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
struct ipc_proc_iter {
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ struct kern_ipc_perm *ipcctl_pre_down(struct ipc_namespace *ns,
|
|||
struct ipc_ids *ids, int id, int cmd,
|
||||
struct ipc64_perm *perm, int extra_perm);
|
||||
|
||||
#ifndef __ARCH_WANT_IPC_PARSE_VERSION
|
||||
#ifndef CONFIG_ARCH_WANT_IPC_PARSE_VERSION
|
||||
/* On IA-64, we always use the "64-bit version" of the IPC structures. */
|
||||
# define ipc_parse_version(cmd) IPC_64
|
||||
#else
|
||||
|
|
|
|||
Loading…
Reference in a new issue