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

Commit 4a8052d8 authored by Rob Herring's avatar Rob Herring Committed by Russell King
Browse files

ARM: 7491/1: use generic version of identical asm headers 



Inspired by the AArgh64 claim that it should be separate from ARM and one
reason was being able to use more asm-generic headers. Doing a diff of
arch/arm/include/asm and include/asm-generic there are numerous asm
headers which are functionally identical to their asm-generic counterparts.
Delete the ARM version and use the generic ones.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Reviewed-by: default avatarNicolas Pitre <nico@linaro.org>
Tested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7ac68a4c

arch/arm/include/asm/Kbuild

+15 −0
Original line number Diff line number Diff line
@@ -5,16 +5,31 @@ header-y += hwcap.h 
generic-y += auxvec.h

generic-y += bitsperlong.h

generic-y += cputime.h

generic-y += current.h

generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

generic-y += ioctl.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

generic-y += kdebug.h

generic-y += local.h

generic-y += local64.h

generic-y += msgbuf.h

generic-y += param.h

generic-y += parport.h

generic-y += percpu.h

generic-y += poll.h

generic-y += resource.h

generic-y += sections.h

generic-y += segment.h

generic-y += sembuf.h

generic-y += serial.h

generic-y += shmbuf.h

generic-y += siginfo.h

generic-y += sizes.h

generic-y += socket.h

generic-y += sockios.h

generic-y += termbits.h

generic-y += timex.h

generic-y += types.h

arch/arm/include/asm/current.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
#ifndef _ASMARM_CURRENT_H

#define _ASMARM_CURRENT_H



#include <linux/thread_info.h>



static inline struct task_struct *get_current(void) __attribute_const__;



static inline struct task_struct *get_current(void)

{

	return current_thread_info()->task;

}



#define current (get_current())



#endif /* _ASMARM_CURRENT_H */

arch/arm/include/asm/exec.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __ASM_ARM_EXEC_H

#define __ASM_ARM_EXEC_H



#define arch_align_stack(x) (x)



#endif /* __ASM_ARM_EXEC_H */

arch/arm/include/asm/ipcbuf.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/ipcbuf.h>

arch/arm/include/asm/msgbuf.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
#ifndef _ASMARM_MSGBUF_H

#define _ASMARM_MSGBUF_H



/* 

 * The msqid64_ds structure for arm architecture.

 * Note extra padding because this structure is passed back and forth

 * between kernel and user space.

 *

 * Pad space is left for:

 * - 64-bit time_t to solve y2038 problem

 * - 2 miscellaneous 32-bit values

 */



struct msqid64_ds {

	struct ipc64_perm msg_perm;

	__kernel_time_t msg_stime;	/* last msgsnd time */

	unsigned long	__unused1;

	__kernel_time_t msg_rtime;	/* last msgrcv time */

	unsigned long	__unused2;

	__kernel_time_t msg_ctime;	/* last change time */

	unsigned long	__unused3;

	unsigned long  msg_cbytes;	/* current number of bytes on queue */

	unsigned long  msg_qnum;	/* number of messages in queue */

	unsigned long  msg_qbytes;	/* max number of bytes on queue */

	__kernel_pid_t msg_lspid;	/* pid of last msgsnd */

	__kernel_pid_t msg_lrpid;	/* last receive pid */

	unsigned long  __unused4;

	unsigned long  __unused5;

};



#endif /* _ASMARM_MSGBUF_H */