diff options
| author | Tejun Heo <tj@kernel.org> | 2014-11-22 17:32:08 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-11-22 17:32:08 +0300 |
| commit | cceb9bd63373061ad7b75c321808a2fb11c86545 (patch) | |
| tree | a70d939eabed2e19538707402441644dfc26990e /arch/parisc/include/uapi/asm/signal.h | |
| parent | 56e4dea81a55c338eede625f715c7fa21f1a28c4 (diff) | |
| parent | 8a84e01e147f44111988f9d8ccd2eaa30215a0f2 (diff) | |
| download | linux-cceb9bd63373061ad7b75c321808a2fb11c86545.tar.xz | |
Merge branch 'master' into for-3.19
Pull in to receive 54ef6df3f3f1 ("rcu: Provide counterpart to
rcu_dereference() for non-RCU situations").
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/parisc/include/uapi/asm/signal.h')
| -rw-r--r-- | arch/parisc/include/uapi/asm/signal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h index 10df7079f4cd..e26043b73f5d 100644 --- a/arch/parisc/include/uapi/asm/signal.h +++ b/arch/parisc/include/uapi/asm/signal.h @@ -85,7 +85,7 @@ struct siginfo; /* Type of a signal handler. */ -#ifdef CONFIG_64BIT +#if defined(__LP64__) /* function pointers on 64-bit parisc are pointers to little structs and the * compiler doesn't support code which changes or tests the address of * the function in the little struct. This is really ugly -PB |