Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parisc: Avoid using CONFIG_64BIT in userspace exported headers

Browse Source 
The gcc compiler provide the predefined __LP64__ macro. Use that
instead.

Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
Helge Deller 2014-11-10 22:04:47 +01:00
parent 2fe749f50b
commit d8f5457ab9
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/parisc/include/uapi/asm/bitsperlong.h
View File

@ -1,13 +1,7 @@
#ifndef __ASM_PARISC_BITSPERLONG_H #ifndef __ASM_PARISC_BITSPERLONG_H
#define __ASM_PARISC_BITSPERLONG_H #define __ASM_PARISC_BITSPERLONG_H
/* #if defined(__LP64__)
* using CONFIG_* outside of __KERNEL__ is wrong,
* __LP64__ was also removed from headers, so what
* is the right approach on parisc?
* -arnd
*/
#if (defined(__KERNEL__) && defined(CONFIG_64BIT)) || defined (__LP64__)
#define __BITS_PER_LONG 64 #define __BITS_PER_LONG 64
#define SHIFT_PER_LONG 6 #define SHIFT_PER_LONG 6
#else #else

8
arch/parisc/include/uapi/asm/msgbuf.h
View File

@ -1,6 +1,8 @@
#ifndef _PARISC_MSGBUF_H #ifndef _PARISC_MSGBUF_H
#define _PARISC_MSGBUF_H #define _PARISC_MSGBUF_H
#include <asm/bitsperlong.h>
/* /*
* The msqid64_ds structure for parisc architecture, copied from sparc. * The msqid64_ds structure for parisc architecture, copied from sparc.
* Note extra padding because this structure is passed back and forth * Note extra padding because this structure is passed back and forth
@ -13,15 +15,15 @@
struct msqid64_ds { struct msqid64_ds {
struct ipc64_perm msg_perm; struct ipc64_perm msg_perm;
#ifndef CONFIG_64BIT #if __BITS_PER_LONG != 64
unsigned int __pad1; unsigned int __pad1;
#endif #endif
__kernel_time_t msg_stime; /* last msgsnd time */ __kernel_time_t msg_stime; /* last msgsnd time */
#ifndef CONFIG_64BIT #if __BITS_PER_LONG != 64
unsigned int __pad2; unsigned int __pad2;
#endif #endif
__kernel_time_t msg_rtime; /* last msgrcv time */ __kernel_time_t msg_rtime; /* last msgrcv time */
#ifndef CONFIG_64BIT #if __BITS_PER_LONG != 64
unsigned int __pad3; unsigned int __pad3;
#endif #endif
__kernel_time_t msg_ctime; /* last change time */ __kernel_time_t msg_ctime; /* last change time */

6
arch/parisc/include/uapi/asm/sembuf.h
View File

@ -1,6 +1,8 @@
#ifndef _PARISC_SEMBUF_H #ifndef _PARISC_SEMBUF_H
#define _PARISC_SEMBUF_H #define _PARISC_SEMBUF_H
#include <asm/bitsperlong.h>
/* /*
* The semid64_ds structure for parisc architecture. * The semid64_ds structure for parisc architecture.
* Note extra padding because this structure is passed back and forth * Note extra padding because this structure is passed back and forth
@ -13,11 +15,11 @@
struct semid64_ds { struct semid64_ds {
struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
#ifndef CONFIG_64BIT #if __BITS_PER_LONG != 64
unsigned int __pad1; unsigned int __pad1;
#endif #endif
__kernel_time_t sem_otime; /* last semop time */ __kernel_time_t sem_otime; /* last semop time */
#ifndef CONFIG_64BIT #if __BITS_PER_LONG != 64
unsigned int __pad2; unsigned int __pad2;
#endif #endif
__kernel_time_t sem_ctime; /* last change time */ __kernel_time_t sem_ctime; /* last change time */

10
arch/parisc/include/uapi/asm/shmbuf.h
View File

@ -1,6 +1,8 @@
#ifndef _PARISC_SHMBUF_H #ifndef _PARISC_SHMBUF_H
#define _PARISC_SHMBUF_H #define _PARISC_SHMBUF_H
#include <asm/bitsperlong.h>
/* /*
* The shmid64_ds structure for parisc architecture. * The shmid64_ds structure for parisc architecture.
* Note extra padding because this structure is passed back and forth * Note extra padding because this structure is passed back and forth
@ -13,19 +15,19 @@
struct shmid64_ds { struct shmid64_ds {
struct ipc64_perm shm_perm; /* operation perms */ struct ipc64_perm shm_perm; /* operation perms */
#ifndef CONFIG_64BIT #if __BITS_PER_LONG != 64
unsigned int __pad1; unsigned int __pad1;
#endif #endif
__kernel_time_t shm_atime; /* last attach time */ __kernel_time_t shm_atime; /* last attach time */
#ifndef CONFIG_64BIT #if __BITS_PER_LONG != 64
unsigned int __pad2; unsigned int __pad2;
#endif #endif
__kernel_time_t shm_dtime; /* last detach time */ __kernel_time_t shm_dtime; /* last detach time */
#ifndef CONFIG_64BIT #if __BITS_PER_LONG != 64
unsigned int __pad3; unsigned int __pad3;
#endif #endif
__kernel_time_t shm_ctime; /* last change time */ __kernel_time_t shm_ctime; /* last change time */
#ifndef CONFIG_64BIT #if __BITS_PER_LONG != 64
unsigned int __pad4; unsigned int __pad4;
#endif #endif
size_t shm_segsz; /* size of segment (bytes) */ size_t shm_segsz; /* size of segment (bytes) */

2
arch/parisc/include/uapi/asm/signal.h
View File

@ -85,7 +85,7 @@
struct siginfo; struct siginfo;
/* Type of a signal handler. */ /* Type of a signal handler. */
#ifdef CONFIG_64BIT #if defined(__LP64__)
/* function pointers on 64-bit parisc are pointers to little structs and the /* 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 * compiler doesn't support code which changes or tests the address of
* the function in the little struct. This is really ugly -PB * the function in the little struct. This is really ugly -PB