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

Commit d8f5457a authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Avoid using CONFIG_64BIT in userspace exported headers 



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

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 2fe749f5

arch/parisc/include/uapi/asm/bitsperlong.h

+1 −7
Original line number Diff line number Diff line 
#ifndef __ASM_PARISC_BITSPERLONG_H

#define __ASM_PARISC_BITSPERLONG_H



/*

 * 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__)

#if defined(__LP64__)

#define __BITS_PER_LONG 64

#define SHIFT_PER_LONG 6

#else

arch/parisc/include/uapi/asm/msgbuf.h

+5 −3
Original line number Diff line number Diff line 
#ifndef _PARISC_MSGBUF_H

#define _PARISC_MSGBUF_H



#include <asm/bitsperlong.h>



/* 

 * The msqid64_ds structure for parisc architecture, copied from sparc.

 * Note extra padding because this structure is passed back and forth
@@ -13,15 +15,15 @@ 


struct msqid64_ds {

	struct ipc64_perm msg_perm;

#ifndef CONFIG_64BIT

#if __BITS_PER_LONG != 64

	unsigned int   __pad1;

#endif

	__kernel_time_t msg_stime;	/* last msgsnd time */

#ifndef CONFIG_64BIT

#if __BITS_PER_LONG != 64

	unsigned int   __pad2;

#endif

	__kernel_time_t msg_rtime;	/* last msgrcv time */

#ifndef CONFIG_64BIT

#if __BITS_PER_LONG != 64

	unsigned int   __pad3;

#endif

	__kernel_time_t msg_ctime;	/* last change time */

arch/parisc/include/uapi/asm/sembuf.h

+4 −2
Original line number Diff line number Diff line 
#ifndef _PARISC_SEMBUF_H

#define _PARISC_SEMBUF_H



#include <asm/bitsperlong.h>



/* 

 * The semid64_ds structure for parisc architecture.

 * Note extra padding because this structure is passed back and forth
@@ -13,11 +15,11 @@ 


struct semid64_ds {

	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */

#ifndef CONFIG_64BIT

#if __BITS_PER_LONG != 64

	unsigned int	__pad1;

#endif

	__kernel_time_t	sem_otime;		/* last semop time */

#ifndef CONFIG_64BIT

#if __BITS_PER_LONG != 64

	unsigned int	__pad2;

#endif

	__kernel_time_t	sem_ctime;		/* last change time */

arch/parisc/include/uapi/asm/shmbuf.h

+6 −4
Original line number Diff line number Diff line 
#ifndef _PARISC_SHMBUF_H

#define _PARISC_SHMBUF_H



#include <asm/bitsperlong.h>



/* 

 * The shmid64_ds structure for parisc architecture.

 * Note extra padding because this structure is passed back and forth
@@ -13,19 +15,19 @@ 


struct shmid64_ds {

	struct ipc64_perm	shm_perm;	/* operation perms */

#ifndef CONFIG_64BIT

#if __BITS_PER_LONG != 64

	unsigned int		__pad1;

#endif

	__kernel_time_t		shm_atime;	/* last attach time */

#ifndef CONFIG_64BIT

#if __BITS_PER_LONG != 64

	unsigned int		__pad2;

#endif

	__kernel_time_t		shm_dtime;	/* last detach time */

#ifndef CONFIG_64BIT

#if __BITS_PER_LONG != 64

	unsigned int		__pad3;

#endif

	__kernel_time_t		shm_ctime;	/* last change time */

#ifndef CONFIG_64BIT

#if __BITS_PER_LONG != 64

	unsigned int		__pad4;

#endif

	size_t			shm_segsz;	/* size of segment (bytes) */

arch/parisc/include/uapi/asm/signal.h

+1 −1
Original line number Diff line number Diff line
@@ -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